eventespresso / event-espresso-core

core/libraries/plugin_api/db/EEME_Base.lib.php

Indentation +207 added lines, -207 removed lines

@@ -44,211 +44,211 @@
 abstract class EEME_Base
 {
 
-    const extending_method_prefix = 'ext_';
-    const dynamic_callback_method_prefix = 'dynamic_callback_method_';
-
-    protected $_extra_tables = array();
-    protected $_extra_fields = array();
-    protected $_extra_relations = array();
-
-    /**
-     * The model name that is extended (not classname)
-     *
-     * @var string
-     */
-    protected $_model_name_extended = null;
-
-    /**
-     * The model this extends
-     *
-     * @var EEM_Base
-     */
-    protected $_ = null;
-
-
-    /**
-     * @throws \EE_Error
-     */
-    public function __construct()
-    {
-        if (! $this->_model_name_extended) {
-            throw new EE_Error(
-                __(
-                    "When declaring a model extension, you must define its _model_name_extended property. It should be a model name like 'Attendee' or 'Event'",
-                    "event_espresso"
-                )
-            );
-        }
-        $construct_end_action = 'AHEE__EEM_' . $this->_model_name_extended . '__construct__end';
-        if (did_action($construct_end_action)) {
-            throw new EE_Error(
-                sprintf(
-                    __(
-                        "Hooked in model extension '%s' too late! The model %s has already been used! We know because the action %s has been fired",
-                        "event_espresso"
-                    ),
-                    get_class($this),
-                    $this->_model_name_extended,
-                    $construct_end_action
-                )
-            );
-        }
-        add_filter(
-            'FHEE__EEM_' . $this->_model_name_extended . '__construct__tables',
-            array($this, 'add_extra_tables_on_filter')
-        );
-        add_filter(
-            'FHEE__EEM_' . $this->_model_name_extended . '__construct__fields',
-            array($this, 'add_extra_fields_on_filter')
-        );
-        add_filter(
-            'FHEE__EEM_' . $this->_model_name_extended . '__construct__model_relations',
-            array($this, 'add_extra_relations_on_filter')
-        );
-        $this->_register_extending_methods();
-    }
-
-
-    /**
-     * @param array $existing_tables
-     * @return array
-     */
-    public function add_extra_tables_on_filter($existing_tables)
-    {
-        return array_merge((array) $existing_tables, $this->_extra_tables);
-    }
-
-
-    /**
-     * @param array $existing_fields
-     * @return array
-     */
-    public function add_extra_fields_on_filter($existing_fields)
-    {
-        if ($this->_extra_fields) {
-            foreach ($this->_extra_fields as $table_alias => $fields) {
-                if (! isset($existing_fields[ $table_alias ])) {
-                    $existing_fields[ $table_alias ] = array();
-                }
-                $existing_fields[ $table_alias ] = array_merge(
-                    (array) $existing_fields[ $table_alias ],
-                    $this->_extra_fields[ $table_alias ]
-                );
-            }
-        }
-        return $existing_fields;
-    }
-
-
-    /**
-     * @param array $existing_relations
-     * @return array
-     */
-    public function add_extra_relations_on_filter($existing_relations)
-    {
-        return array_merge((array) $existing_relations, $this->_extra_relations);
-    }
-
-
-    /**
-     * scans the child of EEME_Base for functions starting with ext_, and magically makes them functions on the
-     * model extended. (Internally uses filters, and the __call magic method)
-     */
-    protected function _register_extending_methods()
-    {
-        $all_methods = get_class_methods(get_class($this));
-        foreach ($all_methods as $method_name) {
-            if (strpos($method_name, self::extending_method_prefix) === 0) {
-                $method_name_on_model = str_replace(self::extending_method_prefix, '', $method_name);
-                $callback_name = "FHEE__EEM_{$this->_model_name_extended}__$method_name_on_model";
-                add_filter(
-                    $callback_name,
-                    array($this, self::dynamic_callback_method_prefix . $method_name_on_model),
-                    10,
-                    10
-                );
-            }
-        }
-    }
-
-    /**
-     * scans the child of EEME_Base for functions starting with ext_, and magically REMOVES them as functions on the
-     * model extended. (Internally uses filters, and the __call magic method)
-     */
-    public function deregister()
-    {
-        remove_filter(
-            'FHEE__EEM_' . $this->_model_name_extended . '__construct__tables',
-            array($this, 'add_extra_tables_on_filter')
-        );
-        remove_filter(
-            'FHEE__EEM_' . $this->_model_name_extended . '__construct__fields',
-            array($this, 'add_extra_fields_on_filter')
-        );
-        remove_filter(
-            'FHEE__EEM_' . $this->_model_name_extended . '__construct__model_relations',
-            array($this, 'add_extra_relations_on_filter')
-        );
-        $all_methods = get_class_methods(get_class($this));
-        foreach ($all_methods as $method_name) {
-            if (strpos($method_name, self::extending_method_prefix) === 0) {
-                $method_name_on_model = str_replace(self::extending_method_prefix, '', $method_name);
-                $callback_name = "FHEE__EEM_{$this->_model_name_extended}__$method_name_on_model";
-                remove_filter(
-                    $callback_name,
-                    array($this, self::dynamic_callback_method_prefix . $method_name_on_model),
-                    10
-                );
-            }
-        }
-        /** @var EEM_Base $model_to_reset */
-        $model_to_reset = 'EEM_' . $this->_model_name_extended;
-        if (class_exists($model_to_reset)) {
-            $model_to_reset::reset();
-        }
-    }
-
-
-    /**
-     * @param string $callback_method_name
-     * @param array  $args
-     * @return mixed
-     * @throws EE_Error
-     */
-    public function __call($callback_method_name, $args)
-    {
-        if (strpos($callback_method_name, self::dynamic_callback_method_prefix) === 0) {
-            // it's a dynamic callback for a method name
-            $method_called_on_model = str_replace(self::dynamic_callback_method_prefix, '', $callback_method_name);
-            list($original_return_val, $model_called, $args_provided_to_method_on_model) = (array) $args;
-            // phpcs:disable WordPress.WP.I18n.SingleUnderscoreGetTextFunction
-            $this->_ = $model_called;
-            // phpcs:enable
-            $extending_method = self::extending_method_prefix . $method_called_on_model;
-            if (method_exists($this, $extending_method)) {
-                return call_user_func_array(array($this, $extending_method), $args_provided_to_method_on_model);
-            } else {
-                throw new EE_Error(
-                    sprintf(
-                        __(
-                            "An odd error occurred. Model '%s' had a method called on it that it didn't recognize. So it passed it onto the model extension '%s' (because it had a function named '%s' which should be able to handle it), but the function '%s' doesnt exist!)",
-                            "event_espresso"
-                        ),
-                        $this->_model_name_extended,
-                        get_class($this),
-                        $extending_method,
-                        $extending_method
-                    )
-                );
-            }
-        } else {
-            throw new EE_Error(
-                sprintf(
-                    __("There is no method named '%s' on '%s'", "event_espresso"),
-                    $callback_method_name,
-                    get_class($this)
-                )
-            );
-        }
-    }
+	const extending_method_prefix = 'ext_';
+	const dynamic_callback_method_prefix = 'dynamic_callback_method_';
+
+	protected $_extra_tables = array();
+	protected $_extra_fields = array();
+	protected $_extra_relations = array();
+
+	/**
+	 * The model name that is extended (not classname)
+	 *
+	 * @var string
+	 */
+	protected $_model_name_extended = null;
+
+	/**
+	 * The model this extends
+	 *
+	 * @var EEM_Base
+	 */
+	protected $_ = null;
+
+
+	/**
+	 * @throws \EE_Error
+	 */
+	public function __construct()
+	{
+		if (! $this->_model_name_extended) {
+			throw new EE_Error(
+				__(
+					"When declaring a model extension, you must define its _model_name_extended property. It should be a model name like 'Attendee' or 'Event'",
+					"event_espresso"
+				)
+			);
+		}
+		$construct_end_action = 'AHEE__EEM_' . $this->_model_name_extended . '__construct__end';
+		if (did_action($construct_end_action)) {
+			throw new EE_Error(
+				sprintf(
+					__(
+						"Hooked in model extension '%s' too late! The model %s has already been used! We know because the action %s has been fired",
+						"event_espresso"
+					),
+					get_class($this),
+					$this->_model_name_extended,
+					$construct_end_action
+				)
+			);
+		}
+		add_filter(
+			'FHEE__EEM_' . $this->_model_name_extended . '__construct__tables',
+			array($this, 'add_extra_tables_on_filter')
+		);
+		add_filter(
+			'FHEE__EEM_' . $this->_model_name_extended . '__construct__fields',
+			array($this, 'add_extra_fields_on_filter')
+		);
+		add_filter(
+			'FHEE__EEM_' . $this->_model_name_extended . '__construct__model_relations',
+			array($this, 'add_extra_relations_on_filter')
+		);
+		$this->_register_extending_methods();
+	}
+
+
+	/**
+	 * @param array $existing_tables
+	 * @return array
+	 */
+	public function add_extra_tables_on_filter($existing_tables)
+	{
+		return array_merge((array) $existing_tables, $this->_extra_tables);
+	}
+
+
+	/**
+	 * @param array $existing_fields
+	 * @return array
+	 */
+	public function add_extra_fields_on_filter($existing_fields)
+	{
+		if ($this->_extra_fields) {
+			foreach ($this->_extra_fields as $table_alias => $fields) {
+				if (! isset($existing_fields[ $table_alias ])) {
+					$existing_fields[ $table_alias ] = array();
+				}
+				$existing_fields[ $table_alias ] = array_merge(
+					(array) $existing_fields[ $table_alias ],
+					$this->_extra_fields[ $table_alias ]
+				);
+			}
+		}
+		return $existing_fields;
+	}
+
+
+	/**
+	 * @param array $existing_relations
+	 * @return array
+	 */
+	public function add_extra_relations_on_filter($existing_relations)
+	{
+		return array_merge((array) $existing_relations, $this->_extra_relations);
+	}
+
+
+	/**
+	 * scans the child of EEME_Base for functions starting with ext_, and magically makes them functions on the
+	 * model extended. (Internally uses filters, and the __call magic method)
+	 */
+	protected function _register_extending_methods()
+	{
+		$all_methods = get_class_methods(get_class($this));
+		foreach ($all_methods as $method_name) {
+			if (strpos($method_name, self::extending_method_prefix) === 0) {
+				$method_name_on_model = str_replace(self::extending_method_prefix, '', $method_name);
+				$callback_name = "FHEE__EEM_{$this->_model_name_extended}__$method_name_on_model";
+				add_filter(
+					$callback_name,
+					array($this, self::dynamic_callback_method_prefix . $method_name_on_model),
+					10,
+					10
+				);
+			}
+		}
+	}
+
+	/**
+	 * scans the child of EEME_Base for functions starting with ext_, and magically REMOVES them as functions on the
+	 * model extended. (Internally uses filters, and the __call magic method)
+	 */
+	public function deregister()
+	{
+		remove_filter(
+			'FHEE__EEM_' . $this->_model_name_extended . '__construct__tables',
+			array($this, 'add_extra_tables_on_filter')
+		);
+		remove_filter(
+			'FHEE__EEM_' . $this->_model_name_extended . '__construct__fields',
+			array($this, 'add_extra_fields_on_filter')
+		);
+		remove_filter(
+			'FHEE__EEM_' . $this->_model_name_extended . '__construct__model_relations',
+			array($this, 'add_extra_relations_on_filter')
+		);
+		$all_methods = get_class_methods(get_class($this));
+		foreach ($all_methods as $method_name) {
+			if (strpos($method_name, self::extending_method_prefix) === 0) {
+				$method_name_on_model = str_replace(self::extending_method_prefix, '', $method_name);
+				$callback_name = "FHEE__EEM_{$this->_model_name_extended}__$method_name_on_model";
+				remove_filter(
+					$callback_name,
+					array($this, self::dynamic_callback_method_prefix . $method_name_on_model),
+					10
+				);
+			}
+		}
+		/** @var EEM_Base $model_to_reset */
+		$model_to_reset = 'EEM_' . $this->_model_name_extended;
+		if (class_exists($model_to_reset)) {
+			$model_to_reset::reset();
+		}
+	}
+
+
+	/**
+	 * @param string $callback_method_name
+	 * @param array  $args
+	 * @return mixed
+	 * @throws EE_Error
+	 */
+	public function __call($callback_method_name, $args)
+	{
+		if (strpos($callback_method_name, self::dynamic_callback_method_prefix) === 0) {
+			// it's a dynamic callback for a method name
+			$method_called_on_model = str_replace(self::dynamic_callback_method_prefix, '', $callback_method_name);
+			list($original_return_val, $model_called, $args_provided_to_method_on_model) = (array) $args;
+			// phpcs:disable WordPress.WP.I18n.SingleUnderscoreGetTextFunction
+			$this->_ = $model_called;
+			// phpcs:enable
+			$extending_method = self::extending_method_prefix . $method_called_on_model;
+			if (method_exists($this, $extending_method)) {
+				return call_user_func_array(array($this, $extending_method), $args_provided_to_method_on_model);
+			} else {
+				throw new EE_Error(
+					sprintf(
+						__(
+							"An odd error occurred. Model '%s' had a method called on it that it didn't recognize. So it passed it onto the model extension '%s' (because it had a function named '%s' which should be able to handle it), but the function '%s' doesnt exist!)",
+							"event_espresso"
+						),
+						$this->_model_name_extended,
+						get_class($this),
+						$extending_method,
+						$extending_method
+					)
+				);
+			}
+		} else {
+			throw new EE_Error(
+				sprintf(
+					__("There is no method named '%s' on '%s'", "event_espresso"),
+					$callback_method_name,
+					get_class($this)
+				)
+			);
+		}
+	}
 }

Spacing +17 added lines, -17 removed lines

@@ -71,7 +71,7 @@ 
      */
     public function __construct()
     {
-        if (! $this->_model_name_extended) {
+        if ( ! $this->_model_name_extended) {
             throw new EE_Error(
                 __(
                     "When declaring a model extension, you must define its _model_name_extended property. It should be a model name like 'Attendee' or 'Event'",
@@ -79,7 +79,7 @@ 
                 )
             );
         }
-        $construct_end_action = 'AHEE__EEM_' . $this->_model_name_extended . '__construct__end';
+        $construct_end_action = 'AHEE__EEM_'.$this->_model_name_extended.'__construct__end';
         if (did_action($construct_end_action)) {
             throw new EE_Error(
                 sprintf(
@@ -94,15 +94,15 @@ 
             );
         }
         add_filter(
-            'FHEE__EEM_' . $this->_model_name_extended . '__construct__tables',
+            'FHEE__EEM_'.$this->_model_name_extended.'__construct__tables',
             array($this, 'add_extra_tables_on_filter')
         );
         add_filter(
-            'FHEE__EEM_' . $this->_model_name_extended . '__construct__fields',
+            'FHEE__EEM_'.$this->_model_name_extended.'__construct__fields',
             array($this, 'add_extra_fields_on_filter')
         );
         add_filter(
-            'FHEE__EEM_' . $this->_model_name_extended . '__construct__model_relations',
+            'FHEE__EEM_'.$this->_model_name_extended.'__construct__model_relations',
             array($this, 'add_extra_relations_on_filter')
         );
         $this->_register_extending_methods();
@@ -127,12 +127,12 @@ 
     {
         if ($this->_extra_fields) {
             foreach ($this->_extra_fields as $table_alias => $fields) {
-                if (! isset($existing_fields[ $table_alias ])) {
-                    $existing_fields[ $table_alias ] = array();
+                if ( ! isset($existing_fields[$table_alias])) {
+                    $existing_fields[$table_alias] = array();
                 }
-                $existing_fields[ $table_alias ] = array_merge(
-                    (array) $existing_fields[ $table_alias ],
-                    $this->_extra_fields[ $table_alias ]
+                $existing_fields[$table_alias] = array_merge(
+                    (array) $existing_fields[$table_alias],
+                    $this->_extra_fields[$table_alias]
                 );
             }
         }
@@ -163,7 +163,7 @@ 
                 $callback_name = "FHEE__EEM_{$this->_model_name_extended}__$method_name_on_model";
                 add_filter(
                     $callback_name,
-                    array($this, self::dynamic_callback_method_prefix . $method_name_on_model),
+                    array($this, self::dynamic_callback_method_prefix.$method_name_on_model),
                     10,
                     10
                 );
@@ -178,15 +178,15 @@ 
     public function deregister()
     {
         remove_filter(
-            'FHEE__EEM_' . $this->_model_name_extended . '__construct__tables',
+            'FHEE__EEM_'.$this->_model_name_extended.'__construct__tables',
             array($this, 'add_extra_tables_on_filter')
         );
         remove_filter(
-            'FHEE__EEM_' . $this->_model_name_extended . '__construct__fields',
+            'FHEE__EEM_'.$this->_model_name_extended.'__construct__fields',
             array($this, 'add_extra_fields_on_filter')
         );
         remove_filter(
-            'FHEE__EEM_' . $this->_model_name_extended . '__construct__model_relations',
+            'FHEE__EEM_'.$this->_model_name_extended.'__construct__model_relations',
             array($this, 'add_extra_relations_on_filter')
         );
         $all_methods = get_class_methods(get_class($this));
@@ -196,13 +196,13 @@ 
                 $callback_name = "FHEE__EEM_{$this->_model_name_extended}__$method_name_on_model";
                 remove_filter(
                     $callback_name,
-                    array($this, self::dynamic_callback_method_prefix . $method_name_on_model),
+                    array($this, self::dynamic_callback_method_prefix.$method_name_on_model),
                     10
                 );
             }
         }
         /** @var EEM_Base $model_to_reset */
-        $model_to_reset = 'EEM_' . $this->_model_name_extended;
+        $model_to_reset = 'EEM_'.$this->_model_name_extended;
         if (class_exists($model_to_reset)) {
             $model_to_reset::reset();
         }
@@ -224,7 +224,7 @@ 
             // phpcs:disable WordPress.WP.I18n.SingleUnderscoreGetTextFunction
             $this->_ = $model_called;
             // phpcs:enable
-            $extending_method = self::extending_method_prefix . $method_called_on_model;
+            $extending_method = self::extending_method_prefix.$method_called_on_model;
             if (method_exists($this, $extending_method)) {
                 return call_user_func_array(array($this, $extending_method), $args_provided_to_method_on_model);
             } else {

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

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);
         }
 

Indentation +226 added lines, -226 removed lines

@@ -12,257 +12,257 @@
 {
 
 
-    /**
-     *    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();
+	}
 }

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/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_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>

core/libraries/messages/defaults/EE_Messages_Template_Defaults.lib.php

Spacing +6 added lines, -6 removed lines

@@ -113,9 +113,9 @@ 
         // get the corresponding template pack object (if present.  If not then we just load the default and add a
         // notice).  The class name should be something like 'EE_Messages_Template_Pack_Default' where "default' would be
         // the incoming template pack reference.
-        $class_name = 'EE_Messages_Template_Pack_' . str_replace(' ', '_', ucwords(str_replace('_', ' ', $template_pack)));
+        $class_name = 'EE_Messages_Template_Pack_'.str_replace(' ', '_', ucwords(str_replace('_', ' ', $template_pack)));
 
-        if (! class_exists($class_name)) {
+        if ( ! class_exists($class_name)) {
             EE_Error::add_error(
                 sprintf(
                     __(
@@ -160,7 +160,7 @@ 
     {
         $template_pack = 'default';
         // if we have the GRP_ID then let's use that to see if there is a set template pack and use that for the new templates.
-        if (! empty($this->_GRP_ID)) {
+        if ( ! empty($this->_GRP_ID)) {
             $message_template_group = $this->_message_template_group_model->get_one_by_ID($this->_GRP_ID);
             $template_pack = $message_template_group instanceof EE_Message_Template_Group
                 ? $message_template_group->get_template_pack_name()
@@ -206,17 +206,17 @@ 
             $this->_GRP_ID = $grp_id;
         }
 
-        $template_data = array( 'GRP_ID' => $this->_GRP_ID );
+        $template_data = array('GRP_ID' => $this->_GRP_ID);
 
         foreach ($this->_contexts as $context => $details) {
             foreach ($this->_fields as $field => $field_type) {
                 if ($field != 'extra') {
                     $template_data['MTP_context'] = $context;
                     $template_data['MTP_template_field'] = $field;
-                    $template_data['MTP_content'] = $this->_templates[ $context ][ $field ];
+                    $template_data['MTP_content'] = $this->_templates[$context][$field];
 
                     $MTP = $this->_message_template_model->insert($template_data);
-                    if (! $MTP) {
+                    if ( ! $MTP) {
                         EE_Error::add_error(
                             sprintf(
                                 __(

Indentation +228 added lines, -228 removed lines

@@ -15,232 +15,232 @@
 {
 
 
-    /**
-     * Used for holding the EE_Message_Template GRP_ID field value.
-     * @var [type]
-     */
-    protected $_GRP_ID;
-
-    /**
-     * holds the messenger object
-     *
-     * @var EE_messenger
-     */
-    protected $_messenger;
-
-    /**
-     * holds the message type object
-     *
-     * @var EE_message_type
-     */
-    protected $_message_type;
-
-    /**
-     * holds the fields used (this is retrieved from the messenger)
-     *
-     * @var array
-     */
-    protected $_fields;
-
-    /**
-     * holds the assembled template (with defaults) for creation in the database
-     *
-     * @var array
-     */
-    protected $_templates;
-
-    /**
-     * holds the contexts used (this is retrieved from the message type)
-     *
-     * @var array
-     */
-    protected $_contexts;
-
-
-    /**
-     *  @var EEM_Message_Template_Group
-     */
-    protected $_message_template_group_model;
-
-
-    /**
-     * @var EEM_Message_Template
-     */
-    protected $_message_template_model;
-
-
-    /**
-     * EE_Messages_Template_Defaults constructor.
-     *
-     * @param EE_messenger               $messenger
-     * @param EE_message_type            $message_type
-     * @param int                        $GRP_ID                      Optional.  If included then we're just regenerating
-     *                                                                the template fields for the given group not the
-     *                                                                message template group itself
-     * @param EEM_Message_Template_Group $message_template_group_model
-     * @param EEM_Message_Template       $message_template_model
-     * @throws EE_Error
-     */
-    public function __construct(
-        EE_messenger $messenger,
-        EE_message_type $message_type,
-        $GRP_ID = 0,
-        EEM_Message_Template_Group $message_template_group_model,
-        EEM_Message_Template $message_template_model
-    ) {
-        $this->_messenger = $messenger;
-        $this->_message_type = $message_type;
-        $this->_GRP_ID = $GRP_ID;
-        // set the model object
-        $this->_message_template_group_model = $message_template_group_model;
-        $this->_message_template_model = $message_template_model;
-        $this->_fields = $this->_messenger->get_template_fields();
-        $this->_contexts = $this->_message_type->get_contexts();
-    }
-
-
-    /**
-     * Setup the _template_data property.
-     * This method sets the _templates property array before templates are created.
-     *
-     * @param string $template_pack This corresponds to a template pack class reference which will contain information
-     *                              about where to obtain the templates.
-     *
-     */
-    final private function _set_templates($template_pack)
-    {
-
-        // get the corresponding template pack object (if present.  If not then we just load the default and add a
-        // notice).  The class name should be something like 'EE_Messages_Template_Pack_Default' where "default' would be
-        // the incoming template pack reference.
-        $class_name = 'EE_Messages_Template_Pack_' . str_replace(' ', '_', ucwords(str_replace('_', ' ', $template_pack)));
-
-        if (! class_exists($class_name)) {
-            EE_Error::add_error(
-                sprintf(
-                    __(
-                        'The template pack represented by a class corresponding to "%1$s" does not exist. Likely the autoloader for this class has the wrong path or the incoming reference is misspelled. The default template pack has been used to generate the templates instead.',
-                        'event_espresso'
-                    ),
-                    $class_name
-                ),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-            $class_name = 'EE_Messages_Template_Pack_Default';
-        }
-        /** @type EE_Messages_Template_Pack $template_pack */
-        $template_pack = new $class_name();
-
-        // get all the templates from the template pack.
-        $this->_templates = $template_pack->get_templates($this->_messenger, $this->_message_type);
-    }
-
-
-    /**
-     * Return the contexts for the message type as cached on this instance.
-     * @return array
-     */
-    public function get_contexts()
-    {
-        return $this->_contexts;
-    }
-
-
-
-
-
-    /**
-     * public facing create new templates method
-     *
-     * @return mixed (array|bool)            success array or false.
-     */
-    public function create_new_templates()
-    {
-        $template_pack = 'default';
-        // if we have the GRP_ID then let's use that to see if there is a set template pack and use that for the new templates.
-        if (! empty($this->_GRP_ID)) {
-            $message_template_group = $this->_message_template_group_model->get_one_by_ID($this->_GRP_ID);
-            $template_pack = $message_template_group instanceof EE_Message_Template_Group
-                ? $message_template_group->get_template_pack_name()
-                : 'default';
-            // we also need to reset the template variation to default
-            $message_template_group->set_template_pack_variation('default');
-        }
-        return $this->_create_new_templates($template_pack);
-    }
-
-
-
-
-
-    /**
-     *  Handles creating new default templates.
-     *
-     * @param string $template_pack This corresponds to a template pack class reference
-     *                              which will contain information about where to obtain the templates.
-     * @return mixed (array|bool)   success array or false.
-     */
-    protected function _create_new_templates($template_pack)
-    {
-
-        $this->_set_templates($template_pack);
-
-        // necessary properties are set, let's save the default templates
-        if (empty($this->_GRP_ID)) {
-            $main_template_data = array(
-                'MTP_messenger'    => $this->_messenger->name,
-                'MTP_message_type' => $this->_message_type->name,
-                'MTP_is_override'  => 0,
-                'MTP_deleted'      => 0,
-                'MTP_is_global'    => 1,
-                'MTP_user_id'      => EEH_Activation::get_default_creator_id(),
-                'MTP_is_active'    => 1,
-            );
-            // let's insert the above and get our GRP_ID, then reset the template data array to just include the GRP_ID
-            $grp_id = $this->_message_template_group_model->insert($main_template_data);
-            if (empty($grp_id)) {
-                return $grp_id;
-            }
-            $this->_GRP_ID = $grp_id;
-        }
-
-        $template_data = array( 'GRP_ID' => $this->_GRP_ID );
-
-        foreach ($this->_contexts as $context => $details) {
-            foreach ($this->_fields as $field => $field_type) {
-                if ($field != 'extra') {
-                    $template_data['MTP_context'] = $context;
-                    $template_data['MTP_template_field'] = $field;
-                    $template_data['MTP_content'] = $this->_templates[ $context ][ $field ];
-
-                    $MTP = $this->_message_template_model->insert($template_data);
-                    if (! $MTP) {
-                        EE_Error::add_error(
-                            sprintf(
-                                __(
-                                    'There was an error in saving new template data for %1$s messenger, %2$s message type, %3$s context and %4$s template field.',
-                                    'event_espresso'
-                                ),
-                                $this->_messenger->name,
-                                $this->_message_type->name,
-                                $context,
-                                $field
-                            ),
-                            __FILE__,
-                            __FUNCTION__,
-                            __LINE__
-                        );
-                        return false;
-                    }
-                }
-            }
-        }
-
-        return array(
-            'GRP_ID'      => $this->_GRP_ID,
-            'MTP_context' => key($this->_contexts)
-        );
-    }
+	/**
+	 * Used for holding the EE_Message_Template GRP_ID field value.
+	 * @var [type]
+	 */
+	protected $_GRP_ID;
+
+	/**
+	 * holds the messenger object
+	 *
+	 * @var EE_messenger
+	 */
+	protected $_messenger;
+
+	/**
+	 * holds the message type object
+	 *
+	 * @var EE_message_type
+	 */
+	protected $_message_type;
+
+	/**
+	 * holds the fields used (this is retrieved from the messenger)
+	 *
+	 * @var array
+	 */
+	protected $_fields;
+
+	/**
+	 * holds the assembled template (with defaults) for creation in the database
+	 *
+	 * @var array
+	 */
+	protected $_templates;
+
+	/**
+	 * holds the contexts used (this is retrieved from the message type)
+	 *
+	 * @var array
+	 */
+	protected $_contexts;
+
+
+	/**
+	 *  @var EEM_Message_Template_Group
+	 */
+	protected $_message_template_group_model;
+
+
+	/**
+	 * @var EEM_Message_Template
+	 */
+	protected $_message_template_model;
+
+
+	/**
+	 * EE_Messages_Template_Defaults constructor.
+	 *
+	 * @param EE_messenger               $messenger
+	 * @param EE_message_type            $message_type
+	 * @param int                        $GRP_ID                      Optional.  If included then we're just regenerating
+	 *                                                                the template fields for the given group not the
+	 *                                                                message template group itself
+	 * @param EEM_Message_Template_Group $message_template_group_model
+	 * @param EEM_Message_Template       $message_template_model
+	 * @throws EE_Error
+	 */
+	public function __construct(
+		EE_messenger $messenger,
+		EE_message_type $message_type,
+		$GRP_ID = 0,
+		EEM_Message_Template_Group $message_template_group_model,
+		EEM_Message_Template $message_template_model
+	) {
+		$this->_messenger = $messenger;
+		$this->_message_type = $message_type;
+		$this->_GRP_ID = $GRP_ID;
+		// set the model object
+		$this->_message_template_group_model = $message_template_group_model;
+		$this->_message_template_model = $message_template_model;
+		$this->_fields = $this->_messenger->get_template_fields();
+		$this->_contexts = $this->_message_type->get_contexts();
+	}
+
+
+	/**
+	 * Setup the _template_data property.
+	 * This method sets the _templates property array before templates are created.
+	 *
+	 * @param string $template_pack This corresponds to a template pack class reference which will contain information
+	 *                              about where to obtain the templates.
+	 *
+	 */
+	final private function _set_templates($template_pack)
+	{
+
+		// get the corresponding template pack object (if present.  If not then we just load the default and add a
+		// notice).  The class name should be something like 'EE_Messages_Template_Pack_Default' where "default' would be
+		// the incoming template pack reference.
+		$class_name = 'EE_Messages_Template_Pack_' . str_replace(' ', '_', ucwords(str_replace('_', ' ', $template_pack)));
+
+		if (! class_exists($class_name)) {
+			EE_Error::add_error(
+				sprintf(
+					__(
+						'The template pack represented by a class corresponding to "%1$s" does not exist. Likely the autoloader for this class has the wrong path or the incoming reference is misspelled. The default template pack has been used to generate the templates instead.',
+						'event_espresso'
+					),
+					$class_name
+				),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+			$class_name = 'EE_Messages_Template_Pack_Default';
+		}
+		/** @type EE_Messages_Template_Pack $template_pack */
+		$template_pack = new $class_name();
+
+		// get all the templates from the template pack.
+		$this->_templates = $template_pack->get_templates($this->_messenger, $this->_message_type);
+	}
+
+
+	/**
+	 * Return the contexts for the message type as cached on this instance.
+	 * @return array
+	 */
+	public function get_contexts()
+	{
+		return $this->_contexts;
+	}
+
+
+
+
+
+	/**
+	 * public facing create new templates method
+	 *
+	 * @return mixed (array|bool)            success array or false.
+	 */
+	public function create_new_templates()
+	{
+		$template_pack = 'default';
+		// if we have the GRP_ID then let's use that to see if there is a set template pack and use that for the new templates.
+		if (! empty($this->_GRP_ID)) {
+			$message_template_group = $this->_message_template_group_model->get_one_by_ID($this->_GRP_ID);
+			$template_pack = $message_template_group instanceof EE_Message_Template_Group
+				? $message_template_group->get_template_pack_name()
+				: 'default';
+			// we also need to reset the template variation to default
+			$message_template_group->set_template_pack_variation('default');
+		}
+		return $this->_create_new_templates($template_pack);
+	}
+
+
+
+
+
+	/**
+	 *  Handles creating new default templates.
+	 *
+	 * @param string $template_pack This corresponds to a template pack class reference
+	 *                              which will contain information about where to obtain the templates.
+	 * @return mixed (array|bool)   success array or false.
+	 */
+	protected function _create_new_templates($template_pack)
+	{
+
+		$this->_set_templates($template_pack);
+
+		// necessary properties are set, let's save the default templates
+		if (empty($this->_GRP_ID)) {
+			$main_template_data = array(
+				'MTP_messenger'    => $this->_messenger->name,
+				'MTP_message_type' => $this->_message_type->name,
+				'MTP_is_override'  => 0,
+				'MTP_deleted'      => 0,
+				'MTP_is_global'    => 1,
+				'MTP_user_id'      => EEH_Activation::get_default_creator_id(),
+				'MTP_is_active'    => 1,
+			);
+			// let's insert the above and get our GRP_ID, then reset the template data array to just include the GRP_ID
+			$grp_id = $this->_message_template_group_model->insert($main_template_data);
+			if (empty($grp_id)) {
+				return $grp_id;
+			}
+			$this->_GRP_ID = $grp_id;
+		}
+
+		$template_data = array( 'GRP_ID' => $this->_GRP_ID );
+
+		foreach ($this->_contexts as $context => $details) {
+			foreach ($this->_fields as $field => $field_type) {
+				if ($field != 'extra') {
+					$template_data['MTP_context'] = $context;
+					$template_data['MTP_template_field'] = $field;
+					$template_data['MTP_content'] = $this->_templates[ $context ][ $field ];
+
+					$MTP = $this->_message_template_model->insert($template_data);
+					if (! $MTP) {
+						EE_Error::add_error(
+							sprintf(
+								__(
+									'There was an error in saving new template data for %1$s messenger, %2$s message type, %3$s context and %4$s template field.',
+									'event_espresso'
+								),
+								$this->_messenger->name,
+								$this->_message_type->name,
+								$context,
+								$field
+							),
+							__FILE__,
+							__FUNCTION__,
+							__LINE__
+						);
+						return false;
+					}
+				}
+			}
+		}
+
+		return array(
+			'GRP_ID'      => $this->_GRP_ID,
+			'MTP_context' => key($this->_contexts)
+		);
+	}
 }

core/libraries/messages/EE_Messages_Template_Pack_Collection.lib.php

Indentation +14 added lines, -14 removed lines

@@ -11,19 +11,19 @@
 {
 
 
-    public function __construct()
-    {
-        $this->interface = 'EE_Messages_Template_Pack';
-    }
+	public function __construct()
+	{
+		$this->interface = 'EE_Messages_Template_Pack';
+	}
 
-    public function get_by_name($template_pack_name)
-    {
-        $this->rewind();
-        while ($this->valid()) {
-            if ($this->current()->dbref == $template_pack_name) {
-                return $this->current();
-            }
-            $this->next();
-        }
-    }
+	public function get_by_name($template_pack_name)
+	{
+		$this->rewind();
+		while ($this->valid()) {
+			if ($this->current()->dbref == $template_pack_name) {
+				return $this->current();
+			}
+			$this->next();
+		}
+	}
 }