eventespresso / event-espresso-core

core/domain/services/commands/registration/UpdateRegistrationAndTransactionAfterChangeCommandHandler.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
     public function handle(CommandInterface $command)
     {
         /** @var UpdateRegistrationAndTransactionAfterChangeCommand $command */
-        if (! $command instanceof UpdateRegistrationAndTransactionAfterChangeCommand) {
+        if ( ! $command instanceof UpdateRegistrationAndTransactionAfterChangeCommand) {
             throw new InvalidEntityException(
                 get_class($command),
                 'UpdateRegistrationAndTransactionAfterChangeCommand'

Indentation +31 added lines, -31 removed lines

@@ -17,39 +17,39 @@
  */
 class UpdateRegistrationAndTransactionAfterChangeCommandHandler extends CommandHandler
 {
-    /**
-     * @var UpdateRegistrationService $update_registration_service
-     */
-    private $update_registration_service;
+	/**
+	 * @var UpdateRegistrationService $update_registration_service
+	 */
+	private $update_registration_service;
 
 
-    /**
-     * Command constructor
-     *
-     * @param UpdateRegistrationService $update_registration_service
-     */
-    public function __construct(
-        UpdateRegistrationService $update_registration_service
-    ) {
-        defined('EVENT_ESPRESSO_VERSION') || exit;
-        $this->update_registration_service = $update_registration_service;
-    }
+	/**
+	 * Command constructor
+	 *
+	 * @param UpdateRegistrationService $update_registration_service
+	 */
+	public function __construct(
+		UpdateRegistrationService $update_registration_service
+	) {
+		defined('EVENT_ESPRESSO_VERSION') || exit;
+		$this->update_registration_service = $update_registration_service;
+	}
 
 
-    /**
-     * @param CommandInterface|UpdateRegistrationAndTransactionAfterChangeCommand $command
-     * @return boolean
-     * @throws InvalidEntityException
-     */
-    public function handle(CommandInterface $command)
-    {
-        /** @var UpdateRegistrationAndTransactionAfterChangeCommand $command */
-        if (! $command instanceof UpdateRegistrationAndTransactionAfterChangeCommand) {
-            throw new InvalidEntityException(
-                get_class($command),
-                'UpdateRegistrationAndTransactionAfterChangeCommand'
-            );
-        }
-        return $this->update_registration_service->updateRegistrationAndTransaction($command->registration());
-    }
+	/**
+	 * @param CommandInterface|UpdateRegistrationAndTransactionAfterChangeCommand $command
+	 * @return boolean
+	 * @throws InvalidEntityException
+	 */
+	public function handle(CommandInterface $command)
+	{
+		/** @var UpdateRegistrationAndTransactionAfterChangeCommand $command */
+		if (! $command instanceof UpdateRegistrationAndTransactionAfterChangeCommand) {
+			throw new InvalidEntityException(
+				get_class($command),
+				'UpdateRegistrationAndTransactionAfterChangeCommand'
+			);
+		}
+		return $this->update_registration_service->updateRegistrationAndTransaction($command->registration());
+	}
 }

core/domain/services/commands/registration/CreateRegistrationCommand.php

Spacing +2 added lines, -2 removed lines

@@ -92,7 +92,7 @@ 
         $this->reg_status       = $reg_status;
         // grab the related ticket object for this line_item if one wasn't already supplied
         $this->ticket = $ticket instanceof EE_Ticket ? $ticket : $this->ticket_line_item->ticket();
-        if (! $this->ticket instanceof EE_Ticket) {
+        if ( ! $this->ticket instanceof EE_Ticket) {
             throw new InvalidEntityException(
                 is_object($this->ticket) ? get_class($this->ticket) : gettype($this->ticket),
                 'EE_Ticket',
@@ -111,7 +111,7 @@ 
      */
     public function getCapCheck()
     {
-        if (! $this->cap_check instanceof CapCheckInterface) {
+        if ( ! $this->cap_check instanceof CapCheckInterface) {
             return new CapCheck('ee_edit_registrations', 'create_new_registration');
         }
         return $this->cap_check;

Indentation +151 added lines, -151 removed lines

@@ -25,155 +25,155 @@
  */
 class CreateRegistrationCommand extends Command implements CommandRequiresCapCheckInterface
 {
-    /**
-     * @var EE_Transaction $transaction
-     */
-    private $transaction;
-
-    /**
-     * @var EE_Ticket $ticket
-     */
-    private $ticket;
-
-    /**
-     * @var EE_Line_Item $ticket_line_item
-     */
-    private $ticket_line_item;
-
-    /**
-     * @var int $reg_count
-     */
-    private $reg_count;
-
-    /**
-     * @var int $reg_group_size
-     */
-    private $reg_group_size;
-
-    /**
-     * @var string $reg_status
-     */
-    private $reg_status;
-
-    /**
-     * @var EE_Registration $registration
-     */
-    protected $registration;
-
-
-    /**
-     * CreateRegistrationCommand constructor.
-     *
-     * @param EE_Transaction $transaction
-     * @param EE_Line_Item   $ticket_line_item
-     * @param int            $reg_count
-     * @param int            $reg_group_size
-     * @param string         $reg_status
-     * @param EE_Ticket|null $ticket
-     * @throws InvalidEntityException
-     * @throws EE_Error
-     */
-    public function __construct(
-        EE_Transaction $transaction,
-        EE_Line_Item $ticket_line_item,
-        $reg_count = 1,
-        $reg_group_size = 0,
-        $reg_status = EEM_Registration::status_id_incomplete,
-        EE_Ticket $ticket = null
-    ) {
-        defined('EVENT_ESPRESSO_VERSION') || exit;
-        $this->transaction      = $transaction;
-        $this->ticket_line_item = $ticket_line_item;
-        $this->reg_count        = absint($reg_count);
-        $this->reg_group_size   = absint($reg_group_size);
-        $this->reg_status       = $reg_status;
-        // grab the related ticket object for this line_item if one wasn't already supplied
-        $this->ticket = $ticket instanceof EE_Ticket ? $ticket : $this->ticket_line_item->ticket();
-        if (! $this->ticket instanceof EE_Ticket) {
-            throw new InvalidEntityException(
-                is_object($this->ticket) ? get_class($this->ticket) : gettype($this->ticket),
-                'EE_Ticket',
-                sprintf(
-                    esc_html__('Line item %s did not contain a valid ticket', 'event_espresso'),
-                    $ticket_line_item->ID()
-                )
-            );
-        }
-    }
-
-
-    /**
-     * @return CapCheckInterface
-     * @throws InvalidDataTypeException
-     */
-    public function getCapCheck()
-    {
-        if (! $this->cap_check instanceof CapCheckInterface) {
-            return new CapCheck('ee_edit_registrations', 'create_new_registration');
-        }
-        return $this->cap_check;
-    }
-
-
-    /**
-     * @return EE_Transaction
-     */
-    public function transaction()
-    {
-        return $this->transaction;
-    }
-
-
-    /**
-     * @return EE_Ticket
-     */
-    public function ticket()
-    {
-        return $this->ticket;
-    }
-
-
-    /**
-     * @return EE_Line_Item
-     */
-    public function ticketLineItem()
-    {
-        return $this->ticket_line_item;
-    }
-
-
-    /**
-     * @return int
-     */
-    public function regCount()
-    {
-        return $this->reg_count;
-    }
-
-
-    /**
-     * @return int
-     */
-    public function regGroupSize()
-    {
-        return $this->reg_group_size;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function regStatus()
-    {
-        return $this->reg_status;
-    }
-
-
-    /**
-     * @return EE_Registration
-     */
-    public function registration()
-    {
-        return $this->registration;
-    }
+	/**
+	 * @var EE_Transaction $transaction
+	 */
+	private $transaction;
+
+	/**
+	 * @var EE_Ticket $ticket
+	 */
+	private $ticket;
+
+	/**
+	 * @var EE_Line_Item $ticket_line_item
+	 */
+	private $ticket_line_item;
+
+	/**
+	 * @var int $reg_count
+	 */
+	private $reg_count;
+
+	/**
+	 * @var int $reg_group_size
+	 */
+	private $reg_group_size;
+
+	/**
+	 * @var string $reg_status
+	 */
+	private $reg_status;
+
+	/**
+	 * @var EE_Registration $registration
+	 */
+	protected $registration;
+
+
+	/**
+	 * CreateRegistrationCommand constructor.
+	 *
+	 * @param EE_Transaction $transaction
+	 * @param EE_Line_Item   $ticket_line_item
+	 * @param int            $reg_count
+	 * @param int            $reg_group_size
+	 * @param string         $reg_status
+	 * @param EE_Ticket|null $ticket
+	 * @throws InvalidEntityException
+	 * @throws EE_Error
+	 */
+	public function __construct(
+		EE_Transaction $transaction,
+		EE_Line_Item $ticket_line_item,
+		$reg_count = 1,
+		$reg_group_size = 0,
+		$reg_status = EEM_Registration::status_id_incomplete,
+		EE_Ticket $ticket = null
+	) {
+		defined('EVENT_ESPRESSO_VERSION') || exit;
+		$this->transaction      = $transaction;
+		$this->ticket_line_item = $ticket_line_item;
+		$this->reg_count        = absint($reg_count);
+		$this->reg_group_size   = absint($reg_group_size);
+		$this->reg_status       = $reg_status;
+		// grab the related ticket object for this line_item if one wasn't already supplied
+		$this->ticket = $ticket instanceof EE_Ticket ? $ticket : $this->ticket_line_item->ticket();
+		if (! $this->ticket instanceof EE_Ticket) {
+			throw new InvalidEntityException(
+				is_object($this->ticket) ? get_class($this->ticket) : gettype($this->ticket),
+				'EE_Ticket',
+				sprintf(
+					esc_html__('Line item %s did not contain a valid ticket', 'event_espresso'),
+					$ticket_line_item->ID()
+				)
+			);
+		}
+	}
+
+
+	/**
+	 * @return CapCheckInterface
+	 * @throws InvalidDataTypeException
+	 */
+	public function getCapCheck()
+	{
+		if (! $this->cap_check instanceof CapCheckInterface) {
+			return new CapCheck('ee_edit_registrations', 'create_new_registration');
+		}
+		return $this->cap_check;
+	}
+
+
+	/**
+	 * @return EE_Transaction
+	 */
+	public function transaction()
+	{
+		return $this->transaction;
+	}
+
+
+	/**
+	 * @return EE_Ticket
+	 */
+	public function ticket()
+	{
+		return $this->ticket;
+	}
+
+
+	/**
+	 * @return EE_Line_Item
+	 */
+	public function ticketLineItem()
+	{
+		return $this->ticket_line_item;
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function regCount()
+	{
+		return $this->reg_count;
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function regGroupSize()
+	{
+		return $this->reg_group_size;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function regStatus()
+	{
+		return $this->reg_status;
+	}
+
+
+	/**
+	 * @return EE_Registration
+	 */
+	public function registration()
+	{
+		return $this->registration;
+	}
 }

core/domain/services/commands/registration/CreateRegistrationCommandHandler.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
     public function handle(CommandInterface $command)
     {
         /** @var CreateRegistrationCommand $command */
-        if (! $command instanceof CreateRegistrationCommand) {
+        if ( ! $command instanceof CreateRegistrationCommand) {
             throw new InvalidEntityException(get_class($command), 'CreateRegistrationCommand');
         }
         // now create a new registration for the ticket

Indentation +39 added lines, -39 removed lines

@@ -21,47 +21,47 @@
 class CreateRegistrationCommandHandler extends CommandHandler
 {
 
-    /**
-     * @var CreateRegistrationService $registration_service
-     */
-    private $registration_service;
+	/**
+	 * @var CreateRegistrationService $registration_service
+	 */
+	private $registration_service;
 
 
-    /**
-     * Command constructor
-     *
-     * @param CreateRegistrationService $registration_service
-     */
-    public function __construct(CreateRegistrationService $registration_service)
-    {
-        defined('EVENT_ESPRESSO_VERSION') || exit;
-        $this->registration_service = $registration_service;
-    }
+	/**
+	 * Command constructor
+	 *
+	 * @param CreateRegistrationService $registration_service
+	 */
+	public function __construct(CreateRegistrationService $registration_service)
+	{
+		defined('EVENT_ESPRESSO_VERSION') || exit;
+		$this->registration_service = $registration_service;
+	}
 
 
-    /**
-     * @param  CommandInterface|CreateRegistrationCommand $command
-     * @return mixed
-     * @throws OutOfRangeException
-     * @throws UnexpectedEntityException
-     * @throws EE_Error
-     * @throws InvalidEntityException
-     */
-    public function handle(CommandInterface $command)
-    {
-        /** @var CreateRegistrationCommand $command */
-        if (! $command instanceof CreateRegistrationCommand) {
-            throw new InvalidEntityException(get_class($command), 'CreateRegistrationCommand');
-        }
-        // now create a new registration for the ticket
-        return $this->registration_service->create(
-            $command->ticket()->get_related_event(),
-            $command->transaction(),
-            $command->ticket(),
-            $command->ticketLineItem(),
-            $command->regCount(),
-            $command->regGroupSize(),
-            $command->regStatus()
-        );
-    }
+	/**
+	 * @param  CommandInterface|CreateRegistrationCommand $command
+	 * @return mixed
+	 * @throws OutOfRangeException
+	 * @throws UnexpectedEntityException
+	 * @throws EE_Error
+	 * @throws InvalidEntityException
+	 */
+	public function handle(CommandInterface $command)
+	{
+		/** @var CreateRegistrationCommand $command */
+		if (! $command instanceof CreateRegistrationCommand) {
+			throw new InvalidEntityException(get_class($command), 'CreateRegistrationCommand');
+		}
+		// now create a new registration for the ticket
+		return $this->registration_service->create(
+			$command->ticket()->get_related_event(),
+			$command->transaction(),
+			$command->ticket(),
+			$command->ticketLineItem(),
+			$command->regCount(),
+			$command->regGroupSize(),
+			$command->regStatus()
+		);
+	}
 }

core/domain/services/commands/registration/CancelRegistrationAndTicketLineItemCommandHandler.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
     public function handle(CommandInterface $command)
     {
         /** @var CancelRegistrationAndTicketLineItemCommand $command */
-        if (! $command instanceof CancelRegistrationAndTicketLineItemCommand) {
+        if ( ! $command instanceof CancelRegistrationAndTicketLineItemCommand) {
             throw new InvalidEntityException(get_class($command), 'CancelRegistrationAndTicketLineItemCommand');
         }
         $registration = $command->registration();

Indentation +40 added lines, -40 removed lines

@@ -27,48 +27,48 @@
 class CancelRegistrationAndTicketLineItemCommandHandler extends CommandHandler
 {
 
-    /**
-     * @var CancelTicketLineItemService $cancel_ticket_line_item_service
-     */
-    private $cancel_ticket_line_item_service;
+	/**
+	 * @var CancelTicketLineItemService $cancel_ticket_line_item_service
+	 */
+	private $cancel_ticket_line_item_service;
 
 
-    /**
-     * Command constructor
-     *
-     * @param CancelTicketLineItemService $cancel_ticket_line_item_service
-     */
-    public function __construct(CancelTicketLineItemService $cancel_ticket_line_item_service)
-    {
-        defined('EVENT_ESPRESSO_VERSION') || exit;
-        $this->cancel_ticket_line_item_service = $cancel_ticket_line_item_service;
-    }
+	/**
+	 * Command constructor
+	 *
+	 * @param CancelTicketLineItemService $cancel_ticket_line_item_service
+	 */
+	public function __construct(CancelTicketLineItemService $cancel_ticket_line_item_service)
+	{
+		defined('EVENT_ESPRESSO_VERSION') || exit;
+		$this->cancel_ticket_line_item_service = $cancel_ticket_line_item_service;
+	}
 
 
-    /**
-     * @param CommandInterface|CancelRegistrationAndTicketLineItemCommand $command
-     * @return boolean
-     * @throws DomainException
-     * @throws EE_Error
-     * @throws EntityNotFoundException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws RuntimeException
-     */
-    public function handle(CommandInterface $command)
-    {
-        /** @var CancelRegistrationAndTicketLineItemCommand $command */
-        if (! $command instanceof CancelRegistrationAndTicketLineItemCommand) {
-            throw new InvalidEntityException(get_class($command), 'CancelRegistrationAndTicketLineItemCommand');
-        }
-        $registration = $command->registration();
-        $this->cancel_ticket_line_item_service->forRegistration($registration);
-        // cancel original registration
-        $registration->set_status(EEM_Registration::status_id_cancelled);
-        $registration->save();
-        return true;
-    }
+	/**
+	 * @param CommandInterface|CancelRegistrationAndTicketLineItemCommand $command
+	 * @return boolean
+	 * @throws DomainException
+	 * @throws EE_Error
+	 * @throws EntityNotFoundException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws RuntimeException
+	 */
+	public function handle(CommandInterface $command)
+	{
+		/** @var CancelRegistrationAndTicketLineItemCommand $command */
+		if (! $command instanceof CancelRegistrationAndTicketLineItemCommand) {
+			throw new InvalidEntityException(get_class($command), 'CancelRegistrationAndTicketLineItemCommand');
+		}
+		$registration = $command->registration();
+		$this->cancel_ticket_line_item_service->forRegistration($registration);
+		// cancel original registration
+		$registration->set_status(EEM_Registration::status_id_cancelled);
+		$registration->save();
+		return true;
+	}
 }

core/domain/services/commands/ticket/CreateTicketLineItemCommandHandler.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
     public function handle(CommandInterface $command)
     {
         /** @var CreateTicketLineItemCommand $command */
-        if (! $command instanceof CreateTicketLineItemCommand) {
+        if ( ! $command instanceof CreateTicketLineItemCommand) {
             throw new InvalidEntityException(get_class($command), 'CreateTicketLineItemCommand');
         }
         // create new line item for ticket

Indentation +34 added lines, -34 removed lines

@@ -20,42 +20,42 @@
  */
 class CreateTicketLineItemCommandHandler extends CommandHandler
 {
-    /**
-     * @var CreateTicketLineItemService $factory
-     */
-    private $factory;
+	/**
+	 * @var CreateTicketLineItemService $factory
+	 */
+	private $factory;
 
 
-    /**
-     * Command constructor
-     *
-     * @param CreateTicketLineItemService $factory
-     */
-    public function __construct(CreateTicketLineItemService $factory)
-    {
-        defined('EVENT_ESPRESSO_VERSION') || exit;
-        $this->factory = $factory;
-    }
+	/**
+	 * Command constructor
+	 *
+	 * @param CreateTicketLineItemService $factory
+	 */
+	public function __construct(CreateTicketLineItemService $factory)
+	{
+		defined('EVENT_ESPRESSO_VERSION') || exit;
+		$this->factory = $factory;
+	}
 
 
-    /**
-     * @param CommandInterface|CreateTicketLineItemCommand $command
-     * @return EE_Line_Item
-     * @throws InvalidEntityException
-     * @throws UnexpectedEntityException
-     * @throws EE_Error
-     */
-    public function handle(CommandInterface $command)
-    {
-        /** @var CreateTicketLineItemCommand $command */
-        if (! $command instanceof CreateTicketLineItemCommand) {
-            throw new InvalidEntityException(get_class($command), 'CreateTicketLineItemCommand');
-        }
-        // create new line item for ticket
-        return $this->factory->create(
-            $command->transaction(),
-            $command->ticket(),
-            $command->quantity()
-        );
-    }
+	/**
+	 * @param CommandInterface|CreateTicketLineItemCommand $command
+	 * @return EE_Line_Item
+	 * @throws InvalidEntityException
+	 * @throws UnexpectedEntityException
+	 * @throws EE_Error
+	 */
+	public function handle(CommandInterface $command)
+	{
+		/** @var CreateTicketLineItemCommand $command */
+		if (! $command instanceof CreateTicketLineItemCommand) {
+			throw new InvalidEntityException(get_class($command), 'CreateTicketLineItemCommand');
+		}
+		// create new line item for ticket
+		return $this->factory->create(
+			$command->transaction(),
+			$command->ticket(),
+			$command->quantity()
+		);
+	}
 }

core/domain/services/commands/ticket/CancelTicketLineItemCommandHandler.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
     public function handle(CommandInterface $command)
     {
         /** @var CancelTicketLineItemCommand $command */
-        if (! $command instanceof CancelTicketLineItemCommand) {
+        if ( ! $command instanceof CancelTicketLineItemCommand) {
             throw new InvalidEntityException(get_class($command), 'CancelTicketLineItemCommand');
         }
         return $this->cancel_ticket_line_item_service->cancel(

Indentation +33 added lines, -33 removed lines

@@ -21,41 +21,41 @@
  */
 class CancelTicketLineItemCommandHandler extends CommandHandler
 {
-    /**
-     * @var CancelTicketLineItemService $cancel_ticket_line_item_service
-     */
-    private $cancel_ticket_line_item_service;
+	/**
+	 * @var CancelTicketLineItemService $cancel_ticket_line_item_service
+	 */
+	private $cancel_ticket_line_item_service;
 
 
-    /**
-     * Command constructor
-     *
-     * @param CancelTicketLineItemService $cancel_ticket_line_item_service
-     */
-    public function __construct(CancelTicketLineItemService $cancel_ticket_line_item_service)
-    {
-        defined('EVENT_ESPRESSO_VERSION') || exit;
-        $this->cancel_ticket_line_item_service = $cancel_ticket_line_item_service;
-    }
+	/**
+	 * Command constructor
+	 *
+	 * @param CancelTicketLineItemService $cancel_ticket_line_item_service
+	 */
+	public function __construct(CancelTicketLineItemService $cancel_ticket_line_item_service)
+	{
+		defined('EVENT_ESPRESSO_VERSION') || exit;
+		$this->cancel_ticket_line_item_service = $cancel_ticket_line_item_service;
+	}
 
 
-    /**
-     * @param CommandInterface|CancelTicketLineItemCommand $command
-     * @return mixed
-     * @throws InvalidEntityException
-     * @throws RuntimeException
-     */
-    public function handle(CommandInterface $command)
-    {
-        /** @var CancelTicketLineItemCommand $command */
-        if (! $command instanceof CancelTicketLineItemCommand) {
-            throw new InvalidEntityException(get_class($command), 'CancelTicketLineItemCommand');
-        }
-        return $this->cancel_ticket_line_item_service->cancel(
-            $command->transaction(),
-            $command->ticket(),
-            $command->quantity(),
-            $command->ticketLineItem()
-        );
-    }
+	/**
+	 * @param CommandInterface|CancelTicketLineItemCommand $command
+	 * @return mixed
+	 * @throws InvalidEntityException
+	 * @throws RuntimeException
+	 */
+	public function handle(CommandInterface $command)
+	{
+		/** @var CancelTicketLineItemCommand $command */
+		if (! $command instanceof CancelTicketLineItemCommand) {
+			throw new InvalidEntityException(get_class($command), 'CancelTicketLineItemCommand');
+		}
+		return $this->cancel_ticket_line_item_service->cancel(
+			$command->transaction(),
+			$command->ticket(),
+			$command->quantity(),
+			$command->ticketLineItem()
+		);
+	}
 }

core/domain/services/commands/attendee/CreateAttendeeCommandHandler.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
     public function handle(CommandInterface $command)
     {
         /** @var CreateAttendeeCommand $command */
-        if (! $command instanceof CreateAttendeeCommand) {
+        if ( ! $command instanceof CreateAttendeeCommand) {
             throw new InvalidEntityException(get_class($command), 'CreateAttendeeCommand');
         }
         // have we met before?

Indentation +128 added lines, -128 removed lines

@@ -20,142 +20,142 @@
  */
 class CreateAttendeeCommandHandler extends CommandHandler
 {
-    /**
-     * @var EEM_Attendee $attendee_model
-     */
-    protected $attendee_model;
+	/**
+	 * @var EEM_Attendee $attendee_model
+	 */
+	protected $attendee_model;
 
 
-    /**
-     * @param EEM_Attendee $attendee_model
-     */
-    public function __construct(EEM_Attendee $attendee_model)
-    {
-        defined('EVENT_ESPRESSO_VERSION') || exit;
-        $this->attendee_model = $attendee_model;
-    }
+	/**
+	 * @param EEM_Attendee $attendee_model
+	 */
+	public function __construct(EEM_Attendee $attendee_model)
+	{
+		defined('EVENT_ESPRESSO_VERSION') || exit;
+		$this->attendee_model = $attendee_model;
+	}
 
 
-    /**
-     * @param CommandInterface|CreateAttendeeCommand $command
-     * @return EE_Attendee
-     * @throws EE_Error
-     * @throws InvalidEntityException
-     */
-    public function handle(CommandInterface $command)
-    {
-        /** @var CreateAttendeeCommand $command */
-        if (! $command instanceof CreateAttendeeCommand) {
-            throw new InvalidEntityException(get_class($command), 'CreateAttendeeCommand');
-        }
-        // have we met before?
-        $attendee = $this->findExistingAttendee(
-            $command->registration(),
-            $command->attendeeDetails()
-        );
-        // did we find an already existing record for this attendee ?
-        if ($attendee instanceof EE_Attendee) {
-            $attendee = $this->updateExistingAttendeeData(
-                $attendee,
-                $command->attendeeDetails()
-            );
-        } else {
-            $attendee = $this->createNewAttendee(
-                $command->registration(),
-                $command->attendeeDetails()
-            );
-        }
-        return $attendee;
-    }
+	/**
+	 * @param CommandInterface|CreateAttendeeCommand $command
+	 * @return EE_Attendee
+	 * @throws EE_Error
+	 * @throws InvalidEntityException
+	 */
+	public function handle(CommandInterface $command)
+	{
+		/** @var CreateAttendeeCommand $command */
+		if (! $command instanceof CreateAttendeeCommand) {
+			throw new InvalidEntityException(get_class($command), 'CreateAttendeeCommand');
+		}
+		// have we met before?
+		$attendee = $this->findExistingAttendee(
+			$command->registration(),
+			$command->attendeeDetails()
+		);
+		// did we find an already existing record for this attendee ?
+		if ($attendee instanceof EE_Attendee) {
+			$attendee = $this->updateExistingAttendeeData(
+				$attendee,
+				$command->attendeeDetails()
+			);
+		} else {
+			$attendee = $this->createNewAttendee(
+				$command->registration(),
+				$command->attendeeDetails()
+			);
+		}
+		return $attendee;
+	}
 
 
-    /**
-     * find_existing_attendee
-     *
-     * @param EE_Registration $registration
-     * @param array           $attendee_data
-     * @return EE_Attendee
-     * @throws EE_Error
-     */
-    private function findExistingAttendee(EE_Registration $registration, array $attendee_data)
-    {
-        $existing_attendee = null;
-        // does this attendee already exist in the db ?
-        // we're searching using a combination of first name, last name, AND email address
-        $ATT_fname = ! empty($attendee_data['ATT_fname'])
-            ? $attendee_data['ATT_fname']
-            : '';
-        $ATT_lname = ! empty($attendee_data['ATT_lname'])
-            ? $attendee_data['ATT_lname']
-            : '';
-        $ATT_email = ! empty($attendee_data['ATT_email'])
-            ? $attendee_data['ATT_email']
-            : '';
-        // but only if those have values
-        if ($ATT_fname && $ATT_lname && $ATT_email) {
-            $existing_attendee = $this->attendee_model->find_existing_attendee(
-                [
-                    'ATT_fname' => $ATT_fname,
-                    'ATT_lname' => $ATT_lname,
-                    'ATT_email' => $ATT_email,
-                ]
-            );
-        }
-        return apply_filters(
-            'FHEE_EventEspresso_core_domain_services_commands_attendee_CreateAttendeeCommandHandler__findExistingAttendee__existing_attendee',
-            $existing_attendee,
-            $registration,
-            $attendee_data
-        );
-    }
+	/**
+	 * find_existing_attendee
+	 *
+	 * @param EE_Registration $registration
+	 * @param array           $attendee_data
+	 * @return EE_Attendee
+	 * @throws EE_Error
+	 */
+	private function findExistingAttendee(EE_Registration $registration, array $attendee_data)
+	{
+		$existing_attendee = null;
+		// does this attendee already exist in the db ?
+		// we're searching using a combination of first name, last name, AND email address
+		$ATT_fname = ! empty($attendee_data['ATT_fname'])
+			? $attendee_data['ATT_fname']
+			: '';
+		$ATT_lname = ! empty($attendee_data['ATT_lname'])
+			? $attendee_data['ATT_lname']
+			: '';
+		$ATT_email = ! empty($attendee_data['ATT_email'])
+			? $attendee_data['ATT_email']
+			: '';
+		// but only if those have values
+		if ($ATT_fname && $ATT_lname && $ATT_email) {
+			$existing_attendee = $this->attendee_model->find_existing_attendee(
+				[
+					'ATT_fname' => $ATT_fname,
+					'ATT_lname' => $ATT_lname,
+					'ATT_email' => $ATT_email,
+				]
+			);
+		}
+		return apply_filters(
+			'FHEE_EventEspresso_core_domain_services_commands_attendee_CreateAttendeeCommandHandler__findExistingAttendee__existing_attendee',
+			$existing_attendee,
+			$registration,
+			$attendee_data
+		);
+	}
 
 
-    /**
-     * _update_existing_attendee_data
-     * in case it has changed since last time they registered for an event
-     *
-     * @param EE_Attendee $existing_attendee
-     * @param array       $attendee_data
-     * @return EE_Attendee
-     * @throws EE_Error
-     */
-    private function updateExistingAttendeeData(EE_Attendee $existing_attendee, array $attendee_data)
-    {
-        // first remove fname, lname, and email from attendee data
-        // because these properties will be exactly the same as the returned attendee object,
-        // since they were used in the query to get the attendee object in the first place
-        $dont_set = ['ATT_fname', 'ATT_lname', 'ATT_email'];
-        // now loop thru what's left and add to attendee CPT
-        foreach ($attendee_data as $property_name => $property_value) {
-            if (
-                ! in_array($property_name, $dont_set, true)
-                && $this->attendee_model->has_field($property_name)
-            ) {
-                $existing_attendee->set($property_name, $property_value);
-            }
-        }
-        // better save that now
-        $existing_attendee->save();
-        return $existing_attendee;
-    }
+	/**
+	 * _update_existing_attendee_data
+	 * in case it has changed since last time they registered for an event
+	 *
+	 * @param EE_Attendee $existing_attendee
+	 * @param array       $attendee_data
+	 * @return EE_Attendee
+	 * @throws EE_Error
+	 */
+	private function updateExistingAttendeeData(EE_Attendee $existing_attendee, array $attendee_data)
+	{
+		// first remove fname, lname, and email from attendee data
+		// because these properties will be exactly the same as the returned attendee object,
+		// since they were used in the query to get the attendee object in the first place
+		$dont_set = ['ATT_fname', 'ATT_lname', 'ATT_email'];
+		// now loop thru what's left and add to attendee CPT
+		foreach ($attendee_data as $property_name => $property_value) {
+			if (
+				! in_array($property_name, $dont_set, true)
+				&& $this->attendee_model->has_field($property_name)
+			) {
+				$existing_attendee->set($property_name, $property_value);
+			}
+		}
+		// better save that now
+		$existing_attendee->save();
+		return $existing_attendee;
+	}
 
 
-    /**
-     * create_new_attendee
-     *
-     * @param EE_Registration $registration
-     * @param array           $attendee_data
-     * @return EE_Attendee
-     * @throws EE_Error
-     * @throws EntityNotFoundException
-     */
-    private function createNewAttendee(EE_Registration $registration, array $attendee_data)
-    {
-        // create new attendee object
-        $new_attendee = EE_Attendee::new_instance($attendee_data);
-        // set author to event creator
-        $new_attendee->set('ATT_author', $registration->event()->wp_user());
-        $new_attendee->save();
-        return $new_attendee;
-    }
+	/**
+	 * create_new_attendee
+	 *
+	 * @param EE_Registration $registration
+	 * @param array           $attendee_data
+	 * @return EE_Attendee
+	 * @throws EE_Error
+	 * @throws EntityNotFoundException
+	 */
+	private function createNewAttendee(EE_Registration $registration, array $attendee_data)
+	{
+		// create new attendee object
+		$new_attendee = EE_Attendee::new_instance($attendee_data);
+		// set author to event creator
+		$new_attendee->set('ATT_author', $registration->event()->wp_user());
+		$new_attendee->save();
+		return $new_attendee;
+	}
 }

core/services/commands/middleware/LocateMovedCommands.php

Indentation +183 added lines, -183 removed lines

@@ -39,187 +39,187 @@
 class LocateMovedCommands implements CommandBusMiddlewareInterface
 {
 
-    /**
-     * @param CommandInterface $command
-     * @param Closure          $next
-     * @return mixed
-     */
-    public function handle(CommandInterface $command, Closure $next)
-    {
-        $command_class = get_class($command);
-        switch ($command_class) {
-            case 'EventEspresso\core\services\commands\attendee\CreateAttendeeCommand' :
-                $command = $this->getCreateAttendeeCommand($command);
-                break;
-            case 'EventEspresso\core\services\commands\registration\CancelRegistrationAndTicketLineItemCommand' :
-                $command = $this->getCancelRegistrationAndTicketLineItemCommand($command);
-                break;
-            case 'EventEspresso\core\services\commands\registration\CopyRegistrationDetailsCommand' :
-                $command = $this->getCopyRegistrationDetailsCommand($command);
-                break;
-            case 'EventEspresso\core\services\commands\registration\CopyRegistrationPaymentsCommand' :
-                $command = $this->getCopyRegistrationPaymentsCommand($command);
-                break;
-            case 'EventEspresso\core\services\commands\registration\CreateRegistrationCommand' :
-                $command = $this->getCreateRegistrationCommand($command);
-                break;
-            case 'EventEspresso\core\services\commands\registration\UpdateRegistrationAndTransactionAfterChangeCommand' :
-                $command = $this->getUpdateRegistrationAndTransactionAfterChangeCommand($command);
-                break;
-            case 'EventEspresso\core\services\commands\ticket\CancelTicketLineItemCommand' :
-                $command = $this->getCancelTicketLineItemCommand($command);
-                break;
-            case 'EventEspresso\core\services\commands\ticket\CreateTicketLineItemCommand' :
-                $command = $this->getCreateTicketLineItemCommand($command);
-                break;
-            case 'EventEspresso\core\services\commands\transaction\CreateTransactionCommand' :
-                $command = $this->getCreateTransactionCommand($command);
-                break;
-        }
-        return $next($command);
-    }
-
-
-    /**
-     * @param OldCreateAttendeeCommand|CommandInterface $command
-     * @return CreateAttendeeCommand|OldCreateAttendeeCommand
-     */
-    private function getCreateAttendeeCommand(OldCreateAttendeeCommand $command)
-    {
-        return class_exists('EventEspresso\core\domain\services\commands\attendee\CreateAttendeeCommand')
-            ? new CreateAttendeeCommand(
-                $command->attendeeDetails(),
-                $command->registration()
-            )
-            : $command;
-    }
-
-
-    /**
-     * @param OldCancelRegistrationAndTicketLineItemCommand|CommandInterface $command
-     * @return CancelRegistrationAndTicketLineItemCommand|OldCancelRegistrationAndTicketLineItemCommand
-     */
-    private function getCancelRegistrationAndTicketLineItemCommand(
-        OldCancelRegistrationAndTicketLineItemCommand $command
-    ) {
-        return class_exists('EventEspresso\core\domain\services\commands\attendee\CreateAttendeeCommand')
-            ? new CancelRegistrationAndTicketLineItemCommand($command->registration())
-            : $command;
-    }
-
-
-    /**
-     * @param OldCopyRegistrationDetailsCommand|CommandInterface $command
-     * @return CopyRegistrationDetailsCommand|OldCopyRegistrationDetailsCommand
-     */
-    private function getCopyRegistrationDetailsCommand(
-        OldCopyRegistrationDetailsCommand $command
-    ) {
-        return class_exists('EventEspresso\core\domain\services\commands\attendee\CreateAttendeeCommand')
-            ? new CopyRegistrationDetailsCommand(
-                $command->targetRegistration(),
-                $command->registrationToCopy()
-            )
-            : $command;
-    }
-
-
-    /**
-     * @param OldCopyRegistrationPaymentsCommand|CommandInterface $command
-     * @return CopyRegistrationPaymentsCommand|OldCopyRegistrationPaymentsCommand
-     */
-    private function getCopyRegistrationPaymentsCommand(
-        OldCopyRegistrationPaymentsCommand $command
-    ) {
-        return class_exists('EventEspresso\core\domain\services\commands\attendee\CreateAttendeeCommand')
-            ? new CopyRegistrationPaymentsCommand(
-                $command->targetRegistration(),
-                $command->registrationToCopy()
-            )
-            : $command;
-    }
-
-
-    /**
-     * @param OldCreateRegistrationCommand|CommandInterface $command
-     * @return CreateRegistrationCommand|OldCreateRegistrationCommand
-     */
-    private function getCreateRegistrationCommand(
-        OldCreateRegistrationCommand $command
-    ) {
-        return class_exists('EventEspresso\core\domain\services\commands\attendee\CreateAttendeeCommand')
-            ? new CreateRegistrationCommand(
-                $command->transaction(),
-                $command->ticketLineItem(),
-                $command->regCount(),
-                $command->regGroupSize(),
-                $command->regStatus(),
-                $command->ticket()
-            )
-            : $command;
-    }
-
-
-    /**
-     * @param OldUpdateRegistrationAndTransactionAfterChangeCommand|CommandInterface $command
-     * @return UpdateRegistrationAndTransactionAfterChangeCommand|OldUpdateRegistrationAndTransactionAfterChangeCommand
-     */
-    private function getUpdateRegistrationAndTransactionAfterChangeCommand(
-        OldUpdateRegistrationAndTransactionAfterChangeCommand $command
-    ) {
-        return class_exists('EventEspresso\core\domain\services\commands\attendee\CreateAttendeeCommand')
-            ? new UpdateRegistrationAndTransactionAfterChangeCommand($command->registration())
-            : $command;
-    }
-
-
-    /**
-     * @param OldCancelTicketLineItemCommand|CommandInterface $command
-     * @return CancelTicketLineItemCommand|OldCancelTicketLineItemCommand
-     */
-    private function getCancelTicketLineItemCommand(
-        OldCancelTicketLineItemCommand $command
-    ) {
-        return class_exists('EventEspresso\core\domain\services\commands\attendee\CreateAttendeeCommand')
-            ? new CancelTicketLineItemCommand(
-                $command->transaction(),
-                $command->ticket(),
-                $command->quantity(),
-                $command->ticketLineItem()
-            )
-            : $command;
-    }
-
-
-    /**
-     * @param OldCreateTicketLineItemCommand|CommandInterface $command
-     * @return CreateTicketLineItemCommand|OldCreateTicketLineItemCommand
-     */
-    private function getCreateTicketLineItemCommand(
-        OldCreateTicketLineItemCommand $command
-    ) {
-        return class_exists('EventEspresso\core\domain\services\commands\attendee\CreateAttendeeCommand')
-            ? new CreateTicketLineItemCommand(
-                $command->transaction(),
-                $command->ticket(),
-                $command->quantity()
-            )
-            : $command;
-    }
-
-
-    /**
-     * @param OldCreateTransactionCommand|CommandInterface $command
-     * @return CreateTransactionCommand|OldCreateTransactionCommand
-     */
-    private function getCreateTransactionCommand(
-        OldCreateTransactionCommand $command
-    ) {
-        return class_exists('EventEspresso\core\domain\services\commands\attendee\CreateAttendeeCommand')
-            ? new CreateTransactionCommand(
-                $command->checkout(),
-                $command->transactionDetails()
-            )
-            : $command;
-    }
+	/**
+	 * @param CommandInterface $command
+	 * @param Closure          $next
+	 * @return mixed
+	 */
+	public function handle(CommandInterface $command, Closure $next)
+	{
+		$command_class = get_class($command);
+		switch ($command_class) {
+			case 'EventEspresso\core\services\commands\attendee\CreateAttendeeCommand' :
+				$command = $this->getCreateAttendeeCommand($command);
+				break;
+			case 'EventEspresso\core\services\commands\registration\CancelRegistrationAndTicketLineItemCommand' :
+				$command = $this->getCancelRegistrationAndTicketLineItemCommand($command);
+				break;
+			case 'EventEspresso\core\services\commands\registration\CopyRegistrationDetailsCommand' :
+				$command = $this->getCopyRegistrationDetailsCommand($command);
+				break;
+			case 'EventEspresso\core\services\commands\registration\CopyRegistrationPaymentsCommand' :
+				$command = $this->getCopyRegistrationPaymentsCommand($command);
+				break;
+			case 'EventEspresso\core\services\commands\registration\CreateRegistrationCommand' :
+				$command = $this->getCreateRegistrationCommand($command);
+				break;
+			case 'EventEspresso\core\services\commands\registration\UpdateRegistrationAndTransactionAfterChangeCommand' :
+				$command = $this->getUpdateRegistrationAndTransactionAfterChangeCommand($command);
+				break;
+			case 'EventEspresso\core\services\commands\ticket\CancelTicketLineItemCommand' :
+				$command = $this->getCancelTicketLineItemCommand($command);
+				break;
+			case 'EventEspresso\core\services\commands\ticket\CreateTicketLineItemCommand' :
+				$command = $this->getCreateTicketLineItemCommand($command);
+				break;
+			case 'EventEspresso\core\services\commands\transaction\CreateTransactionCommand' :
+				$command = $this->getCreateTransactionCommand($command);
+				break;
+		}
+		return $next($command);
+	}
+
+
+	/**
+	 * @param OldCreateAttendeeCommand|CommandInterface $command
+	 * @return CreateAttendeeCommand|OldCreateAttendeeCommand
+	 */
+	private function getCreateAttendeeCommand(OldCreateAttendeeCommand $command)
+	{
+		return class_exists('EventEspresso\core\domain\services\commands\attendee\CreateAttendeeCommand')
+			? new CreateAttendeeCommand(
+				$command->attendeeDetails(),
+				$command->registration()
+			)
+			: $command;
+	}
+
+
+	/**
+	 * @param OldCancelRegistrationAndTicketLineItemCommand|CommandInterface $command
+	 * @return CancelRegistrationAndTicketLineItemCommand|OldCancelRegistrationAndTicketLineItemCommand
+	 */
+	private function getCancelRegistrationAndTicketLineItemCommand(
+		OldCancelRegistrationAndTicketLineItemCommand $command
+	) {
+		return class_exists('EventEspresso\core\domain\services\commands\attendee\CreateAttendeeCommand')
+			? new CancelRegistrationAndTicketLineItemCommand($command->registration())
+			: $command;
+	}
+
+
+	/**
+	 * @param OldCopyRegistrationDetailsCommand|CommandInterface $command
+	 * @return CopyRegistrationDetailsCommand|OldCopyRegistrationDetailsCommand
+	 */
+	private function getCopyRegistrationDetailsCommand(
+		OldCopyRegistrationDetailsCommand $command
+	) {
+		return class_exists('EventEspresso\core\domain\services\commands\attendee\CreateAttendeeCommand')
+			? new CopyRegistrationDetailsCommand(
+				$command->targetRegistration(),
+				$command->registrationToCopy()
+			)
+			: $command;
+	}
+
+
+	/**
+	 * @param OldCopyRegistrationPaymentsCommand|CommandInterface $command
+	 * @return CopyRegistrationPaymentsCommand|OldCopyRegistrationPaymentsCommand
+	 */
+	private function getCopyRegistrationPaymentsCommand(
+		OldCopyRegistrationPaymentsCommand $command
+	) {
+		return class_exists('EventEspresso\core\domain\services\commands\attendee\CreateAttendeeCommand')
+			? new CopyRegistrationPaymentsCommand(
+				$command->targetRegistration(),
+				$command->registrationToCopy()
+			)
+			: $command;
+	}
+
+
+	/**
+	 * @param OldCreateRegistrationCommand|CommandInterface $command
+	 * @return CreateRegistrationCommand|OldCreateRegistrationCommand
+	 */
+	private function getCreateRegistrationCommand(
+		OldCreateRegistrationCommand $command
+	) {
+		return class_exists('EventEspresso\core\domain\services\commands\attendee\CreateAttendeeCommand')
+			? new CreateRegistrationCommand(
+				$command->transaction(),
+				$command->ticketLineItem(),
+				$command->regCount(),
+				$command->regGroupSize(),
+				$command->regStatus(),
+				$command->ticket()
+			)
+			: $command;
+	}
+
+
+	/**
+	 * @param OldUpdateRegistrationAndTransactionAfterChangeCommand|CommandInterface $command
+	 * @return UpdateRegistrationAndTransactionAfterChangeCommand|OldUpdateRegistrationAndTransactionAfterChangeCommand
+	 */
+	private function getUpdateRegistrationAndTransactionAfterChangeCommand(
+		OldUpdateRegistrationAndTransactionAfterChangeCommand $command
+	) {
+		return class_exists('EventEspresso\core\domain\services\commands\attendee\CreateAttendeeCommand')
+			? new UpdateRegistrationAndTransactionAfterChangeCommand($command->registration())
+			: $command;
+	}
+
+
+	/**
+	 * @param OldCancelTicketLineItemCommand|CommandInterface $command
+	 * @return CancelTicketLineItemCommand|OldCancelTicketLineItemCommand
+	 */
+	private function getCancelTicketLineItemCommand(
+		OldCancelTicketLineItemCommand $command
+	) {
+		return class_exists('EventEspresso\core\domain\services\commands\attendee\CreateAttendeeCommand')
+			? new CancelTicketLineItemCommand(
+				$command->transaction(),
+				$command->ticket(),
+				$command->quantity(),
+				$command->ticketLineItem()
+			)
+			: $command;
+	}
+
+
+	/**
+	 * @param OldCreateTicketLineItemCommand|CommandInterface $command
+	 * @return CreateTicketLineItemCommand|OldCreateTicketLineItemCommand
+	 */
+	private function getCreateTicketLineItemCommand(
+		OldCreateTicketLineItemCommand $command
+	) {
+		return class_exists('EventEspresso\core\domain\services\commands\attendee\CreateAttendeeCommand')
+			? new CreateTicketLineItemCommand(
+				$command->transaction(),
+				$command->ticket(),
+				$command->quantity()
+			)
+			: $command;
+	}
+
+
+	/**
+	 * @param OldCreateTransactionCommand|CommandInterface $command
+	 * @return CreateTransactionCommand|OldCreateTransactionCommand
+	 */
+	private function getCreateTransactionCommand(
+		OldCreateTransactionCommand $command
+	) {
+		return class_exists('EventEspresso\core\domain\services\commands\attendee\CreateAttendeeCommand')
+			? new CreateTransactionCommand(
+				$command->checkout(),
+				$command->transactionDetails()
+			)
+			: $command;
+	}
 }

public/template_tags.php

Indentation +1057 added lines, -1057 removed lines

@@ -19,13 +19,13 @@ 
  */
 function is_espresso_event($event = null)
 {
-    if (can_use_espresso_conditionals(__FUNCTION__)) {
-        // extract EE_Event object from passed param regardless of what it is (within reason of course)
-        $event = EEH_Event_View::get_event($event);
-        // do we have a valid event ?
-        return $event instanceof EE_Event;
-    }
-    return false;
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
+		// extract EE_Event object from passed param regardless of what it is (within reason of course)
+		$event = EEH_Event_View::get_event($event);
+		// do we have a valid event ?
+		return $event instanceof EE_Event;
+	}
+	return false;
 }
 
 /**
@@ -36,12 +36,12 @@ 
  */
 function is_espresso_event_single()
 {
-    if (can_use_espresso_conditionals(__FUNCTION__)) {
-        global $wp_query;
-        // return conditionals set by CPTs
-        return $wp_query instanceof WP_Query ? $wp_query->is_espresso_event_single : false;
-    }
-    return false;
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
+		global $wp_query;
+		// return conditionals set by CPTs
+		return $wp_query instanceof WP_Query ? $wp_query->is_espresso_event_single : false;
+	}
+	return false;
 }
 
 /**
@@ -52,11 +52,11 @@ 
  */
 function is_espresso_event_archive()
 {
-    if (can_use_espresso_conditionals(__FUNCTION__)) {
-        global $wp_query;
-        return $wp_query instanceof WP_Query ? $wp_query->is_espresso_event_archive : false;
-    }
-    return false;
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
+		global $wp_query;
+		return $wp_query instanceof WP_Query ? $wp_query->is_espresso_event_archive : false;
+	}
+	return false;
 }
 
 /**
@@ -67,11 +67,11 @@ 
  */
 function is_espresso_event_taxonomy()
 {
-    if (can_use_espresso_conditionals(__FUNCTION__)) {
-        global $wp_query;
-        return $wp_query instanceof WP_Query ? $wp_query->is_espresso_event_taxonomy : false;
-    }
-    return false;
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
+		global $wp_query;
+		return $wp_query instanceof WP_Query ? $wp_query->is_espresso_event_taxonomy : false;
+	}
+	return false;
 }
 
 /**
@@ -85,13 +85,13 @@ 
  */
 function is_espresso_venue($venue = null)
 {
-    if (can_use_espresso_conditionals(__FUNCTION__)) {
-        // extract EE_Venue object from passed param regardless of what it is (within reason of course)
-        $venue = EEH_Venue_View::get_venue($venue, false);
-        // do we have a valid event ?
-        return $venue instanceof EE_Venue;
-    }
-    return false;
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
+		// extract EE_Venue object from passed param regardless of what it is (within reason of course)
+		$venue = EEH_Venue_View::get_venue($venue, false);
+		// do we have a valid event ?
+		return $venue instanceof EE_Venue;
+	}
+	return false;
 }
 
 /**
@@ -102,11 +102,11 @@ 
  */
 function is_espresso_venue_single()
 {
-    if (can_use_espresso_conditionals(__FUNCTION__)) {
-        global $wp_query;
-        return $wp_query instanceof WP_Query ? $wp_query->is_espresso_venue_single : false;
-    }
-    return false;
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
+		global $wp_query;
+		return $wp_query instanceof WP_Query ? $wp_query->is_espresso_venue_single : false;
+	}
+	return false;
 }
 
 /**
@@ -117,11 +117,11 @@ 
  */
 function is_espresso_venue_archive()
 {
-    if (can_use_espresso_conditionals(__FUNCTION__)) {
-        global $wp_query;
-        return $wp_query instanceof WP_Query ? $wp_query->is_espresso_venue_archive : false;
-    }
-    return false;
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
+		global $wp_query;
+		return $wp_query instanceof WP_Query ? $wp_query->is_espresso_venue_archive : false;
+	}
+	return false;
 }
 
 /**
@@ -132,11 +132,11 @@ 
  */
 function is_espresso_venue_taxonomy()
 {
-    if (can_use_espresso_conditionals(__FUNCTION__)) {
-        global $wp_query;
-        return $wp_query instanceof WP_Query ? $wp_query->is_espresso_venue_taxonomy : false;
-    }
-    return false;
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
+		global $wp_query;
+		return $wp_query instanceof WP_Query ? $wp_query->is_espresso_venue_taxonomy : false;
+	}
+	return false;
 }
 
 /**
@@ -148,62 +148,62 @@ 
  */
 function can_use_espresso_conditionals($conditional_tag)
 {
-    if (! did_action('AHEE__EE_System__initialize')) {
-        EE_Error::doing_it_wrong(
-            __FUNCTION__,
-            sprintf(
-                esc_html__(
-                    'The "%s" conditional tag can not be used until after the "init" hook has run, but works best when used within a theme\'s template files.',
-                    'event_espresso'
-                ),
-                $conditional_tag
-            ),
-            '4.4.0'
-        );
-        return false;
-    }
-    return true;
+	if (! did_action('AHEE__EE_System__initialize')) {
+		EE_Error::doing_it_wrong(
+			__FUNCTION__,
+			sprintf(
+				esc_html__(
+					'The "%s" conditional tag can not be used until after the "init" hook has run, but works best when used within a theme\'s template files.',
+					'event_espresso'
+				),
+				$conditional_tag
+			),
+			'4.4.0'
+		);
+		return false;
+	}
+	return true;
 }
 
 
 /*************************** Event Queries ***************************/
 
 if (! function_exists('espresso_get_events')) {
-    /**
-     *    espresso_get_events
-     *
-     * @param array $params
-     * @return array
-     */
-    function espresso_get_events($params = [])
-    {
-        //set default params
-        $default_espresso_events_params = [
-            'limit'         => 10,
-            'show_expired'  => false,
-            'month'         => null,
-            'category_slug' => null,
-            'order_by'      => 'start_date',
-            'sort'          => 'ASC',
-        ];
-        // allow the defaults to be filtered
-        $default_espresso_events_params = apply_filters(
-            'espresso_get_events__default_espresso_events_params',
-            $default_espresso_events_params
-        );
-        // grab params and merge with defaults, then extract
-        $params = array_merge($default_espresso_events_params, $params);
-        // run the query
-        $events_query = new EventEspresso\core\domain\services\wp_queries\EventListQuery($params);
-        // assign results to a variable so we can return it
-        $events = $events_query->have_posts() ? $events_query->posts : [];
-        // but first reset the query and postdata
-        wp_reset_query();
-        wp_reset_postdata();
-        EED_Events_Archive::remove_all_events_archive_filters();
-        unset($events_query);
-        return $events;
-    }
+	/**
+	 *    espresso_get_events
+	 *
+	 * @param array $params
+	 * @return array
+	 */
+	function espresso_get_events($params = [])
+	{
+		//set default params
+		$default_espresso_events_params = [
+			'limit'         => 10,
+			'show_expired'  => false,
+			'month'         => null,
+			'category_slug' => null,
+			'order_by'      => 'start_date',
+			'sort'          => 'ASC',
+		];
+		// allow the defaults to be filtered
+		$default_espresso_events_params = apply_filters(
+			'espresso_get_events__default_espresso_events_params',
+			$default_espresso_events_params
+		);
+		// grab params and merge with defaults, then extract
+		$params = array_merge($default_espresso_events_params, $params);
+		// run the query
+		$events_query = new EventEspresso\core\domain\services\wp_queries\EventListQuery($params);
+		// assign results to a variable so we can return it
+		$events = $events_query->have_posts() ? $events_query->posts : [];
+		// but first reset the query and postdata
+		wp_reset_query();
+		wp_reset_postdata();
+		EED_Events_Archive::remove_all_events_archive_filters();
+		unset($events_query);
+		return $events;
+	}
 }
 
 
@@ -218,357 +218,357 @@ 
  */
 function espresso_load_ticket_selector()
 {
-    EE_Registry::instance()->load_file(EE_MODULES . 'ticket_selector', 'EED_Ticket_Selector', 'module');
+	EE_Registry::instance()->load_file(EE_MODULES . 'ticket_selector', 'EED_Ticket_Selector', 'module');
 }
 
 if (! function_exists('espresso_ticket_selector')) {
-    /**
-     * espresso_ticket_selector
-     *
-     * @param null $event
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_ticket_selector($event = null)
-    {
-        if (! apply_filters('FHEE_disable_espresso_ticket_selector', false)) {
-            espresso_load_ticket_selector();
-            EED_Ticket_Selector::set_definitions();
-            echo EED_Ticket_Selector::display_ticket_selector($event); // already escaped
-        }
-    }
+	/**
+	 * espresso_ticket_selector
+	 *
+	 * @param null $event
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_ticket_selector($event = null)
+	{
+		if (! apply_filters('FHEE_disable_espresso_ticket_selector', false)) {
+			espresso_load_ticket_selector();
+			EED_Ticket_Selector::set_definitions();
+			echo EED_Ticket_Selector::display_ticket_selector($event); // already escaped
+		}
+	}
 }
 
 
 if (! function_exists('espresso_view_details_btn')) {
-    /**
-     * espresso_view_details_btn
-     *
-     * @param null $event
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_view_details_btn($event = null)
-    {
-        if (! apply_filters('FHEE_disable_espresso_view_details_btn', false)) {
-            espresso_load_ticket_selector();
-            echo EED_Ticket_Selector::display_ticket_selector($event, true); // already escaped
-        }
-    }
+	/**
+	 * espresso_view_details_btn
+	 *
+	 * @param null $event
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_view_details_btn($event = null)
+	{
+		if (! apply_filters('FHEE_disable_espresso_view_details_btn', false)) {
+			espresso_load_ticket_selector();
+			echo EED_Ticket_Selector::display_ticket_selector($event, true); // already escaped
+		}
+	}
 }
 
 
 /*************************** EEH_Event_View ***************************/
 
 if (! function_exists('espresso_load_event_list_assets')) {
-    /**
-     * espresso_load_event_list_assets
-     * ensures that event list styles and scripts are loaded
-     *
-     * @return void
-     */
-    function espresso_load_event_list_assets()
-    {
-        $event_list = EED_Events_Archive::instance();
-        add_action('AHEE__EE_System__initialize_last', [$event_list, 'load_event_list_assets'], 10);
-        add_filter('FHEE_enable_default_espresso_css', '__return_true');
-    }
+	/**
+	 * espresso_load_event_list_assets
+	 * ensures that event list styles and scripts are loaded
+	 *
+	 * @return void
+	 */
+	function espresso_load_event_list_assets()
+	{
+		$event_list = EED_Events_Archive::instance();
+		add_action('AHEE__EE_System__initialize_last', [$event_list, 'load_event_list_assets'], 10);
+		add_filter('FHEE_enable_default_espresso_css', '__return_true');
+	}
 }
 
 
 if (! function_exists('espresso_event_reg_button')) {
-    /**
-     * espresso_event_reg_button
-     * returns the "Register Now" button if event is active,
-     * an inactive button like status banner if the event is not active
-     * or a "Read More" button if so desired
-     *
-     * @param null $btn_text_if_active
-     * @param bool $btn_text_if_inactive
-     * @param bool $EVT_ID
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_reg_button($btn_text_if_active = null, $btn_text_if_inactive = false, $EVT_ID = false)
-    {
-        $event = EEH_Event_View::get_event($EVT_ID);
-        if (! $event instanceof EE_Event) {
-            return;
-        }
-        $event_status = $event->get_active_status();
-        switch ($event_status) {
-            case EE_Datetime::sold_out :
-                $btn_text = __('Sold Out', 'event_espresso');
-                $class    = 'ee-pink';
-                break;
-            case EE_Datetime::expired :
-                $btn_text = __('Event is Over', 'event_espresso');
-                $class    = 'ee-grey';
-                break;
-            case EE_Datetime::inactive :
-                $btn_text = __('Event Not Active', 'event_espresso');
-                $class    = 'ee-grey';
-                break;
-            case EE_Datetime::cancelled :
-                $btn_text = __('Event was Cancelled', 'event_espresso');
-                $class    = 'ee-red';
-                break;
-            case EE_Datetime::upcoming :
-            case EE_Datetime::active :
-            default :
-                $btn_text = ! empty($btn_text_if_active)
-                    ? $btn_text_if_active
-                    : __('Register Now', 'event_espresso');
-                $class    = 'ee-green';
-        }
-        if ($event_status < 1 && ! empty($btn_text_if_inactive)) {
-            $btn_text = $btn_text_if_inactive;
-            $class    = 'ee-grey';
-        }
-        ?>
+	/**
+	 * espresso_event_reg_button
+	 * returns the "Register Now" button if event is active,
+	 * an inactive button like status banner if the event is not active
+	 * or a "Read More" button if so desired
+	 *
+	 * @param null $btn_text_if_active
+	 * @param bool $btn_text_if_inactive
+	 * @param bool $EVT_ID
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_reg_button($btn_text_if_active = null, $btn_text_if_inactive = false, $EVT_ID = false)
+	{
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if (! $event instanceof EE_Event) {
+			return;
+		}
+		$event_status = $event->get_active_status();
+		switch ($event_status) {
+			case EE_Datetime::sold_out :
+				$btn_text = __('Sold Out', 'event_espresso');
+				$class    = 'ee-pink';
+				break;
+			case EE_Datetime::expired :
+				$btn_text = __('Event is Over', 'event_espresso');
+				$class    = 'ee-grey';
+				break;
+			case EE_Datetime::inactive :
+				$btn_text = __('Event Not Active', 'event_espresso');
+				$class    = 'ee-grey';
+				break;
+			case EE_Datetime::cancelled :
+				$btn_text = __('Event was Cancelled', 'event_espresso');
+				$class    = 'ee-red';
+				break;
+			case EE_Datetime::upcoming :
+			case EE_Datetime::active :
+			default :
+				$btn_text = ! empty($btn_text_if_active)
+					? $btn_text_if_active
+					: __('Register Now', 'event_espresso');
+				$class    = 'ee-green';
+		}
+		if ($event_status < 1 && ! empty($btn_text_if_inactive)) {
+			$btn_text = $btn_text_if_inactive;
+			$class    = 'ee-grey';
+		}
+		?>
         <a class="ee-button ee-register-button <?php echo esc_attr($class); ?>"
            href="<?php espresso_event_link_url($EVT_ID); ?>"
             <?php echo EED_Events_Archive::link_target(); // already escaped
-            ?>
+			?>
         >
             <?php echo esc_html($btn_text); ?>
         </a>
         <?php
-    }
+	}
 }
 
 
 if (! function_exists('espresso_display_ticket_selector')) {
-    /**
-     * espresso_display_ticket_selector
-     * whether or not to display the Ticket Selector for an event
-     *
-     * @param bool $EVT_ID
-     * @return boolean
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_display_ticket_selector($EVT_ID = false)
-    {
-        return EEH_Event_View::display_ticket_selector($EVT_ID);
-    }
+	/**
+	 * espresso_display_ticket_selector
+	 * whether or not to display the Ticket Selector for an event
+	 *
+	 * @param bool $EVT_ID
+	 * @return boolean
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_display_ticket_selector($EVT_ID = false)
+	{
+		return EEH_Event_View::display_ticket_selector($EVT_ID);
+	}
 }
 
 
 if (! function_exists('espresso_event_status_banner')) {
-    /**
-     * espresso_event_status
-     * returns a banner showing the event status if it is sold out, expired, or inactive
-     *
-     * @param bool $EVT_ID
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_status_banner($EVT_ID = false)
-    {
-        return EEH_Event_View::event_status($EVT_ID);
-    }
+	/**
+	 * espresso_event_status
+	 * returns a banner showing the event status if it is sold out, expired, or inactive
+	 *
+	 * @param bool $EVT_ID
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_status_banner($EVT_ID = false)
+	{
+		return EEH_Event_View::event_status($EVT_ID);
+	}
 }
 
 
 if (! function_exists('espresso_event_status')) {
-    /**
-     * espresso_event_status
-     * returns the event status if it is sold out, expired, or inactive
-     *
-     * @param int  $EVT_ID
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_status($EVT_ID = 0, $echo = true)
-    {
-        return EEH_Event_View::event_active_status($EVT_ID, $echo);
-    }
+	/**
+	 * espresso_event_status
+	 * returns the event status if it is sold out, expired, or inactive
+	 *
+	 * @param int  $EVT_ID
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_status($EVT_ID = 0, $echo = true)
+	{
+		return EEH_Event_View::event_active_status($EVT_ID, $echo);
+	}
 }
 
 
 if (! function_exists('espresso_event_categories')) {
-    /**
-     * espresso_event_categories
-     * returns the terms associated with an event
-     *
-     * @param int  $EVT_ID
-     * @param bool $hide_uncategorized
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_categories($EVT_ID = 0, $hide_uncategorized = true, $echo = true)
-    {
-        if ($echo) {
-            echo EEH_Event_View::event_categories($EVT_ID, $hide_uncategorized); // already escaped
-            return '';
-        }
-        return EEH_Event_View::event_categories($EVT_ID, $hide_uncategorized);
-    }
+	/**
+	 * espresso_event_categories
+	 * returns the terms associated with an event
+	 *
+	 * @param int  $EVT_ID
+	 * @param bool $hide_uncategorized
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_categories($EVT_ID = 0, $hide_uncategorized = true, $echo = true)
+	{
+		if ($echo) {
+			echo EEH_Event_View::event_categories($EVT_ID, $hide_uncategorized); // already escaped
+			return '';
+		}
+		return EEH_Event_View::event_categories($EVT_ID, $hide_uncategorized);
+	}
 }
 
 
 if (! function_exists('espresso_event_tickets_available')) {
-    /**
-     * espresso_event_tickets_available
-     * returns the ticket types available for purchase for an event
-     *
-     * @param int  $EVT_ID
-     * @param bool $echo
-     * @param bool $format
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_tickets_available($EVT_ID = 0, $echo = true, $format = true)
-    {
-        $tickets = EEH_Event_View::event_tickets_available($EVT_ID);
-        if (is_array($tickets) && ! empty($tickets)) {
-            // if formatting then $html will be a string, else it will be an array of ticket objects
-            $html =
-                $format ? '<ul id="ee-event-tickets-ul-' . esc_attr($EVT_ID) . '" class="ee-event-tickets-ul">' : [];
-            foreach ($tickets as $ticket) {
-                if ($ticket instanceof EE_Ticket) {
-                    if ($format) {
-                        $html .= '<li id="ee-event-tickets-li-'
-                                 . esc_attr($ticket->ID())
-                                 . '" class="ee-event-tickets-li">';
-                        $html .= esc_html($ticket->name()) . ' ';
-                        $html .= EEH_Template::format_currency(
-                            $ticket->get_ticket_total_with_taxes()
-                        ); // already escaped
-                        $html .= '</li>';
-                    } else {
-                        $html[] = $ticket;
-                    }
-                }
-            }
-            if ($format) {
-                $html .= '</ul>';
-            }
-            if ($echo && $format) {
-                echo wp_kses($html, AllowedTags::getAllowedTags());
-                return '';
-            }
-            return $html;
-        }
-        return '';
-    }
+	/**
+	 * espresso_event_tickets_available
+	 * returns the ticket types available for purchase for an event
+	 *
+	 * @param int  $EVT_ID
+	 * @param bool $echo
+	 * @param bool $format
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_tickets_available($EVT_ID = 0, $echo = true, $format = true)
+	{
+		$tickets = EEH_Event_View::event_tickets_available($EVT_ID);
+		if (is_array($tickets) && ! empty($tickets)) {
+			// if formatting then $html will be a string, else it will be an array of ticket objects
+			$html =
+				$format ? '<ul id="ee-event-tickets-ul-' . esc_attr($EVT_ID) . '" class="ee-event-tickets-ul">' : [];
+			foreach ($tickets as $ticket) {
+				if ($ticket instanceof EE_Ticket) {
+					if ($format) {
+						$html .= '<li id="ee-event-tickets-li-'
+								 . esc_attr($ticket->ID())
+								 . '" class="ee-event-tickets-li">';
+						$html .= esc_html($ticket->name()) . ' ';
+						$html .= EEH_Template::format_currency(
+							$ticket->get_ticket_total_with_taxes()
+						); // already escaped
+						$html .= '</li>';
+					} else {
+						$html[] = $ticket;
+					}
+				}
+			}
+			if ($format) {
+				$html .= '</ul>';
+			}
+			if ($echo && $format) {
+				echo wp_kses($html, AllowedTags::getAllowedTags());
+				return '';
+			}
+			return $html;
+		}
+		return '';
+	}
 }
 
 if (! function_exists('espresso_event_date_obj')) {
-    /**
-     * espresso_event_date_obj
-     * returns the primary date object for an event
-     *
-     * @param bool $EVT_ID
-     * @return EE_Datetime|null
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_date_obj($EVT_ID = false)
-    {
-        return EEH_Event_View::get_primary_date_obj($EVT_ID);
-    }
+	/**
+	 * espresso_event_date_obj
+	 * returns the primary date object for an event
+	 *
+	 * @param bool $EVT_ID
+	 * @return EE_Datetime|null
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_date_obj($EVT_ID = false)
+	{
+		return EEH_Event_View::get_primary_date_obj($EVT_ID);
+	}
 }
 
 
 if (! function_exists('espresso_event_date')) {
-    /**
-     * espresso_event_date
-     * returns the primary date for an event
-     *
-     * @param string $date_format
-     * @param string $time_format
-     * @param bool   $EVT_ID
-     * @param bool   $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_date($date_format = '', $time_format = '', $EVT_ID = false, $echo = true)
-    {
-        $date_format = ! empty($date_format) ? $date_format : get_option('date_format');
-        $time_format = ! empty($time_format) ? $time_format : get_option('time_format');
-        $date_format = apply_filters('FHEE__espresso_event_date__date_format', $date_format);
-        $time_format = apply_filters('FHEE__espresso_event_date__time_format', $time_format);
-        if ($echo) {
-            echo EEH_Event_View::the_event_date($date_format, $time_format, $EVT_ID); // already escaped
-            return '';
-        }
-        return EEH_Event_View::the_event_date($date_format, $time_format, $EVT_ID);
-
-    }
+	/**
+	 * espresso_event_date
+	 * returns the primary date for an event
+	 *
+	 * @param string $date_format
+	 * @param string $time_format
+	 * @param bool   $EVT_ID
+	 * @param bool   $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_date($date_format = '', $time_format = '', $EVT_ID = false, $echo = true)
+	{
+		$date_format = ! empty($date_format) ? $date_format : get_option('date_format');
+		$time_format = ! empty($time_format) ? $time_format : get_option('time_format');
+		$date_format = apply_filters('FHEE__espresso_event_date__date_format', $date_format);
+		$time_format = apply_filters('FHEE__espresso_event_date__time_format', $time_format);
+		if ($echo) {
+			echo EEH_Event_View::the_event_date($date_format, $time_format, $EVT_ID); // already escaped
+			return '';
+		}
+		return EEH_Event_View::the_event_date($date_format, $time_format, $EVT_ID);
+
+	}
 }
 
 
 if (! function_exists('espresso_list_of_event_dates')) {
-    /**
-     * espresso_list_of_event_dates
-     * returns a unordered list of dates for an event
-     *
-     * @param int    $EVT_ID
-     * @param string $date_format
-     * @param string $time_format
-     * @param bool   $echo
-     * @param null   $show_expired
-     * @param bool   $format
-     * @param bool   $add_breaks
-     * @param null   $limit
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_list_of_event_dates(
-        $EVT_ID = 0,
-        $date_format = '',
-        $time_format = '',
-        $echo = true,
-        $show_expired = null,
-        $format = true,
-        $add_breaks = true,
-        $limit = null
-    ) {
-        $allowedtags = AllowedTags::getAllowedTags();
-        $date_format = ! empty($date_format) ? $date_format : get_option('date_format');
-        $time_format = ! empty($time_format) ? $time_format : get_option('time_format');
-        $date_format = apply_filters('FHEE__espresso_list_of_event_dates__date_format', $date_format);
-        $time_format = apply_filters('FHEE__espresso_list_of_event_dates__time_format', $time_format);
-        $datetimes   = EEH_Event_View::get_all_date_obj($EVT_ID, $show_expired, false, $limit);
-        if (! $format) {
-            return apply_filters('FHEE__espresso_list_of_event_dates__datetimes', $datetimes);
-        }
-        $newline = $add_breaks ? '<br />' : '';
-        if (is_array($datetimes) && ! empty($datetimes)) {
-            global $post;
-            $html =
-                '<ul id="ee-event-datetimes-ul-' . esc_attr($post->ID) . '" class="ee-event-datetimes-ul ee-clearfix">';
-            foreach ($datetimes as $datetime) {
-                if ($datetime instanceof EE_Datetime) {
-
-                    $datetime_name        = $datetime->name();
-                    $datetime_html        = ! empty($datetime_name)
-                        ? '
+	/**
+	 * espresso_list_of_event_dates
+	 * returns a unordered list of dates for an event
+	 *
+	 * @param int    $EVT_ID
+	 * @param string $date_format
+	 * @param string $time_format
+	 * @param bool   $echo
+	 * @param null   $show_expired
+	 * @param bool   $format
+	 * @param bool   $add_breaks
+	 * @param null   $limit
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_list_of_event_dates(
+		$EVT_ID = 0,
+		$date_format = '',
+		$time_format = '',
+		$echo = true,
+		$show_expired = null,
+		$format = true,
+		$add_breaks = true,
+		$limit = null
+	) {
+		$allowedtags = AllowedTags::getAllowedTags();
+		$date_format = ! empty($date_format) ? $date_format : get_option('date_format');
+		$time_format = ! empty($time_format) ? $time_format : get_option('time_format');
+		$date_format = apply_filters('FHEE__espresso_list_of_event_dates__date_format', $date_format);
+		$time_format = apply_filters('FHEE__espresso_list_of_event_dates__time_format', $time_format);
+		$datetimes   = EEH_Event_View::get_all_date_obj($EVT_ID, $show_expired, false, $limit);
+		if (! $format) {
+			return apply_filters('FHEE__espresso_list_of_event_dates__datetimes', $datetimes);
+		}
+		$newline = $add_breaks ? '<br />' : '';
+		if (is_array($datetimes) && ! empty($datetimes)) {
+			global $post;
+			$html =
+				'<ul id="ee-event-datetimes-ul-' . esc_attr($post->ID) . '" class="ee-event-datetimes-ul ee-clearfix">';
+			foreach ($datetimes as $datetime) {
+				if ($datetime instanceof EE_Datetime) {
+
+					$datetime_name        = $datetime->name();
+					$datetime_html        = ! empty($datetime_name)
+						? '
                         <strong class="ee-event-datetimes-li-date-name">
                           ' . esc_html($datetime_name) . '
                        </strong>' . $newline
-                        : '';
+						: '';
 
-                    $datetime_description = $datetime->description();
-                    $datetime_html .= ! empty($datetime_description)
-                        ? '
+					$datetime_description = $datetime->description();
+					$datetime_html .= ! empty($datetime_description)
+						? '
                         <span class="ee-event-datetimes-li-date-desc">
                             ' . wp_kses($datetime_description, $allowedtags) . '
                         </span>' . $newline
-                        : '';
+						: '';
 
-                    $datetime_html .= '
+					$datetime_html .= '
                         <span class="dashicons dashicons-calendar"></span>
                         <span class="ee-event-datetimes-li-daterange">' . $datetime->date_range($date_format) . '</span>
                         <br/>
@@ -576,482 +576,482 @@ 
                         <span class="ee-event-datetimes-li-timerange">' . $datetime->time_range($time_format) . '</span>
                         ';
 
-                    $datetime_html = apply_filters(
-                        'FHEE__espresso_list_of_event_dates__datetime_html',
-                        $datetime_html,
-                        $datetime
-                    );
+					$datetime_html = apply_filters(
+						'FHEE__espresso_list_of_event_dates__datetime_html',
+						$datetime_html,
+						$datetime
+					);
 
-                    $DTD_ID        = esc_attr($datetime->ID());
-                    $active_status = esc_attr(' ee-event-datetimes-li-' . $datetime->get_active_status());
+					$DTD_ID        = esc_attr($datetime->ID());
+					$active_status = esc_attr(' ee-event-datetimes-li-' . $datetime->get_active_status());
 
-                    $html .= '
+					$html .= '
                     <li id="ee-event-datetimes-li-' . $DTD_ID . '" class="ee-event-datetimes-li' . $active_status . '">
                         ' . $datetime_html . '
                     </li>';
-                }
-            }
-            $html .= '</ul>';
-        } else {
-            $html =
-                '
+				}
+			}
+			$html .= '</ul>';
+		} else {
+			$html =
+				'
             <p>
                 <span class="dashicons dashicons-marker pink-text"></span>
                 ' . esc_html__(
-                    'There are no upcoming dates for this event.',
-                    'event_espresso'
-                ) . '
+					'There are no upcoming dates for this event.',
+					'event_espresso'
+				) . '
             </p>
             <br/>';
-        }
-        if ($echo) {
-            echo wp_kses($html, AllowedTags::getWithFormTags());
-            return '';
-        }
-        return $html;
-    }
+		}
+		if ($echo) {
+			echo wp_kses($html, AllowedTags::getWithFormTags());
+			return '';
+		}
+		return $html;
+	}
 }
 
 
 if (! function_exists('espresso_event_end_date')) {
-    /**
-     * espresso_event_end_date
-     * returns the last date for an event
-     *
-     * @param string $date_format
-     * @param string $time_format
-     * @param bool   $EVT_ID
-     * @param bool   $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_end_date($date_format = '', $time_format = '', $EVT_ID = false, $echo = true)
-    {
-        $date_format = ! empty($date_format) ? $date_format : get_option('date_format');
-        $time_format = ! empty($time_format) ? $time_format : get_option('time_format');
-        $date_format = apply_filters('FHEE__espresso_event_end_date__date_format', $date_format);
-        $time_format = apply_filters('FHEE__espresso_event_end_date__time_format', $time_format);
-        if ($echo) {
-            echo EEH_Event_View::the_event_end_date($date_format, $time_format, $EVT_ID); // already escaped
-            return '';
-        }
-        return EEH_Event_View::the_event_end_date($date_format, $time_format, $EVT_ID);
-    }
+	/**
+	 * espresso_event_end_date
+	 * returns the last date for an event
+	 *
+	 * @param string $date_format
+	 * @param string $time_format
+	 * @param bool   $EVT_ID
+	 * @param bool   $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_end_date($date_format = '', $time_format = '', $EVT_ID = false, $echo = true)
+	{
+		$date_format = ! empty($date_format) ? $date_format : get_option('date_format');
+		$time_format = ! empty($time_format) ? $time_format : get_option('time_format');
+		$date_format = apply_filters('FHEE__espresso_event_end_date__date_format', $date_format);
+		$time_format = apply_filters('FHEE__espresso_event_end_date__time_format', $time_format);
+		if ($echo) {
+			echo EEH_Event_View::the_event_end_date($date_format, $time_format, $EVT_ID); // already escaped
+			return '';
+		}
+		return EEH_Event_View::the_event_end_date($date_format, $time_format, $EVT_ID);
+	}
 }
 
 if (! function_exists('espresso_event_date_range')) {
-    /**
-     * espresso_event_date_range
-     * returns the first and last chronologically ordered dates for an event (if different)
-     *
-     * @param string $date_format
-     * @param string $time_format
-     * @param string $single_date_format
-     * @param string $single_time_format
-     * @param bool   $EVT_ID
-     * @param bool   $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_date_range(
-        $date_format = '',
-        $time_format = '',
-        $single_date_format = '',
-        $single_time_format = '',
-        $EVT_ID = false,
-        $echo = true
-    ) {
-        // set and filter date and time formats when a range is returned
-        $date_format = ! empty($date_format) ? $date_format : get_option('date_format');
-        $date_format = apply_filters('FHEE__espresso_event_date_range__date_format', $date_format);
-        // get the start and end date with NO time portion
-        $the_event_date     = EEH_Event_View::the_earliest_event_date($date_format, '', $EVT_ID);
-        $the_event_end_date = EEH_Event_View::the_latest_event_date($date_format, '', $EVT_ID);
-        // now we can determine if date range spans more than one day
-        if ($the_event_date != $the_event_end_date) {
-            $time_format = ! empty($time_format) ? $time_format : get_option('time_format');
-            $time_format = apply_filters('FHEE__espresso_event_date_range__time_format', $time_format);
-            $html        = sprintf(
-            /* translators: 1: first event date, 2: last event date */
-                esc_html__('%1$s - %2$s', 'event_espresso'),
-                EEH_Event_View::the_earliest_event_date($date_format, $time_format, $EVT_ID),
-                EEH_Event_View::the_latest_event_date($date_format, $time_format, $EVT_ID)
-            );
-        } else {
-            // set and filter date and time formats when only a single datetime is returned
-            $single_date_format = ! empty($single_date_format) ? $single_date_format : get_option('date_format');
-            $single_time_format = ! empty($single_time_format) ? $single_time_format : get_option('time_format');
-            $single_date_format =
-                apply_filters('FHEE__espresso_event_date_range__single_date_format', $single_date_format);
-            $single_time_format =
-                apply_filters('FHEE__espresso_event_date_range__single_time_format', $single_time_format);
-            $html               =
-                EEH_Event_View::the_earliest_event_date($single_date_format, $single_time_format, $EVT_ID);
-        }
-        if ($echo) {
-            echo wp_kses($html, AllowedTags::getAllowedTags());
-            return '';
-        }
-        return $html;
-    }
+	/**
+	 * espresso_event_date_range
+	 * returns the first and last chronologically ordered dates for an event (if different)
+	 *
+	 * @param string $date_format
+	 * @param string $time_format
+	 * @param string $single_date_format
+	 * @param string $single_time_format
+	 * @param bool   $EVT_ID
+	 * @param bool   $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_date_range(
+		$date_format = '',
+		$time_format = '',
+		$single_date_format = '',
+		$single_time_format = '',
+		$EVT_ID = false,
+		$echo = true
+	) {
+		// set and filter date and time formats when a range is returned
+		$date_format = ! empty($date_format) ? $date_format : get_option('date_format');
+		$date_format = apply_filters('FHEE__espresso_event_date_range__date_format', $date_format);
+		// get the start and end date with NO time portion
+		$the_event_date     = EEH_Event_View::the_earliest_event_date($date_format, '', $EVT_ID);
+		$the_event_end_date = EEH_Event_View::the_latest_event_date($date_format, '', $EVT_ID);
+		// now we can determine if date range spans more than one day
+		if ($the_event_date != $the_event_end_date) {
+			$time_format = ! empty($time_format) ? $time_format : get_option('time_format');
+			$time_format = apply_filters('FHEE__espresso_event_date_range__time_format', $time_format);
+			$html        = sprintf(
+			/* translators: 1: first event date, 2: last event date */
+				esc_html__('%1$s - %2$s', 'event_espresso'),
+				EEH_Event_View::the_earliest_event_date($date_format, $time_format, $EVT_ID),
+				EEH_Event_View::the_latest_event_date($date_format, $time_format, $EVT_ID)
+			);
+		} else {
+			// set and filter date and time formats when only a single datetime is returned
+			$single_date_format = ! empty($single_date_format) ? $single_date_format : get_option('date_format');
+			$single_time_format = ! empty($single_time_format) ? $single_time_format : get_option('time_format');
+			$single_date_format =
+				apply_filters('FHEE__espresso_event_date_range__single_date_format', $single_date_format);
+			$single_time_format =
+				apply_filters('FHEE__espresso_event_date_range__single_time_format', $single_time_format);
+			$html               =
+				EEH_Event_View::the_earliest_event_date($single_date_format, $single_time_format, $EVT_ID);
+		}
+		if ($echo) {
+			echo wp_kses($html, AllowedTags::getAllowedTags());
+			return '';
+		}
+		return $html;
+	}
 }
 
 if (! function_exists('espresso_next_upcoming_datetime_obj')) {
-    /**
-     * espresso_next_upcoming_datetime_obj
-     * returns the next upcoming datetime object for an event
-     *
-     * @param int $EVT_ID
-     * @return EE_Datetime|null
-     * @throws EE_Error
-     */
-    function espresso_next_upcoming_datetime_obj($EVT_ID = 0)
-    {
-        return EEH_Event_View::get_next_upcoming_date_obj($EVT_ID);
-    }
+	/**
+	 * espresso_next_upcoming_datetime_obj
+	 * returns the next upcoming datetime object for an event
+	 *
+	 * @param int $EVT_ID
+	 * @return EE_Datetime|null
+	 * @throws EE_Error
+	 */
+	function espresso_next_upcoming_datetime_obj($EVT_ID = 0)
+	{
+		return EEH_Event_View::get_next_upcoming_date_obj($EVT_ID);
+	}
 }
 
 if (! function_exists('espresso_next_upcoming_datetime')) {
-    /**
-     * espresso_next_upcoming_datetime
-     * returns the start date and time for the next upcoming event.
-     *
-     * @param string $date_format
-     * @param string $time_format
-     * @param int    $EVT_ID
-     * @param bool   $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_next_upcoming_datetime($date_format = '', $time_format = '', $EVT_ID = 0, $echo = true)
-    {
-
-        $date_format = ! empty($date_format) ? $date_format : get_option('date_format');
-        $date_format = apply_filters('FHEE__espresso_next_upcoming_datetime__date_format', $date_format);
-
-        $time_format = ! empty($time_format) ? $time_format : get_option('time_format');
-        $time_format = apply_filters('FHEE__espresso_next_upcoming_datetime__time_format', $time_format);
-
-        $datetime_format = trim($date_format . ' ' . $time_format);
-
-        $datetime = espresso_next_upcoming_datetime_obj($EVT_ID);
-
-        if (! $datetime instanceof EE_Datetime) {
-            return '';
-        }
-        if ($echo) {
-            echo esc_html($datetime->get_i18n_datetime('DTT_EVT_start', $datetime_format));
-            return '';
-        }
-        return $datetime->get_i18n_datetime('DTT_EVT_start', $datetime_format);
-    }
+	/**
+	 * espresso_next_upcoming_datetime
+	 * returns the start date and time for the next upcoming event.
+	 *
+	 * @param string $date_format
+	 * @param string $time_format
+	 * @param int    $EVT_ID
+	 * @param bool   $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_next_upcoming_datetime($date_format = '', $time_format = '', $EVT_ID = 0, $echo = true)
+	{
+
+		$date_format = ! empty($date_format) ? $date_format : get_option('date_format');
+		$date_format = apply_filters('FHEE__espresso_next_upcoming_datetime__date_format', $date_format);
+
+		$time_format = ! empty($time_format) ? $time_format : get_option('time_format');
+		$time_format = apply_filters('FHEE__espresso_next_upcoming_datetime__time_format', $time_format);
+
+		$datetime_format = trim($date_format . ' ' . $time_format);
+
+		$datetime = espresso_next_upcoming_datetime_obj($EVT_ID);
+
+		if (! $datetime instanceof EE_Datetime) {
+			return '';
+		}
+		if ($echo) {
+			echo esc_html($datetime->get_i18n_datetime('DTT_EVT_start', $datetime_format));
+			return '';
+		}
+		return $datetime->get_i18n_datetime('DTT_EVT_start', $datetime_format);
+	}
 }
 
 if (! function_exists('espresso_event_date_as_calendar_page')) {
-    /**
-     * espresso_event_date_as_calendar_page
-     * returns the primary date for an event, stylized to appear as the page of a calendar
-     *
-     * @param bool $EVT_ID
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_date_as_calendar_page($EVT_ID = false)
-    {
-        EEH_Event_View::event_date_as_calendar_page($EVT_ID);
-    }
+	/**
+	 * espresso_event_date_as_calendar_page
+	 * returns the primary date for an event, stylized to appear as the page of a calendar
+	 *
+	 * @param bool $EVT_ID
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_date_as_calendar_page($EVT_ID = false)
+	{
+		EEH_Event_View::event_date_as_calendar_page($EVT_ID);
+	}
 }
 
 
 if (! function_exists('espresso_event_link_url')) {
-    /**
-     * espresso_event_link_url
-     *
-     * @param int  $EVT_ID
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_link_url($EVT_ID = 0, $echo = true)
-    {
-        if ($echo) {
-            echo EEH_Event_View::event_link_url($EVT_ID); // already escaped
-            return '';
-        }
-        return EEH_Event_View::event_link_url($EVT_ID);
-    }
+	/**
+	 * espresso_event_link_url
+	 *
+	 * @param int  $EVT_ID
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_link_url($EVT_ID = 0, $echo = true)
+	{
+		if ($echo) {
+			echo EEH_Event_View::event_link_url($EVT_ID); // already escaped
+			return '';
+		}
+		return EEH_Event_View::event_link_url($EVT_ID);
+	}
 }
 
 
 if (! function_exists('espresso_event_has_content_or_excerpt')) {
-    /**
-     *    espresso_event_has_content_or_excerpt
-     *
-     * @access    public
-     * @param bool $EVT_ID
-     * @return    boolean
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_has_content_or_excerpt($EVT_ID = false)
-    {
-        return EEH_Event_View::event_has_content_or_excerpt($EVT_ID);
-    }
+	/**
+	 *    espresso_event_has_content_or_excerpt
+	 *
+	 * @access    public
+	 * @param bool $EVT_ID
+	 * @return    boolean
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_has_content_or_excerpt($EVT_ID = false)
+	{
+		return EEH_Event_View::event_has_content_or_excerpt($EVT_ID);
+	}
 }
 
 
 if (! function_exists('espresso_event_content_or_excerpt')) {
-    /**
-     * espresso_event_content_or_excerpt
-     *
-     * @param int  $num_words
-     * @param null $more
-     * @param bool $echo
-     * @return string
-     */
-    function espresso_event_content_or_excerpt($num_words = 55, $more = null, $echo = true)
-    {
-        if ($echo) {
-            echo EEH_Event_View::event_content_or_excerpt($num_words, $more); // already escaped
-            return '';
-        }
-        return EEH_Event_View::event_content_or_excerpt($num_words, $more);
-    }
+	/**
+	 * espresso_event_content_or_excerpt
+	 *
+	 * @param int  $num_words
+	 * @param null $more
+	 * @param bool $echo
+	 * @return string
+	 */
+	function espresso_event_content_or_excerpt($num_words = 55, $more = null, $echo = true)
+	{
+		if ($echo) {
+			echo EEH_Event_View::event_content_or_excerpt($num_words, $more); // already escaped
+			return '';
+		}
+		return EEH_Event_View::event_content_or_excerpt($num_words, $more);
+	}
 }
 
 
 if (! function_exists('espresso_event_phone')) {
-    /**
-     * espresso_event_phone
-     *
-     * @param int  $EVT_ID
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_phone($EVT_ID = 0, $echo = true)
-    {
-        if ($echo) {
-            echo EEH_Event_View::event_phone($EVT_ID); // already escaped
-            return '';
-        }
-        return EEH_Event_View::event_phone($EVT_ID);
-    }
+	/**
+	 * espresso_event_phone
+	 *
+	 * @param int  $EVT_ID
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_phone($EVT_ID = 0, $echo = true)
+	{
+		if ($echo) {
+			echo EEH_Event_View::event_phone($EVT_ID); // already escaped
+			return '';
+		}
+		return EEH_Event_View::event_phone($EVT_ID);
+	}
 }
 
 
 if (! function_exists('espresso_edit_event_link')) {
-    /**
-     * espresso_edit_event_link
-     * returns a link to edit an event
-     *
-     * @param int  $EVT_ID
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_edit_event_link($EVT_ID = 0, $echo = true)
-    {
-        if ($echo) {
-            echo EEH_Event_View::edit_event_link($EVT_ID); // already escaped
-            return '';
-        }
-        return EEH_Event_View::edit_event_link($EVT_ID);
-    }
+	/**
+	 * espresso_edit_event_link
+	 * returns a link to edit an event
+	 *
+	 * @param int  $EVT_ID
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_edit_event_link($EVT_ID = 0, $echo = true)
+	{
+		if ($echo) {
+			echo EEH_Event_View::edit_event_link($EVT_ID); // already escaped
+			return '';
+		}
+		return EEH_Event_View::edit_event_link($EVT_ID);
+	}
 }
 
 
 if (! function_exists('espresso_organization_name')) {
-    /**
-     * espresso_organization_name
-     *
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     */
-    function espresso_organization_name($echo = true)
-    {
-        if ($echo) {
-            echo EE_Registry::instance()->CFG->organization->get_pretty('name'); // already escaped
-            return '';
-        }
-        return EE_Registry::instance()->CFG->organization->get_pretty('name');
-    }
+	/**
+	 * espresso_organization_name
+	 *
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 */
+	function espresso_organization_name($echo = true)
+	{
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('name'); // already escaped
+			return '';
+		}
+		return EE_Registry::instance()->CFG->organization->get_pretty('name');
+	}
 }
 
 if (! function_exists('espresso_organization_address')) {
-    /**
-     * espresso_organization_address
-     *
-     * @param string $type
-     * @return string
-     */
-    function espresso_organization_address($type = 'inline')
-    {
-        if (EE_Registry::instance()->CFG->organization instanceof EE_Organization_Config) {
-            $address = new EventEspresso\core\domain\entities\GenericAddress(
-                EE_Registry::instance()->CFG->organization->address_1,
-                EE_Registry::instance()->CFG->organization->address_2,
-                EE_Registry::instance()->CFG->organization->city,
-                EE_Registry::instance()->CFG->organization->STA_ID,
-                EE_Registry::instance()->CFG->organization->zip,
-                EE_Registry::instance()->CFG->organization->CNT_ISO
-            );
-            return EEH_Address::format($address, $type);
-        }
-        return '';
-    }
+	/**
+	 * espresso_organization_address
+	 *
+	 * @param string $type
+	 * @return string
+	 */
+	function espresso_organization_address($type = 'inline')
+	{
+		if (EE_Registry::instance()->CFG->organization instanceof EE_Organization_Config) {
+			$address = new EventEspresso\core\domain\entities\GenericAddress(
+				EE_Registry::instance()->CFG->organization->address_1,
+				EE_Registry::instance()->CFG->organization->address_2,
+				EE_Registry::instance()->CFG->organization->city,
+				EE_Registry::instance()->CFG->organization->STA_ID,
+				EE_Registry::instance()->CFG->organization->zip,
+				EE_Registry::instance()->CFG->organization->CNT_ISO
+			);
+			return EEH_Address::format($address, $type);
+		}
+		return '';
+	}
 }
 
 if (! function_exists('espresso_organization_email')) {
-    /**
-     * espresso_organization_email
-     *
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     */
-    function espresso_organization_email($echo = true)
-    {
-        if ($echo) {
-            echo EE_Registry::instance()->CFG->organization->get_pretty('email'); // already escaped
-            return '';
-        }
-        return EE_Registry::instance()->CFG->organization->get_pretty('email');
-    }
+	/**
+	 * espresso_organization_email
+	 *
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 */
+	function espresso_organization_email($echo = true)
+	{
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('email'); // already escaped
+			return '';
+		}
+		return EE_Registry::instance()->CFG->organization->get_pretty('email');
+	}
 }
 
 if (! function_exists('espresso_organization_logo_url')) {
-    /**
-     * espresso_organization_logo_url
-     *
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     */
-    function espresso_organization_logo_url($echo = true)
-    {
-        if ($echo) {
-            echo EE_Registry::instance()->CFG->organization->get_pretty('logo_url'); // already escaped
-            return '';
-        }
-        return EE_Registry::instance()->CFG->organization->get_pretty('logo_url');
-    }
+	/**
+	 * espresso_organization_logo_url
+	 *
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 */
+	function espresso_organization_logo_url($echo = true)
+	{
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('logo_url'); // already escaped
+			return '';
+		}
+		return EE_Registry::instance()->CFG->organization->get_pretty('logo_url');
+	}
 }
 
 if (! function_exists('espresso_organization_facebook')) {
-    /**
-     * espresso_organization_facebook
-     *
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     */
-    function espresso_organization_facebook($echo = true)
-    {
-        if ($echo) {
-            echo EE_Registry::instance()->CFG->organization->get_pretty('facebook'); // already escaped
-            return '';
-        }
-        return EE_Registry::instance()->CFG->organization->get_pretty('facebook');
-    }
+	/**
+	 * espresso_organization_facebook
+	 *
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 */
+	function espresso_organization_facebook($echo = true)
+	{
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('facebook'); // already escaped
+			return '';
+		}
+		return EE_Registry::instance()->CFG->organization->get_pretty('facebook');
+	}
 }
 
 if (! function_exists('espresso_organization_twitter')) {
-    /**
-     * espresso_organization_twitter
-     *
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     */
-    function espresso_organization_twitter($echo = true)
-    {
-        if ($echo) {
-            echo EE_Registry::instance()->CFG->organization->get_pretty('twitter'); // already escaped
-            return '';
-        }
-        return EE_Registry::instance()->CFG->organization->get_pretty('twitter');
-    }
+	/**
+	 * espresso_organization_twitter
+	 *
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 */
+	function espresso_organization_twitter($echo = true)
+	{
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('twitter'); // already escaped
+			return '';
+		}
+		return EE_Registry::instance()->CFG->organization->get_pretty('twitter');
+	}
 }
 
 if (! function_exists('espresso_organization_linkedin')) {
-    /**
-     * espresso_organization_linkedin
-     *
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     */
-    function espresso_organization_linkedin($echo = true)
-    {
-        if ($echo) {
-            echo EE_Registry::instance()->CFG->organization->get_pretty('linkedin'); // already escaped
-            return '';
-        }
-        return EE_Registry::instance()->CFG->organization->get_pretty('linkedin');
-    }
+	/**
+	 * espresso_organization_linkedin
+	 *
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 */
+	function espresso_organization_linkedin($echo = true)
+	{
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('linkedin'); // already escaped
+			return '';
+		}
+		return EE_Registry::instance()->CFG->organization->get_pretty('linkedin');
+	}
 }
 
 if (! function_exists('espresso_organization_pinterest')) {
-    /**
-     * espresso_organization_pinterest
-     *
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     */
-    function espresso_organization_pinterest($echo = true)
-    {
-        if ($echo) {
-            echo EE_Registry::instance()->CFG->organization->get_pretty('pinterest'); // already escaped
-            return '';
-        }
-        return EE_Registry::instance()->CFG->organization->get_pretty('pinterest');
-    }
+	/**
+	 * espresso_organization_pinterest
+	 *
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 */
+	function espresso_organization_pinterest($echo = true)
+	{
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('pinterest'); // already escaped
+			return '';
+		}
+		return EE_Registry::instance()->CFG->organization->get_pretty('pinterest');
+	}
 }
 
 if (! function_exists('espresso_organization_google')) {
-    /**
-     * espresso_organization_google
-     *
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     */
-    function espresso_organization_google($echo = true)
-    {
-        if ($echo) {
-            echo EE_Registry::instance()->CFG->organization->get_pretty('google'); // already escaped
-            return '';
-        }
-        return EE_Registry::instance()->CFG->organization->get_pretty('google');
-    }
+	/**
+	 * espresso_organization_google
+	 *
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 */
+	function espresso_organization_google($echo = true)
+	{
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('google'); // already escaped
+			return '';
+		}
+		return EE_Registry::instance()->CFG->organization->get_pretty('google');
+	}
 }
 
 if (! function_exists('espresso_organization_instagram')) {
-    /**
-     * espresso_organization_instagram
-     *
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     */
-    function espresso_organization_instagram($echo = true)
-    {
-        if ($echo) {
-            echo EE_Registry::instance()->CFG->organization->get_pretty('instagram'); // already escaped
-            return '';
-        }
-        return EE_Registry::instance()->CFG->organization->get_pretty('instagram');
-    }
+	/**
+	 * espresso_organization_instagram
+	 *
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 */
+	function espresso_organization_instagram($echo = true)
+	{
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('instagram'); // already escaped
+			return '';
+		}
+		return EE_Registry::instance()->CFG->organization->get_pretty('instagram');
+	}
 }
 
 
@@ -1059,345 +1059,345 @@ 
 
 
 if (! function_exists('espresso_event_venues')) {
-    /**
-     * espresso_event_venues
-     *
-     * @return array  all venues related to an event
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_venues()
-    {
-        return EEH_Venue_View::get_event_venues();
-    }
+	/**
+	 * espresso_event_venues
+	 *
+	 * @return array  all venues related to an event
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_venues()
+	{
+		return EEH_Venue_View::get_event_venues();
+	}
 }
 
 
 if (! function_exists('espresso_venue_id')) {
-    /**
-     *    espresso_venue_name
-     *
-     * @access    public
-     * @param int $EVT_ID
-     * @return    string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_id($EVT_ID = 0)
-    {
-        $venue = EEH_Venue_View::get_venue($EVT_ID);
-        return $venue instanceof EE_Venue ? $venue->ID() : 0;
-    }
+	/**
+	 *    espresso_venue_name
+	 *
+	 * @access    public
+	 * @param int $EVT_ID
+	 * @return    string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_id($EVT_ID = 0)
+	{
+		$venue = EEH_Venue_View::get_venue($EVT_ID);
+		return $venue instanceof EE_Venue ? $venue->ID() : 0;
+	}
 }
 
 
 if (! function_exists('espresso_is_venue_private')) {
-    /**
-     * Return whether a venue is private or not.
-     *
-     * @param int $VNU_ID optional, the venue id to check.
-     *
-     * @return bool | null
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @see EEH_Venue_View::get_venue() for more info on expected return results.
-     */
-    function espresso_is_venue_private($VNU_ID = 0)
-    {
-        return EEH_Venue_View::is_venue_private($VNU_ID);
-    }
+	/**
+	 * Return whether a venue is private or not.
+	 *
+	 * @param int $VNU_ID optional, the venue id to check.
+	 *
+	 * @return bool | null
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @see EEH_Venue_View::get_venue() for more info on expected return results.
+	 */
+	function espresso_is_venue_private($VNU_ID = 0)
+	{
+		return EEH_Venue_View::is_venue_private($VNU_ID);
+	}
 }
 
 
 if (! function_exists('espresso_venue_is_password_protected')) {
-    /**
-     * returns true or false if a venue is password protected or not
-     *
-     * @param int $VNU_ID optional, the venue id to check.
-     * @return bool
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_is_password_protected($VNU_ID = 0)
-    {
-        EE_Registry::instance()->load_helper('Venue_View');
-        return EEH_Venue_View::is_venue_password_protected($VNU_ID);
-    }
+	/**
+	 * returns true or false if a venue is password protected or not
+	 *
+	 * @param int $VNU_ID optional, the venue id to check.
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_is_password_protected($VNU_ID = 0)
+	{
+		EE_Registry::instance()->load_helper('Venue_View');
+		return EEH_Venue_View::is_venue_password_protected($VNU_ID);
+	}
 }
 
 
 if (! function_exists('espresso_password_protected_venue_form')) {
-    /**
-     * Returns a password form if venue is password protected.
-     *
-     * @param int $VNU_ID optional, the venue id to check.
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_password_protected_venue_form($VNU_ID = 0)
-    {
-        EE_Registry::instance()->load_helper('Venue_View');
-        return EEH_Venue_View::password_protected_venue_form($VNU_ID);
-    }
+	/**
+	 * Returns a password form if venue is password protected.
+	 *
+	 * @param int $VNU_ID optional, the venue id to check.
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_password_protected_venue_form($VNU_ID = 0)
+	{
+		EE_Registry::instance()->load_helper('Venue_View');
+		return EEH_Venue_View::password_protected_venue_form($VNU_ID);
+	}
 }
 
 
 if (! function_exists('espresso_venue_name')) {
-    /**
-     *    espresso_venue_name
-     *
-     * @access    public
-     * @param int    $VNU_ID
-     * @param string $link_to - options( details, website, none ) whether to turn Venue name into a clickable link to the Venue's details page or website
-     * @param bool   $echo
-     * @return    string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_name($VNU_ID = 0, $link_to = 'details', $echo = true)
-    {
-        if ($echo) {
-            echo EEH_Venue_View::venue_name($link_to, $VNU_ID); // already escaped
-            return '';
-        }
-        return EEH_Venue_View::venue_name($link_to, $VNU_ID);
-    }
+	/**
+	 *    espresso_venue_name
+	 *
+	 * @access    public
+	 * @param int    $VNU_ID
+	 * @param string $link_to - options( details, website, none ) whether to turn Venue name into a clickable link to the Venue's details page or website
+	 * @param bool   $echo
+	 * @return    string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_name($VNU_ID = 0, $link_to = 'details', $echo = true)
+	{
+		if ($echo) {
+			echo EEH_Venue_View::venue_name($link_to, $VNU_ID); // already escaped
+			return '';
+		}
+		return EEH_Venue_View::venue_name($link_to, $VNU_ID);
+	}
 }
 
 
 if (! function_exists('espresso_venue_link')) {
-    /**
-     *    espresso_venue_link
-     *
-     * @access    public
-     * @param int    $VNU_ID
-     * @param string $text
-     * @return    string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_link($VNU_ID = 0, $text = '')
-    {
-        return EEH_Venue_View::venue_details_link($VNU_ID, $text);
-    }
+	/**
+	 *    espresso_venue_link
+	 *
+	 * @access    public
+	 * @param int    $VNU_ID
+	 * @param string $text
+	 * @return    string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_link($VNU_ID = 0, $text = '')
+	{
+		return EEH_Venue_View::venue_details_link($VNU_ID, $text);
+	}
 }
 
 
 if (! function_exists('espresso_venue_description')) {
-    /**
-     *    espresso_venue_description
-     *
-     * @access    public
-     * @param bool $VNU_ID
-     * @param bool $echo
-     * @return    string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_description($VNU_ID = false, $echo = true)
-    {
-        if ($echo) {
-            echo EEH_Venue_View::venue_description($VNU_ID); // already escaped
-            return '';
-        }
-        return EEH_Venue_View::venue_description($VNU_ID);
-    }
+	/**
+	 *    espresso_venue_description
+	 *
+	 * @access    public
+	 * @param bool $VNU_ID
+	 * @param bool $echo
+	 * @return    string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_description($VNU_ID = false, $echo = true)
+	{
+		if ($echo) {
+			echo EEH_Venue_View::venue_description($VNU_ID); // already escaped
+			return '';
+		}
+		return EEH_Venue_View::venue_description($VNU_ID);
+	}
 }
 
 
 if (! function_exists('espresso_venue_excerpt')) {
-    /**
-     *    espresso_venue_excerpt
-     *
-     * @access    public
-     * @param int  $VNU_ID
-     * @param bool $echo
-     * @return    string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_excerpt($VNU_ID = 0, $echo = true)
-    {
-        if ($echo) {
-            echo EEH_Venue_View::venue_excerpt($VNU_ID); // already escaped
-            return '';
-        }
-        return EEH_Venue_View::venue_excerpt($VNU_ID);
-    }
+	/**
+	 *    espresso_venue_excerpt
+	 *
+	 * @access    public
+	 * @param int  $VNU_ID
+	 * @param bool $echo
+	 * @return    string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_excerpt($VNU_ID = 0, $echo = true)
+	{
+		if ($echo) {
+			echo EEH_Venue_View::venue_excerpt($VNU_ID); // already escaped
+			return '';
+		}
+		return EEH_Venue_View::venue_excerpt($VNU_ID);
+	}
 }
 
 
 if (! function_exists('espresso_venue_categories')) {
-    /**
-     * espresso_venue_categories
-     * returns the terms associated with a venue
-     *
-     * @param int  $VNU_ID
-     * @param bool $hide_uncategorized
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_categories($VNU_ID = 0, $hide_uncategorized = true, $echo = true)
-    {
-        if ($echo) {
-            echo EEH_Venue_View::venue_categories($VNU_ID, $hide_uncategorized); // already escaped
-            return '';
-        }
-        return EEH_Venue_View::venue_categories($VNU_ID, $hide_uncategorized);
-    }
+	/**
+	 * espresso_venue_categories
+	 * returns the terms associated with a venue
+	 *
+	 * @param int  $VNU_ID
+	 * @param bool $hide_uncategorized
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_categories($VNU_ID = 0, $hide_uncategorized = true, $echo = true)
+	{
+		if ($echo) {
+			echo EEH_Venue_View::venue_categories($VNU_ID, $hide_uncategorized); // already escaped
+			return '';
+		}
+		return EEH_Venue_View::venue_categories($VNU_ID, $hide_uncategorized);
+	}
 }
 
 
 if (! function_exists('espresso_venue_address')) {
-    /**
-     * espresso_venue_address
-     * returns a formatted block of html  for displaying a venue's address
-     *
-     * @param string $type 'inline' or 'multiline'
-     * @param int    $VNU_ID
-     * @param bool   $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_address($type = 'multiline', $VNU_ID = 0, $echo = true)
-    {
-        if ($echo) {
-            echo EEH_Venue_View::venue_address($type, $VNU_ID); // already escaped
-            return '';
-        }
-        return EEH_Venue_View::venue_address($type, $VNU_ID);
-    }
+	/**
+	 * espresso_venue_address
+	 * returns a formatted block of html  for displaying a venue's address
+	 *
+	 * @param string $type 'inline' or 'multiline'
+	 * @param int    $VNU_ID
+	 * @param bool   $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_address($type = 'multiline', $VNU_ID = 0, $echo = true)
+	{
+		if ($echo) {
+			echo EEH_Venue_View::venue_address($type, $VNU_ID); // already escaped
+			return '';
+		}
+		return EEH_Venue_View::venue_address($type, $VNU_ID);
+	}
 }
 
 
 if (! function_exists('espresso_venue_raw_address')) {
-    /**
-     * espresso_venue_address
-     * returns an UN-formatted string containing a venue's address
-     *
-     * @param string $type 'inline' or 'multiline'
-     * @param int    $VNU_ID
-     * @param bool   $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_raw_address($type = 'multiline', $VNU_ID = 0, $echo = true)
-    {
-        if ($echo) {
-            echo EEH_Venue_View::venue_address($type, $VNU_ID, false, false); // already escaped
-            return '';
-        }
-        return EEH_Venue_View::venue_address($type, $VNU_ID, false, false);
-    }
+	/**
+	 * espresso_venue_address
+	 * returns an UN-formatted string containing a venue's address
+	 *
+	 * @param string $type 'inline' or 'multiline'
+	 * @param int    $VNU_ID
+	 * @param bool   $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_raw_address($type = 'multiline', $VNU_ID = 0, $echo = true)
+	{
+		if ($echo) {
+			echo EEH_Venue_View::venue_address($type, $VNU_ID, false, false); // already escaped
+			return '';
+		}
+		return EEH_Venue_View::venue_address($type, $VNU_ID, false, false);
+	}
 }
 
 
 if (! function_exists('espresso_venue_has_address')) {
-    /**
-     * espresso_venue_has_address
-     * returns TRUE or FALSE if a Venue has address information
-     *
-     * @param int $VNU_ID
-     * @return bool
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_has_address($VNU_ID = 0)
-    {
-        return EEH_Venue_View::venue_has_address($VNU_ID);
-    }
+	/**
+	 * espresso_venue_has_address
+	 * returns TRUE or FALSE if a Venue has address information
+	 *
+	 * @param int $VNU_ID
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_has_address($VNU_ID = 0)
+	{
+		return EEH_Venue_View::venue_has_address($VNU_ID);
+	}
 }
 
 
 if (! function_exists('espresso_venue_gmap')) {
-    /**
-     * espresso_venue_gmap
-     * returns a google map for the venue address
-     *
-     * @param int   $VNU_ID
-     * @param bool  $map_ID
-     * @param array $gmap
-     * @param bool  $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_gmap($VNU_ID = 0, $map_ID = false, $gmap = [], $echo = true)
-    {
-        if ($echo) {
-            echo EEH_Venue_View::venue_gmap($VNU_ID, $map_ID, $gmap); // already escaped
-            return '';
-        }
-        return EEH_Venue_View::venue_gmap($VNU_ID, $map_ID, $gmap);
-    }
+	/**
+	 * espresso_venue_gmap
+	 * returns a google map for the venue address
+	 *
+	 * @param int   $VNU_ID
+	 * @param bool  $map_ID
+	 * @param array $gmap
+	 * @param bool  $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_gmap($VNU_ID = 0, $map_ID = false, $gmap = [], $echo = true)
+	{
+		if ($echo) {
+			echo EEH_Venue_View::venue_gmap($VNU_ID, $map_ID, $gmap); // already escaped
+			return '';
+		}
+		return EEH_Venue_View::venue_gmap($VNU_ID, $map_ID, $gmap);
+	}
 }
 
 
 if (! function_exists('espresso_venue_phone')) {
-    /**
-     * espresso_venue_phone
-     *
-     * @param int  $VNU_ID
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_phone($VNU_ID = 0, $echo = true)
-    {
-        if ($echo) {
-            echo EEH_Venue_View::venue_phone($VNU_ID); // already escaped
-            return '';
-        }
-        return EEH_Venue_View::venue_phone($VNU_ID);
-    }
+	/**
+	 * espresso_venue_phone
+	 *
+	 * @param int  $VNU_ID
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_phone($VNU_ID = 0, $echo = true)
+	{
+		if ($echo) {
+			echo EEH_Venue_View::venue_phone($VNU_ID); // already escaped
+			return '';
+		}
+		return EEH_Venue_View::venue_phone($VNU_ID);
+	}
 }
 
 
 if (! function_exists('espresso_venue_website')) {
-    /**
-     * espresso_venue_website
-     *
-     * @param int  $VNU_ID
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_website($VNU_ID = 0, $echo = true)
-    {
-        if ($echo) {
-            echo EEH_Venue_View::venue_website_link($VNU_ID); // already escaped
-            return '';
-        }
-        return EEH_Venue_View::venue_website_link($VNU_ID);
-    }
+	/**
+	 * espresso_venue_website
+	 *
+	 * @param int  $VNU_ID
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_website($VNU_ID = 0, $echo = true)
+	{
+		if ($echo) {
+			echo EEH_Venue_View::venue_website_link($VNU_ID); // already escaped
+			return '';
+		}
+		return EEH_Venue_View::venue_website_link($VNU_ID);
+	}
 }
 
 
 if (! function_exists('espresso_edit_venue_link')) {
-    /**
-     * espresso_edit_venue_link
-     *
-     * @param int  $VNU_ID
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_edit_venue_link($VNU_ID = 0, $echo = true)
-    {
-        if ($echo) {
-            echo EEH_Venue_View::edit_venue_link($VNU_ID); // already escaped
-            return '';
-        }
-        return EEH_Venue_View::edit_venue_link($VNU_ID);
-    }
+	/**
+	 * espresso_edit_venue_link
+	 *
+	 * @param int  $VNU_ID
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_edit_venue_link($VNU_ID = 0, $echo = true)
+	{
+		if ($echo) {
+			echo EEH_Venue_View::edit_venue_link($VNU_ID); // already escaped
+			return '';
+		}
+		return EEH_Venue_View::edit_venue_link($VNU_ID);
+	}
 }