eventespresso / event-espresso-core

core/libraries/plugin_api/EE_Register_Messages_Template_Pack.lib.php

Indentation +200 added lines, -200 removed lines

@@ -12,204 +12,204 @@
 {
 
 
-    /**
-     * Holds values for registered template pack
-     *
-     * @since 4.5.0
-     *
-     * @var array
-     */
-    protected static $_registry = array();
-
-
-    /**
-     * Used to register a new template pack with the messages system.
-     *
-     * Template packs are primarily defined via class extending EE_Messages_Template_Pack and are typically used to
-     * change entire layouts for a set of message templates.  This method is used to register the new template pack and
-     * automatically have it loaded in the appropriate places.
-     *
-     * This registry also verifies that there isn't already a template pack registered with the same name and if there
-     * is then it will add an EE_Error notice.
-     *
-     * Note that this only handles registering the your Template Pack class with the message template pack system.
-     * However, there is also a naming schema you must follow for templates you are providing with your template pack.
-     *
-     * @see    EE_Messages_Template_Pack_Default for an example class
-     * @see    core/libraries/messages/defaults/default/* for all the example templates the default template pack
-     *         supports.
-     *
-     *
-     * @since  4.5.0
-     * @throws EE_Error
-     *
-     * @param string $ref        The internal reference used to refer to this template pack.  Note, this is first come,
-     *                           first serve.  If there is already a template pack registered with this name then the
-     *                           registry will assign a unique reference for it so it can still be activated (but this
-     *                           makes it harder to deregister as it will be unique per load - so its best to try to
-     *                           make this a unique string!)
-     * @param array  $setup_args array {
-     *                           An array of required values for registering the template pack.
-     * @type string  $path       The path for the new template pack class.
-     * @type string  $classname  The name of the new Template Pack Class.
-     *                           }
-     *
-     * @return void
-     */
-    public static function register($ref = null, $setup_args = array())
-    {
-
-        // check for required params
-        if (empty($ref) || empty($setup_args['path']) || empty($setup_args['classname'])) {
-            throw new EE_Error(
-                __(
-                    'In order to register a new template pack for the EE Messages system, you must include a value to reference the template pack being registered and the setup_args must have the path for the new template pack class as well as the classname for the new Template Pack Class. ',
-                    'event_espresso'
-                )
-            );
-        }
-
-        // make sure we don't register twice
-        if (isset(self::$_registry[ $ref ])) {
-            return;
-        }
-
-        // check that incoming $ref doesn't already exist. If it does then we'll create a unique reference for this template pack.
-        if (isset(self::$_registry[ $ref ])) {
-            $ref = uniqid() . '_' . $ref;
-        }
-
-
-        // make sure this was called in the right place!
-        if (! did_action('EE_Brewing_Regular___messages_caf')
-            || did_action('AHEE__EE_System__perform_activations_upgrades_and_migrations')
-        ) {
-            EE_Error::doing_it_wrong(
-                __METHOD__,
-                sprintf(
-                    __(
-                        'A EE Messages Template Pack given the reference "%s" has been attempted to be registered with the EE Messages System.  It may or may not work because it should be only called on the "EE_Brewing_Regular__messages_caf" hook.',
-                        'event_espresso'
-                    ),
-                    $ref
-                ),
-                '4.5.0'
-            );
-        }
-
-        if (self::_verify_class_not_exist($setup_args['classname'])) {
-            self::$_registry[ $ref ] = array(
-                'path'      => (string) $setup_args['path'],
-                'classname' => (string) $setup_args['classname'],
-            );
-        }
-
-        // hook into the system
-        add_filter(
-            'FHEE__EED_Messages___set_messages_paths___MSG_PATHS',
-            array('EE_Register_Messages_Template_Pack', 'set_template_pack_path'),
-            10
-        );
-        add_filter(
-            'FHEE__EED_Messages__get_template_packs__template_packs',
-            array('EE_Register_Messages_Template_Pack', 'set_template_pack'),
-            10
-        );
-    }
-
-
-    /**
-     * Callback for the FHEE__EED_Messages___set_messages_paths___MSG_PATHS filter.  This adds this template packs path
-     * to the messages autoloader paths.
-     *
-     * @since  4.5.0
-     *
-     * @param array $paths Array of paths already registered with the messages autoloader
-     *
-     * @return array
-     */
-    public static function set_template_pack_path($paths)
-    {
-        foreach (self::$_registry as $ref => $args) {
-            $paths[] = $args['path'];
-        }
-        return $paths;
-    }
-
-
-    /**
-     * Callback for the FHEE__EED_Messages__get_template_packs__template_packs filter. This adds the instantiated,
-     * registered template pack to the template packs array when requested by client code.
-     *
-     * @since 4.5.0
-     *
-     * @param EE_Messages_Template_Pack[] $template_packs
-     * @return EE_Messages_Template_Pack[]
-     */
-    public static function set_template_pack($template_packs)
-    {
-        foreach (self::$_registry as $ref => $args) {
-            // verify class_exists
-            if (! class_exists($args['classname'])) {
-                require_once($args['path'] . '/' . $args['classname'] . '.class.php');
-            }
-
-            // check again!
-            if (class_exists($args['classname'])) {
-                $template_pack = new $args['classname'];
-                $template_packs[ $template_pack->dbref ] = $template_pack;
-            }
-        }
-
-        return $template_packs;
-    }
-
-
-    /**
-     * This verifies that the classes for each registered template pack are unique  names.
-     *
-     * @param string $classname The classname being checked
-     *
-     * @return bool
-     */
-    private static function _verify_class_not_exist($classname)
-    {
-
-        // loop through the existing registry and see if the classname is already present.
-        foreach (self::$_registry as $ref => $args) {
-            if ($args['classname'] == $classname) {
-                EE_Error::add_error(
-                    sprintf(
-                        __(
-                            'The %s template pack that you just activated cannot be registered with the messages system because there is already a template pack active using the same classname.  Contact the author of this template pack to let them know of the conflict.  To stop seeing this message you will need to deactivate this template pack.',
-                            'event_espresso'
-                        ),
-                        (string) $setup_args['classname']
-                    ),
-                    __FILE__,
-                    __LINE__,
-                    __FUNCTION__
-                );
-                return false;
-            }
-        }
-        return true;
-    }
-
-
-    /**
-     * This deregisters a variation set that was previously registered with the given slug.
-     *
-     * @since 4.5.0
-     *
-     * @param string $variation_ref The name for the variation set that was previously registered.
-     *
-     * @return void
-     */
-    public static function deregister($variation_ref = null)
-    {
-        if (! empty(self::$_registry[ $variation_ref ])) {
-            unset(self::$_registry[ $variation_ref ]);
-        }
-    }
+	/**
+	 * Holds values for registered template pack
+	 *
+	 * @since 4.5.0
+	 *
+	 * @var array
+	 */
+	protected static $_registry = array();
+
+
+	/**
+	 * Used to register a new template pack with the messages system.
+	 *
+	 * Template packs are primarily defined via class extending EE_Messages_Template_Pack and are typically used to
+	 * change entire layouts for a set of message templates.  This method is used to register the new template pack and
+	 * automatically have it loaded in the appropriate places.
+	 *
+	 * This registry also verifies that there isn't already a template pack registered with the same name and if there
+	 * is then it will add an EE_Error notice.
+	 *
+	 * Note that this only handles registering the your Template Pack class with the message template pack system.
+	 * However, there is also a naming schema you must follow for templates you are providing with your template pack.
+	 *
+	 * @see    EE_Messages_Template_Pack_Default for an example class
+	 * @see    core/libraries/messages/defaults/default/* for all the example templates the default template pack
+	 *         supports.
+	 *
+	 *
+	 * @since  4.5.0
+	 * @throws EE_Error
+	 *
+	 * @param string $ref        The internal reference used to refer to this template pack.  Note, this is first come,
+	 *                           first serve.  If there is already a template pack registered with this name then the
+	 *                           registry will assign a unique reference for it so it can still be activated (but this
+	 *                           makes it harder to deregister as it will be unique per load - so its best to try to
+	 *                           make this a unique string!)
+	 * @param array  $setup_args array {
+	 *                           An array of required values for registering the template pack.
+	 * @type string  $path       The path for the new template pack class.
+	 * @type string  $classname  The name of the new Template Pack Class.
+	 *                           }
+	 *
+	 * @return void
+	 */
+	public static function register($ref = null, $setup_args = array())
+	{
+
+		// check for required params
+		if (empty($ref) || empty($setup_args['path']) || empty($setup_args['classname'])) {
+			throw new EE_Error(
+				__(
+					'In order to register a new template pack for the EE Messages system, you must include a value to reference the template pack being registered and the setup_args must have the path for the new template pack class as well as the classname for the new Template Pack Class. ',
+					'event_espresso'
+				)
+			);
+		}
+
+		// make sure we don't register twice
+		if (isset(self::$_registry[ $ref ])) {
+			return;
+		}
+
+		// check that incoming $ref doesn't already exist. If it does then we'll create a unique reference for this template pack.
+		if (isset(self::$_registry[ $ref ])) {
+			$ref = uniqid() . '_' . $ref;
+		}
+
+
+		// make sure this was called in the right place!
+		if (! did_action('EE_Brewing_Regular___messages_caf')
+			|| did_action('AHEE__EE_System__perform_activations_upgrades_and_migrations')
+		) {
+			EE_Error::doing_it_wrong(
+				__METHOD__,
+				sprintf(
+					__(
+						'A EE Messages Template Pack given the reference "%s" has been attempted to be registered with the EE Messages System.  It may or may not work because it should be only called on the "EE_Brewing_Regular__messages_caf" hook.',
+						'event_espresso'
+					),
+					$ref
+				),
+				'4.5.0'
+			);
+		}
+
+		if (self::_verify_class_not_exist($setup_args['classname'])) {
+			self::$_registry[ $ref ] = array(
+				'path'      => (string) $setup_args['path'],
+				'classname' => (string) $setup_args['classname'],
+			);
+		}
+
+		// hook into the system
+		add_filter(
+			'FHEE__EED_Messages___set_messages_paths___MSG_PATHS',
+			array('EE_Register_Messages_Template_Pack', 'set_template_pack_path'),
+			10
+		);
+		add_filter(
+			'FHEE__EED_Messages__get_template_packs__template_packs',
+			array('EE_Register_Messages_Template_Pack', 'set_template_pack'),
+			10
+		);
+	}
+
+
+	/**
+	 * Callback for the FHEE__EED_Messages___set_messages_paths___MSG_PATHS filter.  This adds this template packs path
+	 * to the messages autoloader paths.
+	 *
+	 * @since  4.5.0
+	 *
+	 * @param array $paths Array of paths already registered with the messages autoloader
+	 *
+	 * @return array
+	 */
+	public static function set_template_pack_path($paths)
+	{
+		foreach (self::$_registry as $ref => $args) {
+			$paths[] = $args['path'];
+		}
+		return $paths;
+	}
+
+
+	/**
+	 * Callback for the FHEE__EED_Messages__get_template_packs__template_packs filter. This adds the instantiated,
+	 * registered template pack to the template packs array when requested by client code.
+	 *
+	 * @since 4.5.0
+	 *
+	 * @param EE_Messages_Template_Pack[] $template_packs
+	 * @return EE_Messages_Template_Pack[]
+	 */
+	public static function set_template_pack($template_packs)
+	{
+		foreach (self::$_registry as $ref => $args) {
+			// verify class_exists
+			if (! class_exists($args['classname'])) {
+				require_once($args['path'] . '/' . $args['classname'] . '.class.php');
+			}
+
+			// check again!
+			if (class_exists($args['classname'])) {
+				$template_pack = new $args['classname'];
+				$template_packs[ $template_pack->dbref ] = $template_pack;
+			}
+		}
+
+		return $template_packs;
+	}
+
+
+	/**
+	 * This verifies that the classes for each registered template pack are unique  names.
+	 *
+	 * @param string $classname The classname being checked
+	 *
+	 * @return bool
+	 */
+	private static function _verify_class_not_exist($classname)
+	{
+
+		// loop through the existing registry and see if the classname is already present.
+		foreach (self::$_registry as $ref => $args) {
+			if ($args['classname'] == $classname) {
+				EE_Error::add_error(
+					sprintf(
+						__(
+							'The %s template pack that you just activated cannot be registered with the messages system because there is already a template pack active using the same classname.  Contact the author of this template pack to let them know of the conflict.  To stop seeing this message you will need to deactivate this template pack.',
+							'event_espresso'
+						),
+						(string) $setup_args['classname']
+					),
+					__FILE__,
+					__LINE__,
+					__FUNCTION__
+				);
+				return false;
+			}
+		}
+		return true;
+	}
+
+
+	/**
+	 * This deregisters a variation set that was previously registered with the given slug.
+	 *
+	 * @since 4.5.0
+	 *
+	 * @param string $variation_ref The name for the variation set that was previously registered.
+	 *
+	 * @return void
+	 */
+	public static function deregister($variation_ref = null)
+	{
+		if (! empty(self::$_registry[ $variation_ref ])) {
+			unset(self::$_registry[ $variation_ref ]);
+		}
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -70,18 +70,18 @@ 
         }
 
         // make sure we don't register twice
-        if (isset(self::$_registry[ $ref ])) {
+        if (isset(self::$_registry[$ref])) {
             return;
         }
 
         // check that incoming $ref doesn't already exist. If it does then we'll create a unique reference for this template pack.
-        if (isset(self::$_registry[ $ref ])) {
-            $ref = uniqid() . '_' . $ref;
+        if (isset(self::$_registry[$ref])) {
+            $ref = uniqid().'_'.$ref;
         }
 
 
         // make sure this was called in the right place!
-        if (! did_action('EE_Brewing_Regular___messages_caf')
+        if ( ! did_action('EE_Brewing_Regular___messages_caf')
             || did_action('AHEE__EE_System__perform_activations_upgrades_and_migrations')
         ) {
             EE_Error::doing_it_wrong(
@@ -98,7 +98,7 @@ 
         }
 
         if (self::_verify_class_not_exist($setup_args['classname'])) {
-            self::$_registry[ $ref ] = array(
+            self::$_registry[$ref] = array(
                 'path'      => (string) $setup_args['path'],
                 'classname' => (string) $setup_args['classname'],
             );
@@ -150,14 +150,14 @@ 
     {
         foreach (self::$_registry as $ref => $args) {
             // verify class_exists
-            if (! class_exists($args['classname'])) {
-                require_once($args['path'] . '/' . $args['classname'] . '.class.php');
+            if ( ! class_exists($args['classname'])) {
+                require_once($args['path'].'/'.$args['classname'].'.class.php');
             }
 
             // check again!
             if (class_exists($args['classname'])) {
                 $template_pack = new $args['classname'];
-                $template_packs[ $template_pack->dbref ] = $template_pack;
+                $template_packs[$template_pack->dbref] = $template_pack;
             }
         }
 
@@ -208,8 +208,8 @@ 
      */
     public static function deregister($variation_ref = null)
     {
-        if (! empty(self::$_registry[ $variation_ref ])) {
-            unset(self::$_registry[ $variation_ref ]);
+        if ( ! empty(self::$_registry[$variation_ref])) {
+            unset(self::$_registry[$variation_ref]);
         }
     }
 }

core/libraries/messages/EE_Message_Generated_From_Token.php

Indentation +107 added lines, -107 removed lines

@@ -12,111 +12,111 @@
 {
 
 
-    /**
-     * Sending messenger
-     *
-     * @type EE_messenger | string
-     */
-    protected $_sending_messenger = '';
-
-
-    /**
-     * Holds the incoming token;
-     * @type string
-     */
-    public $token = '';
-
-
-    /**
-     * Constructor
-     *
-     * @param   string    $sending_messenger_slug     This is used to set what messenger is used to "send"
-     *                                                the EE_Message retrieved from the DB via the given token.
-     * @param   string $token                         This is a token for a Message that should already exist int the db.
-     *                                                This is then used to populate the properties in here.
-     * @param   EE_Message_Resource_Manager $message_resource_manager
-     */
-    public function __construct($token, $sending_messenger_slug = 'html', EE_Message_Resource_Manager $message_resource_manager)
-    {
-        $this->token = $token;
-        $this->_sending_messenger = $this->_set_sending_messenger($sending_messenger_slug, $message_resource_manager);
-        $this->_message = $this->_generate_message();
-        // set params for parent from the message object
-        parent::__construct(
-            $this->_message->messenger(),
-            $this->_message->message_type(),
-            array(),
-            $this->_message->context(),
-            false
-        );
-    }
-
-
-
-    /**
-     * @param string                       $sending_messenger_slug
-     * @param \EE_Message_Resource_Manager $message_resource_manager
-     * @return \EE_messenger | string
-     */
-    protected function _set_sending_messenger(
-        $sending_messenger_slug,
-        EE_Message_Resource_Manager $message_resource_manager
-    ) {
-        $sending_messenger = $message_resource_manager->get_active_messenger($sending_messenger_slug);
-        return $sending_messenger instanceof EE_messenger ? $sending_messenger : $sending_messenger_slug;
-    }
-
-
-
-    /**
-     * @return EE_messenger
-     */
-    public function sending_messenger()
-    {
-        return $this->_sending_messenger;
-    }
-
-
-
-    /**
-     * generates an EE_Message using the supplied arguments and some defaults
-     *
-     * @param array $properties
-     * @return EE_Message
-     * @throws \EE_Error
-     */
-    protected function _generate_message($properties = array())
-    {
-        // a message was generated immediately but the parent class will call this again
-        if ($this->_message instanceof EE_Message) {
-            return $this->_message;
-        }
-        $message = EEM_Message::instance()->get_one_by_token($this->token);
-        if (! $message instanceof EE_Message) {
-            throw new EE_Error(
-                sprintf(
-                    __('Unable to retrieve generated message from DB using given token: "%1$s"', 'event_espresso'),
-                    $this->token
-                )
-            );
-        }
-        $message->set_STS_ID(EEM_Message::status_idle);
-
-        if (! $this->_sending_messenger instanceof EE_messenger) {
-            $message->set_STS_ID(EEM_Message::status_failed);
-            $message->set_error_message(
-                sprintf(
-                    __('Unable to send message because the "%1$s" messenger is not active or not installed', 'event_espresso'),
-                    $this->_sending_messenger
-                )
-            );
-        }
-
-        // set properties
-        $this->_valid = true;
-        $this->_messenger = $message->messenger_object();
-        $this->_message_type = $message->message_type_object();
-        $this->_send_now = $message->send_now();
-        return $message;
-    }
+	/**
+	 * Sending messenger
+	 *
+	 * @type EE_messenger | string
+	 */
+	protected $_sending_messenger = '';
+
+
+	/**
+	 * Holds the incoming token;
+	 * @type string
+	 */
+	public $token = '';
+
+
+	/**
+	 * Constructor
+	 *
+	 * @param   string    $sending_messenger_slug     This is used to set what messenger is used to "send"
+	 *                                                the EE_Message retrieved from the DB via the given token.
+	 * @param   string $token                         This is a token for a Message that should already exist int the db.
+	 *                                                This is then used to populate the properties in here.
+	 * @param   EE_Message_Resource_Manager $message_resource_manager
+	 */
+	public function __construct($token, $sending_messenger_slug = 'html', EE_Message_Resource_Manager $message_resource_manager)
+	{
+		$this->token = $token;
+		$this->_sending_messenger = $this->_set_sending_messenger($sending_messenger_slug, $message_resource_manager);
+		$this->_message = $this->_generate_message();
+		// set params for parent from the message object
+		parent::__construct(
+			$this->_message->messenger(),
+			$this->_message->message_type(),
+			array(),
+			$this->_message->context(),
+			false
+		);
+	}
+
+
+
+	/**
+	 * @param string                       $sending_messenger_slug
+	 * @param \EE_Message_Resource_Manager $message_resource_manager
+	 * @return \EE_messenger | string
+	 */
+	protected function _set_sending_messenger(
+		$sending_messenger_slug,
+		EE_Message_Resource_Manager $message_resource_manager
+	) {
+		$sending_messenger = $message_resource_manager->get_active_messenger($sending_messenger_slug);
+		return $sending_messenger instanceof EE_messenger ? $sending_messenger : $sending_messenger_slug;
+	}
+
+
+
+	/**
+	 * @return EE_messenger
+	 */
+	public function sending_messenger()
+	{
+		return $this->_sending_messenger;
+	}
+
+
+
+	/**
+	 * generates an EE_Message using the supplied arguments and some defaults
+	 *
+	 * @param array $properties
+	 * @return EE_Message
+	 * @throws \EE_Error
+	 */
+	protected function _generate_message($properties = array())
+	{
+		// a message was generated immediately but the parent class will call this again
+		if ($this->_message instanceof EE_Message) {
+			return $this->_message;
+		}
+		$message = EEM_Message::instance()->get_one_by_token($this->token);
+		if (! $message instanceof EE_Message) {
+			throw new EE_Error(
+				sprintf(
+					__('Unable to retrieve generated message from DB using given token: "%1$s"', 'event_espresso'),
+					$this->token
+				)
+			);
+		}
+		$message->set_STS_ID(EEM_Message::status_idle);
+
+		if (! $this->_sending_messenger instanceof EE_messenger) {
+			$message->set_STS_ID(EEM_Message::status_failed);
+			$message->set_error_message(
+				sprintf(
+					__('Unable to send message because the "%1$s" messenger is not active or not installed', 'event_espresso'),
+					$this->_sending_messenger
+				)
+			);
+		}
+
+		// set properties
+		$this->_valid = true;
+		$this->_messenger = $message->messenger_object();
+		$this->_message_type = $message->message_type_object();
+		$this->_send_now = $message->send_now();
+		return $message;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -92,7 +92,7 @@ 
             return $this->_message;
         }
         $message = EEM_Message::instance()->get_one_by_token($this->token);
-        if (! $message instanceof EE_Message) {
+        if ( ! $message instanceof EE_Message) {
             throw new EE_Error(
                 sprintf(
                     __('Unable to retrieve generated message from DB using given token: "%1$s"', 'event_espresso'),
@@ -102,7 +102,7 @@ 
         }
         $message->set_STS_ID(EEM_Message::status_idle);
 
-        if (! $this->_sending_messenger instanceof EE_messenger) {
+        if ( ! $this->_sending_messenger instanceof EE_messenger) {
             $message->set_STS_ID(EEM_Message::status_failed);
             $message->set_error_message(
                 sprintf(

core/libraries/messages/EE_Message_Repository.lib.php

Indentation +225 added lines, -225 removed lines

@@ -12,256 +12,256 @@
 {
 
 
-    /**
-     *    EE_Message_Repository constructor
-     */
-    public function __construct()
-    {
-        $this->interface = 'EE_Message';
-        parent::__construct();
-    }
+	/**
+	 *    EE_Message_Repository constructor
+	 */
+	public function __construct()
+	{
+		$this->interface = 'EE_Message';
+		parent::__construct();
+	}
 
 
-    /**
-     * Add the EE_Message to the repository.
-     * This also ensures that the MSG_token is saves as a part of the info for retrieval.
-     *
-     * @param EE_Message $message
-     * @param mixed      $info Any included data is saved in the attached object info array indexed by 'data'
-     * @return bool
-     */
-    public function add($message, $info = null)
-    {
-        $attached = parent::add($message);
-        // ensure $info is an array if not already
-        $info = $info === null ? $info = array() : (array) $info;
-        $data = $this->_init_data($info, $attached, $message);
-        if ($attached) {
-            $this->set_info($message, $data);
-        }
-        return $attached;
-    }
+	/**
+	 * Add the EE_Message to the repository.
+	 * This also ensures that the MSG_token is saves as a part of the info for retrieval.
+	 *
+	 * @param EE_Message $message
+	 * @param mixed      $info Any included data is saved in the attached object info array indexed by 'data'
+	 * @return bool
+	 */
+	public function add($message, $info = null)
+	{
+		$attached = parent::add($message);
+		// ensure $info is an array if not already
+		$info = $info === null ? $info = array() : (array) $info;
+		$data = $this->_init_data($info, $attached, $message);
+		if ($attached) {
+			$this->set_info($message, $data);
+		}
+		return $attached;
+	}
 
 
-    /**
-     * Initializes the data from the incoming info.
-     *
-     * @param array      $info     incoming data.
-     * @param bool       $attached Indicates whether the object was attached successfully.
-     * @param EE_Message $message
-     * @return array
-     */
-    protected function _init_data($info, $attached, $message)
-    {
-        $data = array(
-            'test_send'               => false,
-            'preview'                 => false,
-            'data_handler_class_name' => '',
-            'data'                    => array(
-                'MSG_generation_data' => array(),
-            ),
-        );
-        if (isset($info['preview'])) {
-            $data['preview'] = $info['preview'];
-            unset($info['preview']);
-        }
-        if (isset($info['test_send'])) {
-            $data['test_send'] = $info['test_send'];
-            unset($info['test_send']);
-        }
-        if (isset($info['data_handler_class_name'])) {
-            $data['data_handler_class_name'] = $info['data_handler_class_name'];
-            unset($info['data_handler_class_name']);
-        }
-        if ($attached && $message->STS_ID() === EEM_Message::status_incomplete) {
-            $generation_data = isset($info['MSG_generation_data']) ? $info['MSG_generation_data'] : array();
-            // if data isn't in $info...let's see if its available via the message object
-            $generation_data = ! $generation_data ? $message->get_generation_data() : $generation_data;
-            // still empty then let's just use info
-            $generation_data                     = ! $generation_data ? $info : $generation_data;
-            $data['data']['MSG_generation_data'] = $generation_data;
-        }
-        return $data;
-    }
+	/**
+	 * Initializes the data from the incoming info.
+	 *
+	 * @param array      $info     incoming data.
+	 * @param bool       $attached Indicates whether the object was attached successfully.
+	 * @param EE_Message $message
+	 * @return array
+	 */
+	protected function _init_data($info, $attached, $message)
+	{
+		$data = array(
+			'test_send'               => false,
+			'preview'                 => false,
+			'data_handler_class_name' => '',
+			'data'                    => array(
+				'MSG_generation_data' => array(),
+			),
+		);
+		if (isset($info['preview'])) {
+			$data['preview'] = $info['preview'];
+			unset($info['preview']);
+		}
+		if (isset($info['test_send'])) {
+			$data['test_send'] = $info['test_send'];
+			unset($info['test_send']);
+		}
+		if (isset($info['data_handler_class_name'])) {
+			$data['data_handler_class_name'] = $info['data_handler_class_name'];
+			unset($info['data_handler_class_name']);
+		}
+		if ($attached && $message->STS_ID() === EEM_Message::status_incomplete) {
+			$generation_data = isset($info['MSG_generation_data']) ? $info['MSG_generation_data'] : array();
+			// if data isn't in $info...let's see if its available via the message object
+			$generation_data = ! $generation_data ? $message->get_generation_data() : $generation_data;
+			// still empty then let's just use info
+			$generation_data                     = ! $generation_data ? $info : $generation_data;
+			$data['data']['MSG_generation_data'] = $generation_data;
+		}
+		return $data;
+	}
 
 
-    /**
-     * Save all EE_Message objects to the db.
-     *
-     * @param bool $do_hooks_only  When true, only the hooks related to saving are fired.
-     * @return array array(
-     *                  'updated' => 0, //count of how many messages updated
-     *                  'notupdated' => 0, //count of how many messages not updated.
-     *                  'errors' => array( $token ), //array of message object tokens that had errors in saving
-     *                  )
-     */
-    public function saveAll($do_hooks_only = false)
-    {
-        $save_tracking = array('updated' => 0, 'notupdated' => 0, 'errors' => array());
+	/**
+	 * Save all EE_Message objects to the db.
+	 *
+	 * @param bool $do_hooks_only  When true, only the hooks related to saving are fired.
+	 * @return array array(
+	 *                  'updated' => 0, //count of how many messages updated
+	 *                  'notupdated' => 0, //count of how many messages not updated.
+	 *                  'errors' => array( $token ), //array of message object tokens that had errors in saving
+	 *                  )
+	 */
+	public function saveAll($do_hooks_only = false)
+	{
+		$save_tracking = array('updated' => 0, 'notupdated' => 0, 'errors' => array());
 
-        if (! $do_hooks_only) {
-            $this->rewind();
-            // exit early if there is nothing to save.
-            if ($this->count() < 1) {
-                return $save_tracking;
-            }
+		if (! $do_hooks_only) {
+			$this->rewind();
+			// exit early if there is nothing to save.
+			if ($this->count() < 1) {
+				return $save_tracking;
+			}
 
-            while ($this->valid()) {
-                $saved = $this->current()->save();
-                if ($saved === false) {
-                    $save_tracking['errors'][] = $this->current()->MSG_token();
-                } elseif ($saved) {
-                    $save_tracking['updated']++;
-                } else {
-                    $save_tracking['notupdated']++;
-                }
-                // maybe persist generation data if this is an incomplete EE_Message.
-                $this->_maybe_persist_attached_data();
+			while ($this->valid()) {
+				$saved = $this->current()->save();
+				if ($saved === false) {
+					$save_tracking['errors'][] = $this->current()->MSG_token();
+				} elseif ($saved) {
+					$save_tracking['updated']++;
+				} else {
+					$save_tracking['notupdated']++;
+				}
+				// maybe persist generation data if this is an incomplete EE_Message.
+				$this->_maybe_persist_attached_data();
 
-                $this->next();
-            }
-        }
-        do_action('AHEE__EE_Message_Repository__saveAll__after', $save_tracking, $this, $do_hooks_only);
-        return $save_tracking;
-    }
+				$this->next();
+			}
+		}
+		do_action('AHEE__EE_Message_Repository__saveAll__after', $save_tracking, $this, $do_hooks_only);
+		return $save_tracking;
+	}
 
 
-    /**
-     * Retrieves a EE_Message from the repository that matches the given token.
-     *
-     * @param string $token Token.
-     * @return EE_Message | null
-     */
-    public function getMessageByToken($token)
-    {
-        $this->rewind();
-        while ($this->valid()) {
-            if ($this->current()->MSG_token() === $token) {
-                $message = $this->current();
-                $this->rewind();
-                return $message;
-            }
-            $this->next();
-        }
-        return null;
-    }
+	/**
+	 * Retrieves a EE_Message from the repository that matches the given token.
+	 *
+	 * @param string $token Token.
+	 * @return EE_Message | null
+	 */
+	public function getMessageByToken($token)
+	{
+		$this->rewind();
+		while ($this->valid()) {
+			if ($this->current()->MSG_token() === $token) {
+				$message = $this->current();
+				$this->rewind();
+				return $message;
+			}
+			$this->next();
+		}
+		return null;
+	}
 
 
-    /**
-     * This retrieves any data required for generation that may be saved with the current EE_Message in storage.
-     *
-     * @return array();
-     */
-    public function get_generation_data()
-    {
-        // first verify we're at a valid iterator point.
-        if (! $this->valid()) {
-            return array();
-        }
-        $info = $this->getInfo();
-        return isset($info['data']) && isset($info['data']['MSG_generation_data']) ? $info['data']['MSG_generation_data'] : array();
-    }
+	/**
+	 * This retrieves any data required for generation that may be saved with the current EE_Message in storage.
+	 *
+	 * @return array();
+	 */
+	public function get_generation_data()
+	{
+		// first verify we're at a valid iterator point.
+		if (! $this->valid()) {
+			return array();
+		}
+		$info = $this->getInfo();
+		return isset($info['data']) && isset($info['data']['MSG_generation_data']) ? $info['data']['MSG_generation_data'] : array();
+	}
 
 
-    /**
-     * Retrieves the data_handler_class_name or reference associated with the current EE_Message object in the iterator.
-     *
-     * @return string
-     */
-    public function get_data_handler()
-    {
-        if (! $this->valid()) {
-            return '';
-        }
-        $info = $this->getInfo();
-        return isset($info['data_handler_class_name']) ? $info['data_handler_class_name'] : '';
-    }
+	/**
+	 * Retrieves the data_handler_class_name or reference associated with the current EE_Message object in the iterator.
+	 *
+	 * @return string
+	 */
+	public function get_data_handler()
+	{
+		if (! $this->valid()) {
+			return '';
+		}
+		$info = $this->getInfo();
+		return isset($info['data_handler_class_name']) ? $info['data_handler_class_name'] : '';
+	}
 
 
-    /**
-     * Returns whether this EE_Message is for a preview or not.
-     *
-     * @return bool
-     */
-    public function is_preview()
-    {
-        if (! $this->valid()) {
-            return false;
-        }
-        $info = $this->getInfo();
-        return $info['preview'];
-    }
+	/**
+	 * Returns whether this EE_Message is for a preview or not.
+	 *
+	 * @return bool
+	 */
+	public function is_preview()
+	{
+		if (! $this->valid()) {
+			return false;
+		}
+		$info = $this->getInfo();
+		return $info['preview'];
+	}
 
 
-    /**
-     * Returns whether the current message pointed to is for a test send.
-     *
-     * @return bool
-     */
-    public function is_test_send()
-    {
-        if (! $this->valid()) {
-            return false;
-        }
-        $info = $this->getInfo();
-        return $info['test_send'];
-    }
+	/**
+	 * Returns whether the current message pointed to is for a test send.
+	 *
+	 * @return bool
+	 */
+	public function is_test_send()
+	{
+		if (! $this->valid()) {
+			return false;
+		}
+		$info = $this->getInfo();
+		return $info['test_send'];
+	}
 
 
-    /**
-     *  This checks if the current EE_Message in the iterator is incomplete. If it is, then
-     *  data is attached for later retrieval (batch generation).
-     */
-    protected function _maybe_persist_attached_data()
-    {
-        if (! $this->valid()) {
-            return;
-        }
+	/**
+	 *  This checks if the current EE_Message in the iterator is incomplete. If it is, then
+	 *  data is attached for later retrieval (batch generation).
+	 */
+	protected function _maybe_persist_attached_data()
+	{
+		if (! $this->valid()) {
+			return;
+		}
 
-        $info                    = $this->getInfo();
-        $data_handler_class_name = isset($info['data_handler_class_name']) ? $info['data_handler_class_name'] : '';
-        $data                    = isset($info['data']) && isset($info['data']['MSG_generation_data']) ? $info['data']['MSG_generation_data'] : array();
-        if ($data && $this->current()->STS_ID() === EEM_Message::status_incomplete) {
-            $this->current()->set_generation_data($data);
-            $this->current()->set_field_or_extra_meta('data_handler_class_name', $data_handler_class_name);
-        }
-    }
+		$info                    = $this->getInfo();
+		$data_handler_class_name = isset($info['data_handler_class_name']) ? $info['data_handler_class_name'] : '';
+		$data                    = isset($info['data']) && isset($info['data']['MSG_generation_data']) ? $info['data']['MSG_generation_data'] : array();
+		if ($data && $this->current()->STS_ID() === EEM_Message::status_incomplete) {
+			$this->current()->set_generation_data($data);
+			$this->current()->set_field_or_extra_meta('data_handler_class_name', $data_handler_class_name);
+		}
+	}
 
 
-    /**
-     * This method returns a count of messages in the repository that have a given priority.
-     *
-     * @param int   $priority the priority that is being filtered for the count.
-     * @param array $status   the optional status(es) that will also be filtered by when priority matches.
-     * @return int  count of messages in the queue matching the conditions.
-     */
-    public function count_by_priority_and_status($priority, $status = array())
-    {
-        if (! empty($status)) {
-            $status = is_array($status) ? $status : array($status);
-        }
+	/**
+	 * This method returns a count of messages in the repository that have a given priority.
+	 *
+	 * @param int   $priority the priority that is being filtered for the count.
+	 * @param array $status   the optional status(es) that will also be filtered by when priority matches.
+	 * @return int  count of messages in the queue matching the conditions.
+	 */
+	public function count_by_priority_and_status($priority, $status = array())
+	{
+		if (! empty($status)) {
+			$status = is_array($status) ? $status : array($status);
+		}
 
-        $count = 0;
-        $this->rewind();
-        while ($this->valid()) {
-            if ($this->current()->priority() === $priority && (($status && in_array(
-                $this->current()->STS_ID(),
-                $status
-            )) || ! $status)
-            ) {
-                $count++;
-            }
-            $this->next();
-        }
-        return $count;
-    }
+		$count = 0;
+		$this->rewind();
+		while ($this->valid()) {
+			if ($this->current()->priority() === $priority && (($status && in_array(
+				$this->current()->STS_ID(),
+				$status
+			)) || ! $status)
+			) {
+				$count++;
+			}
+			$this->next();
+		}
+		return $count;
+	}
 
 
-    /**
-     * @return EE_Message
-     */
-    public function current()
-    {
-        return parent::current();
-    }
+	/**
+	 * @return EE_Message
+	 */
+	public function current()
+	{
+		return parent::current();
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -99,7 +99,7 @@ 
     {
         $save_tracking = array('updated' => 0, 'notupdated' => 0, 'errors' => array());
 
-        if (! $do_hooks_only) {
+        if ( ! $do_hooks_only) {
             $this->rewind();
             // exit early if there is nothing to save.
             if ($this->count() < 1) {
@@ -155,7 +155,7 @@ 
     public function get_generation_data()
     {
         // first verify we're at a valid iterator point.
-        if (! $this->valid()) {
+        if ( ! $this->valid()) {
             return array();
         }
         $info = $this->getInfo();
@@ -170,7 +170,7 @@ 
      */
     public function get_data_handler()
     {
-        if (! $this->valid()) {
+        if ( ! $this->valid()) {
             return '';
         }
         $info = $this->getInfo();
@@ -185,7 +185,7 @@ 
      */
     public function is_preview()
     {
-        if (! $this->valid()) {
+        if ( ! $this->valid()) {
             return false;
         }
         $info = $this->getInfo();
@@ -200,7 +200,7 @@ 
      */
     public function is_test_send()
     {
-        if (! $this->valid()) {
+        if ( ! $this->valid()) {
             return false;
         }
         $info = $this->getInfo();
@@ -214,7 +214,7 @@ 
      */
     protected function _maybe_persist_attached_data()
     {
-        if (! $this->valid()) {
+        if ( ! $this->valid()) {
             return;
         }
 
@@ -237,7 +237,7 @@ 
      */
     public function count_by_priority_and_status($priority, $status = array())
     {
-        if (! empty($status)) {
+        if ( ! empty($status)) {
             $status = is_array($status) ? $status : array($status);
         }
 

core/libraries/messages/EE_Message_Type_Collection.lib.php

Indentation +164 added lines, -164 removed lines

@@ -14,168 +14,168 @@
 class EE_Message_Type_Collection extends EE_Object_Collection
 {
 
-    /**
-     * EE_Message_Type_Collection constructor.
-     */
-    public function __construct()
-    {
-        $this->interface = 'EE_message_type';
-    }
-
-
-
-    /**
-     * add
-     *
-     * attaches an object to the Collection
-     * and sets any supplied data associated with the current iterator entry
-     * by calling EE_Object_Collection::set_info()
-     *
-     * @access public
-     * @param object $object
-     * @param mixed  $info
-     * @return bool
-     */
-    public function add($object, $info = null)
-    {
-        $info = empty($info) && $object instanceof $this->interface ? $object->name : $info;
-        return parent::add($object, $info);
-    }
-
-
-
-    /**
-     * set_info
-     *
-     * Sets the data associated with an object in the Collection
-     * if no $info is supplied, then the spl_object_hash() is used
-     *
-     * @access public
-     * @param object $object
-     * @param mixed  $info
-     * @return bool
-     */
-    public function set_info($object, $info = null)
-    {
-        $info = empty($info) && $object instanceof $this->interface ? $object->name : $info;
-        return parent::set_info($object, $info);
-    }
-
-
-
-    /**
-     * get_by_info
-     *
-     * finds and returns an object in the Collection based on the info that was set using addObject()
-     * PLZ NOTE: the pointer is reset to the beginning of the collection before returning
-     *
-     * @access public
-     * @param mixed
-     * @return null | object
-     */
-    public function get_by_info($info)
-    {
-        return parent::get_by_info(str_replace(' ', '_', strtolower($info)));
-    }
-
-
-
-    /**
-     * has
-     *
-     * returns TRUE or FALSE depending on whether the supplied object is within the Collection
-     *
-     * @access public
-     * @param object $object
-     * @return bool
-     */
-    public function has($object)
-    {
-        return parent::has($object);
-    }
-
-
-
-    /**
-     * has_by_name
-     *
-     * returns TRUE or FALSE depending on whether the supplied message_type classname is within the Collection
-     *
-     * @access public
-     * @param string $message_type_name
-     * @return bool
-     */
-    public function has_by_name($message_type_name)
-    {
-        return $this->get_by_info($message_type_name) instanceof $this->interface ? true : false;
-    }
-
-
-
-    /**
-     * remove
-     *
-     * detaches an object from the Collection
-     *
-     * @access public
-     * @param $object
-     * @return bool
-     */
-    public function remove($object)
-    {
-        return parent::remove($object);
-    }
-
-
-
-    /**
-     * set_current
-     *
-     * advances pointer to the provided object
-     *
-     * @access public
-     * @param $object
-     * @return void
-     */
-    public function set_current($object)
-    {
-        parent::set_current($object);
-    }
-
-
-
-    /**
-     * set_current_by_info
-     *
-     * advances pointer to the object whose info matches that which was provided
-     *
-     * @access public
-     * @param $info
-     * @return void
-     */
-    public function set_current_by_info($info)
-    {
-        parent::set_current_by_info($info);
-    }
-
-
-
-    /**
-     * show_collection_classes
-     *
-     * displays list of collection classes if WP_DEBUG is on
-     *
-     * @access public
-     * @return void
-     */
-    public function show_collection_classes()
-    {
-        if (WP_DEBUG) {
-            $this->rewind();
-            while ($this->valid()) {
-                echo '<h5 style="color:#2EA2CC;">' . __CLASS__ . ' class : <span style="color:#E76700">' . $this->getInfo() . '</span></h5>';
-                $this->next();
-            }
-        }
-    }
+	/**
+	 * EE_Message_Type_Collection constructor.
+	 */
+	public function __construct()
+	{
+		$this->interface = 'EE_message_type';
+	}
+
+
+
+	/**
+	 * add
+	 *
+	 * attaches an object to the Collection
+	 * and sets any supplied data associated with the current iterator entry
+	 * by calling EE_Object_Collection::set_info()
+	 *
+	 * @access public
+	 * @param object $object
+	 * @param mixed  $info
+	 * @return bool
+	 */
+	public function add($object, $info = null)
+	{
+		$info = empty($info) && $object instanceof $this->interface ? $object->name : $info;
+		return parent::add($object, $info);
+	}
+
+
+
+	/**
+	 * set_info
+	 *
+	 * Sets the data associated with an object in the Collection
+	 * if no $info is supplied, then the spl_object_hash() is used
+	 *
+	 * @access public
+	 * @param object $object
+	 * @param mixed  $info
+	 * @return bool
+	 */
+	public function set_info($object, $info = null)
+	{
+		$info = empty($info) && $object instanceof $this->interface ? $object->name : $info;
+		return parent::set_info($object, $info);
+	}
+
+
+
+	/**
+	 * get_by_info
+	 *
+	 * finds and returns an object in the Collection based on the info that was set using addObject()
+	 * PLZ NOTE: the pointer is reset to the beginning of the collection before returning
+	 *
+	 * @access public
+	 * @param mixed
+	 * @return null | object
+	 */
+	public function get_by_info($info)
+	{
+		return parent::get_by_info(str_replace(' ', '_', strtolower($info)));
+	}
+
+
+
+	/**
+	 * has
+	 *
+	 * returns TRUE or FALSE depending on whether the supplied object is within the Collection
+	 *
+	 * @access public
+	 * @param object $object
+	 * @return bool
+	 */
+	public function has($object)
+	{
+		return parent::has($object);
+	}
+
+
+
+	/**
+	 * has_by_name
+	 *
+	 * returns TRUE or FALSE depending on whether the supplied message_type classname is within the Collection
+	 *
+	 * @access public
+	 * @param string $message_type_name
+	 * @return bool
+	 */
+	public function has_by_name($message_type_name)
+	{
+		return $this->get_by_info($message_type_name) instanceof $this->interface ? true : false;
+	}
+
+
+
+	/**
+	 * remove
+	 *
+	 * detaches an object from the Collection
+	 *
+	 * @access public
+	 * @param $object
+	 * @return bool
+	 */
+	public function remove($object)
+	{
+		return parent::remove($object);
+	}
+
+
+
+	/**
+	 * set_current
+	 *
+	 * advances pointer to the provided object
+	 *
+	 * @access public
+	 * @param $object
+	 * @return void
+	 */
+	public function set_current($object)
+	{
+		parent::set_current($object);
+	}
+
+
+
+	/**
+	 * set_current_by_info
+	 *
+	 * advances pointer to the object whose info matches that which was provided
+	 *
+	 * @access public
+	 * @param $info
+	 * @return void
+	 */
+	public function set_current_by_info($info)
+	{
+		parent::set_current_by_info($info);
+	}
+
+
+
+	/**
+	 * show_collection_classes
+	 *
+	 * displays list of collection classes if WP_DEBUG is on
+	 *
+	 * @access public
+	 * @return void
+	 */
+	public function show_collection_classes()
+	{
+		if (WP_DEBUG) {
+			$this->rewind();
+			while ($this->valid()) {
+				echo '<h5 style="color:#2EA2CC;">' . __CLASS__ . ' class : <span style="color:#E76700">' . $this->getInfo() . '</span></h5>';
+				$this->next();
+			}
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -173,7 +173,7 @@
         if (WP_DEBUG) {
             $this->rewind();
             while ($this->valid()) {
-                echo '<h5 style="color:#2EA2CC;">' . __CLASS__ . ' class : <span style="color:#E76700">' . $this->getInfo() . '</span></h5>';
+                echo '<h5 style="color:#2EA2CC;">'.__CLASS__.' class : <span style="color:#E76700">'.$this->getInfo().'</span></h5>';
                 $this->next();
             }
         }

core/libraries/messages/defaults/EE_Messages_Template_Pack_Default.class.php

Indentation +63 added lines, -63 removed lines

@@ -11,71 +11,71 @@
 class EE_Messages_Template_Pack_Default extends EE_Messages_Template_Pack
 {
 
-    public function _set_props()
-    {
-        $this->label = __('Default', 'event_espresso');
-        $this->dbref = 'default';
-        $this->description = __('This is the default template pack included with Event Espresso core messages system.', 'event_espresso');
-        $this->_base_url = EE_PLUGIN_DIR_URL . 'core/libraries/messages/defaults/default/';
-        $this->_base_path = EE_LIBRARIES . 'messages/defaults/default/';
-        $this->_supports = array(
-            'email' => array(
-                'cancelled_registration', 'declined_registration', 'not_approved_registration', 'pending_approval', 'registration',
-                    'registration_summary',
-                'payment_declined', 'payment', 'payment_refund', 'payment_reminder'
-                ),
-            'html' => array(
-                'receipt', 'invoice'
-                )
-            );
-        $this->_default_variation_labels= array(
-            'email' => __('Default', 'event_espresso'),
-            'html' =>  __('Simple', 'event_espresso')
-             );
-        $this->_variations = array(
-            'html' => array(
-                'receipt' =>
-                    array(
-                    'bauhaus' => __('Bauhaus', 'event_espresso'),
-                    'ejs' => __('Elliot Jay Stocks', 'event_espresso'),
-                    'horizon' => __('Horizon', 'event_espresso'),
-                    'lola' => __('Lola', 'event_espresso'),
-                    'tranquility' => __('Tranquility', 'event_espresso'),
-                    'union' => __('Union', 'event_espresso'),
-                    ),
-                'invoice' =>
-                    array(
-                    'bauhaus' => __('Bauhaus', 'event_espresso'),
-                    'ejs' => __('Elliot Jay Stocks', 'event_espresso'),
-                    'horizon' => __('Horizon', 'event_espresso'),
-                    'lola' => __('Lola', 'event_espresso'),
-                    'tranquility' => __('Tranquility', 'event_espresso'),
-                    'union' => __('Union', 'event_espresso'),
-                    )
-                )
-            );
-    }
+	public function _set_props()
+	{
+		$this->label = __('Default', 'event_espresso');
+		$this->dbref = 'default';
+		$this->description = __('This is the default template pack included with Event Espresso core messages system.', 'event_espresso');
+		$this->_base_url = EE_PLUGIN_DIR_URL . 'core/libraries/messages/defaults/default/';
+		$this->_base_path = EE_LIBRARIES . 'messages/defaults/default/';
+		$this->_supports = array(
+			'email' => array(
+				'cancelled_registration', 'declined_registration', 'not_approved_registration', 'pending_approval', 'registration',
+					'registration_summary',
+				'payment_declined', 'payment', 'payment_refund', 'payment_reminder'
+				),
+			'html' => array(
+				'receipt', 'invoice'
+				)
+			);
+		$this->_default_variation_labels= array(
+			'email' => __('Default', 'event_espresso'),
+			'html' =>  __('Simple', 'event_espresso')
+			 );
+		$this->_variations = array(
+			'html' => array(
+				'receipt' =>
+					array(
+					'bauhaus' => __('Bauhaus', 'event_espresso'),
+					'ejs' => __('Elliot Jay Stocks', 'event_espresso'),
+					'horizon' => __('Horizon', 'event_espresso'),
+					'lola' => __('Lola', 'event_espresso'),
+					'tranquility' => __('Tranquility', 'event_espresso'),
+					'union' => __('Union', 'event_espresso'),
+					),
+				'invoice' =>
+					array(
+					'bauhaus' => __('Bauhaus', 'event_espresso'),
+					'ejs' => __('Elliot Jay Stocks', 'event_espresso'),
+					'horizon' => __('Horizon', 'event_espresso'),
+					'lola' => __('Lola', 'event_espresso'),
+					'tranquility' => __('Tranquility', 'event_espresso'),
+					'union' => __('Union', 'event_espresso'),
+					)
+				)
+			);
+	}
 
 
 
-    public function get_default_variation($messenger, $message_type, $type, $url, $file_extension)
-    {
-        $base = $url ? $this->_base_url : $this->_base_path;
-        $base_path = $this->_base_path;
-        // possible variation paths considering whether message type is present or not in the file name.
-        $path_string = 'variations/' . $messenger . '_' . $message_type . '_'  . $type . '_default' . $file_extension;
-        $default_path_string = 'variations/' . $messenger . '_' . $type . '_default' . $file_extension;
-        // first see if fully validated file exists.
-        if (is_readable($base_path . $path_string)) {
-            $variation_path = $base . $path_string;
-        // otherwise see if default exists.
-        } elseif (is_readable($base_path . $default_path_string)) {
-            $variation_path = $base . $default_path_string;
-        } else {
-            // no matches found so nothing is present.
-            $variation_path = '';
-        }
+	public function get_default_variation($messenger, $message_type, $type, $url, $file_extension)
+	{
+		$base = $url ? $this->_base_url : $this->_base_path;
+		$base_path = $this->_base_path;
+		// possible variation paths considering whether message type is present or not in the file name.
+		$path_string = 'variations/' . $messenger . '_' . $message_type . '_'  . $type . '_default' . $file_extension;
+		$default_path_string = 'variations/' . $messenger . '_' . $type . '_default' . $file_extension;
+		// first see if fully validated file exists.
+		if (is_readable($base_path . $path_string)) {
+			$variation_path = $base . $path_string;
+		// otherwise see if default exists.
+		} elseif (is_readable($base_path . $default_path_string)) {
+			$variation_path = $base . $default_path_string;
+		} else {
+			// no matches found so nothing is present.
+			$variation_path = '';
+		}
 
-        return $variation_path;
-    }
+		return $variation_path;
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -16,8 +16,8 @@ 
         $this->label = __('Default', 'event_espresso');
         $this->dbref = 'default';
         $this->description = __('This is the default template pack included with Event Espresso core messages system.', 'event_espresso');
-        $this->_base_url = EE_PLUGIN_DIR_URL . 'core/libraries/messages/defaults/default/';
-        $this->_base_path = EE_LIBRARIES . 'messages/defaults/default/';
+        $this->_base_url = EE_PLUGIN_DIR_URL.'core/libraries/messages/defaults/default/';
+        $this->_base_path = EE_LIBRARIES.'messages/defaults/default/';
         $this->_supports = array(
             'email' => array(
                 'cancelled_registration', 'declined_registration', 'not_approved_registration', 'pending_approval', 'registration',
@@ -28,7 +28,7 @@ 
                 'receipt', 'invoice'
                 )
             );
-        $this->_default_variation_labels= array(
+        $this->_default_variation_labels = array(
             'email' => __('Default', 'event_espresso'),
             'html' =>  __('Simple', 'event_espresso')
              );
@@ -63,14 +63,14 @@ 
         $base = $url ? $this->_base_url : $this->_base_path;
         $base_path = $this->_base_path;
         // possible variation paths considering whether message type is present or not in the file name.
-        $path_string = 'variations/' . $messenger . '_' . $message_type . '_'  . $type . '_default' . $file_extension;
-        $default_path_string = 'variations/' . $messenger . '_' . $type . '_default' . $file_extension;
+        $path_string = 'variations/'.$messenger.'_'.$message_type.'_'.$type.'_default'.$file_extension;
+        $default_path_string = 'variations/'.$messenger.'_'.$type.'_default'.$file_extension;
         // first see if fully validated file exists.
-        if (is_readable($base_path . $path_string)) {
-            $variation_path = $base . $path_string;
+        if (is_readable($base_path.$path_string)) {
+            $variation_path = $base.$path_string;
         // otherwise see if default exists.
-        } elseif (is_readable($base_path . $default_path_string)) {
-            $variation_path = $base . $default_path_string;
+        } elseif (is_readable($base_path.$default_path_string)) {
+            $variation_path = $base.$default_path_string;
         } else {
             // no matches found so nothing is present.
             $variation_path = '';

core/libraries/messages/defaults/default/html_receipt_ticket_line_item_no_pms.template.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 <tr class="item">
     <td>[LINE_ITEM_NAME][LINE_ITEM_TAXABLE_*]</td>
     <td colspan="2">[LINE_ITEM_DESCRIPTION]
-        <p class="ticket-note"><?php echo sprintf(__('This ticket can be used once at %s of the dates/times below.', 'event_espresso'), '[TKT_USES_* schema=' . __('any', 'event_espresso') . ']'); ?></p>
+        <p class="ticket-note"><?php echo sprintf(__('This ticket can be used once at %s of the dates/times below.', 'event_espresso'), '[TKT_USES_* schema='.__('any', 'event_espresso').']'); ?></p>
     </td>
     <td class="item_c">[LINE_ITEM_QUANTITY]</td>
     <td class="item_c">[LINE_ITEM_AMOUNT]</td>

core/libraries/messages/defaults/default/html_receipt_event_list.template.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
  */
 ?>
 <h3 class="section-title event-name">
-    <img class="icon" src="<?php echo EE_IMAGES_URL . 'calendar_year-24x24.png'; ?>"><?php _e("Event Name:", "event_espresso") ?>
+    <img class="icon" src="<?php echo EE_IMAGES_URL.'calendar_year-24x24.png'; ?>"><?php _e("Event Name:", "event_espresso") ?>
     <span class="plain-text">[EVENT_NAME]</span>
     <span class="small-text link">( <a href="[EVENT_URL]"><?php _e('view', 'event_espresso'); ?></a> )</span>
 </h3>

core/libraries/messages/defaults/default/html_receipt_ticket_list.template.php

Spacing +3 added lines, -3 removed lines

@@ -22,13 +22,13 @@ 
         <div class="ticket-time-and-place-details">
             <div class="ticket-time-details">
                 <h4 class="sub-section-title no-bottom-margin">
-                    <img class="icon" src="<?php echo EE_IMAGES_URL . 'clock-16x16.png'; ?>"><?php _e('Date/Time:', 'event_espresso'); ?>
+                    <img class="icon" src="<?php echo EE_IMAGES_URL.'clock-16x16.png'; ?>"><?php _e('Date/Time:', 'event_espresso'); ?>
                 </h4>
                 <ul class="event-dates">[DATETIME_LIST]</ul>
             </div>
             <div class="ticket-place-details">
                 <h4 class="sub-section-title no-bottom-margin">
-                    <img class="icon" src="<?php echo EE_IMAGES_URL . 'location-pin-16x16.png'; ?>"><?php _e('Venue', 'event_espresso'); ?>
+                    <img class="icon" src="<?php echo EE_IMAGES_URL.'location-pin-16x16.png'; ?>"><?php _e('Venue', 'event_espresso'); ?>
                 </h4>
                 <ul class="event-venues">
                     <li>[VENUE_TITLE]
@@ -39,7 +39,7 @@ 
         </div>
         <div class="ticket-registrations-area">
             <h4 class="sub-section-title">
-                <img class="icon" src="<?php echo EE_IMAGES_URL . 'users-16x16.png'; ?>"><?php _e("Registration Details", "event_espresso"); ?>
+                <img class="icon" src="<?php echo EE_IMAGES_URL.'users-16x16.png'; ?>"><?php _e("Registration Details", "event_espresso"); ?>
                 <span class="small-text link">( <a class="print_button noPrint" href="[PRIMARY_REGISTRANT_FRONTEND_EDIT_REG_LINK]"><?php _e('edit', 'event_espresso'); ?></a> )</span>
             </h4>
             <ul class="ticket-registrations-list">[ATTENDEE_LIST]</ul>

core/libraries/messages/defaults/default/html_receipt_attendee_list.template.php

Spacing +2 added lines, -2 removed lines

@@ -6,11 +6,11 @@
 <li class="ticket-registration">
     <table class="registration-details">
         <tr class="odd">
-            <th><?php	_e('Attendee', 'event_espresso');?></th>
+            <th><?php	_e('Attendee', 'event_espresso'); ?></th>
             <td>[FNAME] [LNAME] ([ATTENDEE_EMAIL])</td>
         </tr>
         <tr>
-            <th><?php _e("Registration Code:", "event_espresso");?></th>
+            <th><?php _e("Registration Code:", "event_espresso"); ?></th>
             <td>[REGISTRATION_CODE] - <span class="[REGISTRATION_STATUS_ID]">[REGISTRATION_STATUS_LABEL]</span></td>
         </tr>
     </table>