From 3cb31c2616e139128d3007204c4bd26510fe0eeb Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Fri, 1 Mar 2013 22:59:38 +0200
Subject: [PATCH] Code fix

---
 admin/themes/default/index.template.php |   2 +-
 engine/Monstra.php                      |   2 +-
 engine/Plugin/Navigation.php            |  10 +-
 libraries/Idiorm/ORM.php                | 604 ++++++++++++++++--------
 libraries/PHPMailer/PHPMailer.php       | 474 ++++++++++++-------
 5 files changed, 711 insertions(+), 381 deletions(-)

diff --git a/admin/themes/default/index.template.php b/admin/themes/default/index.template.php
index d960052..a798925 100644
--- a/admin/themes/default/index.template.php
+++ b/admin/themes/default/index.template.php
@@ -55,7 +55,7 @@
 
                 <div class="hidden-desktop">
                     <select class="input-block-level" name="sections" id="sections">
-                        <?php                           
+                        <?php
                             Navigation::getDropdown('content');
                             Navigation::getDropdown('extends');
                             Navigation::getDropdown('system');
diff --git a/engine/Monstra.php b/engine/Monstra.php
index fd9ce39..a48a25e 100644
--- a/engine/Monstra.php
+++ b/engine/Monstra.php
@@ -39,7 +39,7 @@ class Monstra
     /**
      * The version of Monstra
      */
-    const VERSION = '2.2.0 DEV';
+    const VERSION = '2.2.0';
 
     /**
      * Monstra environment
diff --git a/engine/Plugin/Navigation.php b/engine/Plugin/Navigation.php
index c46ca57..fb9f157 100644
--- a/engine/Plugin/Navigation.php
+++ b/engine/Plugin/Navigation.php
@@ -121,8 +121,8 @@ class Navigation
      * @param string  $category Category
      * @param integer $type     Type. Default is LEFT
      */
-    public static function get($category, $type = Navigation::LEFT) {
-        
+    public static function get($category, $type = Navigation::LEFT)
+    {
         // Sort items by priority
         $items = Arr::subvalSort(Navigation::$items, 'priority');
 
@@ -168,10 +168,10 @@ class Navigation
      *      Navigation::getDropdown('content');
      *  <code>
      *
-     * @param string  $category Category
+     * @param string $category Category
      */
-    public static function getDropdown($category) {
-
+    public static function getDropdown($category)
+    {
         // Sort items by priority
         $items = Arr::subvalSort(Navigation::$items, 'priority');
 
diff --git a/libraries/Idiorm/ORM.php b/libraries/Idiorm/ORM.php
index c6d0570..39b5652 100644
--- a/libraries/Idiorm/ORM.php
+++ b/libraries/Idiorm/ORM.php
@@ -38,8 +38,8 @@
      *
      */
 
-    class ORM implements ArrayAccess {
-
+    class ORM implements ArrayAccess
+    {
         // ----------------------- //
         // --- CLASS CONSTANTS --- //
         // ----------------------- //
@@ -176,7 +176,8 @@
          * @param mixed $value
          * @param string $connection_name Which connection to use
          */
-        public static function configure($key, $value = null, $connection_name = self::DEFAULT_CONNECTION) {
+        public static function configure($key, $value = null, $connection_name = self::DEFAULT_CONNECTION)
+        {
             self::_setup_db_config($connection_name); //ensures at least default config is set
 
             if (is_array($key)) {
@@ -187,7 +188,7 @@
                 }
             } else {
                 if (is_null($value)) {
-                    // Shortcut: If only one string argument is passed, 
+                    // Shortcut: If only one string argument is passed,
                     // assume it's a connection string
                     $value = $key;
                     $key = 'connection_string';
@@ -206,8 +207,10 @@
          * @param string $connection_name Which connection to use
          * @return ORM
          */
-        public static function for_table($table_name, $connection_name = self::DEFAULT_CONNECTION) {
+        public static function for_table($table_name, $connection_name = self::DEFAULT_CONNECTION)
+        {
             self::_setup_db($connection_name);
+
             return new self($table_name, array(), $connection_name);
         }
 
@@ -215,7 +218,8 @@
          * Set up the database connection used by the class
          * @param string $connection_name Which connection to use
          */
-        protected static function _setup_db($connection_name = self::DEFAULT_CONNECTION) {
+        protected static function _setup_db($connection_name = self::DEFAULT_CONNECTION)
+        {
             if (!array_key_exists($connection_name, self::$_db) ||
                 !is_object(self::$_db[$connection_name])) {
                 self::_setup_db_config($connection_name);
@@ -236,7 +240,8 @@
         * Ensures configuration (mulitple connections) is at least set to default.
         * @param string $connection_name Which connection to use
         */
-        protected static function _setup_db_config($connection_name) {
+        protected static function _setup_db_config($connection_name)
+        {
             if (!array_key_exists($connection_name, self::$_config)) {
                 self::$_config[$connection_name] = self::$_default_config;
             }
@@ -250,7 +255,8 @@
          * @param ORM $db
          * @param string $connection_name Which connection to use
          */
-        public static function set_db($db, $connection_name = self::DEFAULT_CONNECTION) {
+        public static function set_db($db, $connection_name = self::DEFAULT_CONNECTION)
+        {
             self::_setup_db_config($connection_name);
             self::$_db[$connection_name] = $db;
             self::_setup_identifier_quote_character($connection_name);
@@ -263,7 +269,8 @@
          * this will do nothing.
          * @param string $connection_name Which connection to use
          */
-        protected static function _setup_identifier_quote_character($connection_name) {
+        protected static function _setup_identifier_quote_character($connection_name)
+        {
             if (is_null(self::$_config[$connection_name]['identifier_quote_character'])) {
                 self::$_config[$connection_name]['identifier_quote_character'] =
                      self::_detect_identifier_quote_character($connection_name);
@@ -276,8 +283,9 @@
          * @param string $connection_name Which connection to use
          * @return string
          */
-        protected static function _detect_identifier_quote_character($connection_name) {
-            switch(self::$_db[$connection_name]->getAttribute(PDO::ATTR_DRIVER_NAME)) {
+        protected static function _detect_identifier_quote_character($connection_name)
+        {
+            switch (self::$_db[$connection_name]->getAttribute(PDO::ATTR_DRIVER_NAME)) {
                 case 'pgsql':
                 case 'sqlsrv':
                 case 'dblib':
@@ -301,8 +309,10 @@
          * @param string $connection_name Which connection to use
          * @return ORM
          */
-        public static function get_db($connection_name = self::DEFAULT_CONNECTION) {
+        public static function get_db($connection_name = self::DEFAULT_CONNECTION)
+        {
             self::_setup_db($connection_name); // required in case this is called before Idiorm is instantiated
+
             return self::$_db[$connection_name];
         }
 
@@ -317,8 +327,10 @@
          * @param string $connection_name Which connection to use
          * @return bool Success
          */
-        public static function raw_execute($query, $parameters = array(), $connection_name = self::DEFAULT_CONNECTION) {
+        public static function raw_execute($query, $parameters = array(), $connection_name = self::DEFAULT_CONNECTION)
+        {
             self::_setup_db($connection_name);
+
             return self::_execute($query, $parameters, $connection_name);
         }
 
@@ -327,7 +339,8 @@
          * Useful for access to PDOStatement::rowCount() or error information
          * @return PDOStatement
          */
-        public static function get_last_statement() {
+        public static function get_last_statement()
+        {
             return self::$_last_statement;
         }
 
@@ -340,7 +353,8 @@
         * @param string $connection_name Which connection to use
         * @return bool Response of PDOStatement::execute()
         */
-        protected static function _execute($query, $parameters = array(), $connection_name = self::DEFAULT_CONNECTION) {
+        protected static function _execute($query, $parameters = array(), $connection_name = self::DEFAULT_CONNECTION)
+        {
             self::_log_query($query, $parameters, $connection_name);
             $statement = self::$_db[$connection_name]->prepare($query);
 
@@ -362,7 +376,8 @@
          * @param string $connection_name Which connection to use
          * @return bool
          */
-        protected static function _log_query($query, $parameters, $connection_name) {
+        protected static function _log_query($query, $parameters, $connection_name)
+        {
             // If logging is not enabled, do nothing
             if (!self::$_config[$connection_name]['logging']) {
                 return false;
@@ -380,7 +395,7 @@
                 $query = str_replace("%", "%%", $query);
 
                 // Replace placeholders in the query for vsprintf
-                if(false !== strpos($query, "'") || false !== strpos($query, '"')) {
+                if (false !== strpos($query, "'") || false !== strpos($query, '"')) {
                     $query = IdiormString::str_replace_outside_quotes("?", "%s", $query);
                 } else {
                     $query = str_replace("?", "%s", $query);
@@ -394,6 +409,7 @@
 
             self::$_last_query = $bound_query;
             self::$_query_log[$connection_name][] = $bound_query;
+
             return true;
         }
 
@@ -405,7 +421,8 @@
          * @param null|string $connection_name Which connection to use
          * @return string
          */
-        public static function get_last_query($connection_name = null) {
+        public static function get_last_query($connection_name = null)
+        {
             if ($connection_name === null) {
                 return self::$_last_query;
             }
@@ -423,10 +440,12 @@
          * set to true. Otherwise, returned array will be empty.
          * @param string $connection_name Which connection to use
          */
-        public static function get_query_log($connection_name = self::DEFAULT_CONNECTION) {
+        public static function get_query_log($connection_name = self::DEFAULT_CONNECTION)
+        {
             if (isset(self::$_query_log[$connection_name])) {
                 return self::$_query_log[$connection_name];
             }
+
             return array();
         }
 
@@ -434,7 +453,8 @@
          * Get a list of the available connection names
          * @return array
          */
-        public static function get_connection_names() {
+        public static function get_connection_names()
+        {
             return array_keys(self::$_db);
         }
 
@@ -446,7 +466,8 @@
          * "Private" constructor; shouldn't be called directly.
          * Use the ORM::for_table factory method instead.
          */
-        protected function __construct($table_name, $data = array(), $connection_name = self::DEFAULT_CONNECTION) {
+        protected function __construct($table_name, $data = array(), $connection_name = self::DEFAULT_CONNECTION)
+        {
             $this->_table_name = $table_name;
             $this->_data = $data;
 
@@ -462,11 +483,13 @@
          * dirty so all will be saved to the database when
          * save() is called.
          */
-        public function create($data=null) {
+        public function create($data=null)
+        {
             $this->_is_new = true;
             if (!is_null($data)) {
                 return $this->hydrate($data)->force_all_dirty();
             }
+
             return $this;
         }
 
@@ -478,8 +501,10 @@
          * not normally be used in manually built queries. If you don't know why
          * you would want to use this, you should probably just ignore it.
          */
-        public function use_id_column($id_column) {
+        public function use_id_column($id_column)
+        {
             $this->_instance_id_column = $id_column;
+
             return $this;
         }
 
@@ -487,10 +512,12 @@
          * Create an ORM instance from the given row (an associative
          * array of data fetched from the database)
          */
-        protected function _create_instance_from_row($row) {
+        protected function _create_instance_from_row($row)
+        {
             $instance = self::for_table($this->_table_name, $this->_connection_name);
             $instance->use_id_column($this->_instance_id_column);
             $instance->hydrate($row);
+
             return $instance;
         }
 
@@ -503,7 +530,8 @@
          * to this method. This will perform a primary key
          * lookup on the table.
          */
-        public function find_one($id=null) {
+        public function find_one($id=null)
+        {
             if (!is_null($id)) {
                 $this->where_id_is($id);
             }
@@ -524,10 +552,12 @@
          * no rows were returned.
          * @return array|\IdiormResultSet
          */
-        public function find_many() {
-            if(self::$_config[$this->_connection_name]['return_result_sets']) {
+        public function find_many()
+        {
+            if (self::$_config[$this->_connection_name]['return_result_sets']) {
                 return $this->find_result_set();
             }
+
             return $this->_find_many();
         }
 
@@ -538,8 +568,10 @@
          * no rows were returned.
          * @return array
          */
-        protected function _find_many() {
+        protected function _find_many()
+        {
             $rows = $this->_run();
+
             return array_map(array($this, '_create_instance_from_row'), $rows);
         }
 
@@ -549,7 +581,8 @@
          * containing instances of the ORM class.
          * @return \IdiormResultSet
          */
-        public function find_result_set() {
+        public function find_result_set()
+        {
             return new IdiormResultSet($this->_find_many());
         }
 
@@ -559,8 +592,9 @@
          * or an empty array if no rows were returned.
          * @return array
          */
-        public function find_array() {
-            return $this->_run(); 
+        public function find_array()
+        {
+            return $this->_run();
         }
 
         /**
@@ -568,7 +602,8 @@
          * Will return an integer representing the number of
          * rows returned.
          */
-        public function count($column = '*') {
+        public function count($column = '*')
+        {
             return $this->_call_aggregate_db_function(__FUNCTION__, $column);
         }
 
@@ -576,7 +611,8 @@
          * Tell the ORM that you wish to execute a MAX query.
          * Will return the max value of the choosen column.
          */
-        public function max($column)  {
+        public function max($column)
+        {
             return $this->_call_aggregate_db_function(__FUNCTION__, $column);
         }
 
@@ -584,7 +620,8 @@
          * Tell the ORM that you wish to execute a MIN query.
          * Will return the min value of the choosen column.
          */
-        public function min($column)  {
+        public function min($column)
+        {
             return $this->_call_aggregate_db_function(__FUNCTION__, $column);
         }
 
@@ -592,7 +629,8 @@
          * Tell the ORM that you wish to execute a AVG query.
          * Will return the average value of the choosen column.
          */
-        public function avg($column)  {
+        public function avg($column)
+        {
             return $this->_call_aggregate_db_function(__FUNCTION__, $column);
         }
 
@@ -600,7 +638,8 @@
          * Tell the ORM that you wish to execute a SUM query.
          * Will return the sum of the choosen column.
          */
-        public function sum($column)  {
+        public function sum($column)
+        {
             return $this->_call_aggregate_db_function(__FUNCTION__, $column);
         }
 
@@ -610,23 +649,25 @@
          * @param string $column The column to execute the aggregate query against
          * @return int
          */
-        protected function _call_aggregate_db_function($sql_function, $column) {
+        protected function _call_aggregate_db_function($sql_function, $column)
+        {
             $alias = strtolower($sql_function);
             $sql_function = strtoupper($sql_function);
-            if('*' != $column) {
+            if ('*' != $column) {
                 $column = $this->_quote_identifier($column);
             }
             $this->select_expr("$sql_function($column)", $alias);
             $result = $this->find_one();
 
             $return_value = 0;
-            if($result !== false && isset($result->$alias)) {
-                if((int) $result->$alias == (float) $result->$alias) {
+            if ($result !== false && isset($result->$alias)) {
+                if ((int) $result->$alias == (float) $result->$alias) {
                     $return_value = (int) $result->$alias;
                 } else {
                     $return_value = (float) $result->$alias;
                 }
             }
+
             return $return_value;
         }
 
@@ -636,8 +677,10 @@
          * This will usually be called only from inside the class,
          * but it's public in case you need to call it directly.
          */
-        public function hydrate($data=array()) {
+        public function hydrate($data=array())
+        {
             $this->_data = $data;
+
             return $this;
         }
 
@@ -645,8 +688,10 @@
          * Force the ORM to flag all the fields in the $data array
          * as "dirty" and therefore update them when save() is called.
          */
-        public function force_all_dirty() {
+        public function force_all_dirty()
+        {
             $this->_dirty_fields = $this->_data;
+
             return $this;
         }
 
@@ -657,18 +702,22 @@
          * be bound to the placeholders in the query. If this method
          * is called, all other query building methods will be ignored.
          */
-        public function raw_query($query, $parameters = array()) {
+        public function raw_query($query, $parameters = array())
+        {
             $this->_is_raw_query = true;
             $this->_raw_query = $query;
             $this->_raw_parameters = $parameters;
+
             return $this;
         }
 
         /**
          * Add an alias for the main table to be used in SELECT queries
          */
-        public function table_alias($alias) {
+        public function table_alias($alias)
+        {
             $this->_table_alias = $alias;
+
             return $this;
         }
 
@@ -677,7 +726,8 @@
          * of columns returned by the SELECT query. The second optional
          * argument is the alias to return the expression as.
          */
-        protected function _add_result_column($expr, $alias=null) {
+        protected function _add_result_column($expr, $alias=null)
+        {
             if (!is_null($alias)) {
                 $expr .= " AS " . $this->_quote_identifier($alias);
             }
@@ -688,6 +738,7 @@
             } else {
                 $this->_result_columns[] = $expr;
             }
+
             return $this;
         }
 
@@ -696,8 +747,10 @@
          * query. This defaults to '*'. The second optional argument is
          * the alias to return the column as.
          */
-        public function select($column, $alias=null) {
+        public function select($column, $alias=null)
+        {
             $column = $this->_quote_identifier($column);
+
             return $this->_add_result_column($column, $alias);
         }
 
@@ -706,7 +759,8 @@
          * by the SELECT query. The second optional argument is
          * the alias to return the column as.
          */
-        public function select_expr($expr, $alias=null) {
+        public function select_expr($expr, $alias=null)
+        {
             return $this->_add_result_column($expr, $alias);
         }
 
@@ -714,75 +768,80 @@
          * Add columns to the list of columns returned by the SELECT
          * query. This defaults to '*'. Many columns can be supplied
          * as either an array or as a list of parameters to the method.
-         * 
+         *
          * Note that the alias must not be numeric - if you want a
          * numeric alias then prepend it with some alpha chars. eg. a1
-         * 
+         *
          * @example select_many(array('alias' => 'column', 'column2', 'alias2' => 'column3'), 'column4', 'column5');
          * @example select_many('column', 'column2', 'column3');
          * @example select_many(array('column', 'column2', 'column3'), 'column4', 'column5');
-         * 
+         *
          * @return \ORM
          */
-        public function select_many() {
+        public function select_many()
+        {
             $columns = func_get_args();
-            if(!empty($columns)) {
+            if (!empty($columns)) {
                 $columns = $this->_normalise_select_many_columns($columns);
-                foreach($columns as $alias => $column) {
-                    if(is_numeric($alias)) {
+                foreach ($columns as $alias => $column) {
+                    if (is_numeric($alias)) {
                         $alias = null;
                     }
                     $this->select($column, $alias);
                 }
             }
+
             return $this;
         }
 
         /**
          * Add an unquoted expression to the list of columns returned
-         * by the SELECT query. Many columns can be supplied as either 
+         * by the SELECT query. Many columns can be supplied as either
          * an array or as a list of parameters to the method.
-         * 
+         *
          * Note that the alias must not be numeric - if you want a
          * numeric alias then prepend it with some alpha chars. eg. a1
-         * 
+         *
          * @example select_many_expr(array('alias' => 'column', 'column2', 'alias2' => 'column3'), 'column4', 'column5')
          * @example select_many_expr('column', 'column2', 'column3')
          * @example select_many_expr(array('column', 'column2', 'column3'), 'column4', 'column5')
-         * 
+         *
          * @return \ORM
          */
-        public function select_many_expr() {
+        public function select_many_expr()
+        {
             $columns = func_get_args();
-            if(!empty($columns)) {
+            if (!empty($columns)) {
                 $columns = $this->_normalise_select_many_columns($columns);
-                foreach($columns as $alias => $column) {
-                    if(is_numeric($alias)) {
+                foreach ($columns as $alias => $column) {
+                    if (is_numeric($alias)) {
                         $alias = null;
                     }
                     $this->select_expr($column, $alias);
                 }
             }
+
             return $this;
         }
 
         /**
          * Take a column specification for the select many methods and convert it
          * into a normalised array of columns and aliases.
-         * 
+         *
          * It is designed to turn the following styles into a normalised array:
-         * 
+         *
          * array(array('alias' => 'column', 'column2', 'alias2' => 'column3'), 'column4', 'column5'))
-         * 
+         *
          * @param array $columns
          * @return array
          */
-        protected function _normalise_select_many_columns($columns) {
+        protected function _normalise_select_many_columns($columns)
+        {
             $return = array();
-            foreach($columns as $column) {
-                if(is_array($column)) {
-                    foreach($column as $key => $value) {
-                        if(!is_numeric($key)) {
+            foreach ($columns as $column) {
+                if (is_array($column)) {
+                    foreach ($column as $key => $value) {
+                        if (!is_numeric($key)) {
                             $return[$key] = $value;
                         } else {
                             $return[] = $value;
@@ -792,14 +851,17 @@
                     $return[] = $column;
                 }
             }
+
             return $return;
         }
 
         /**
          * Add a DISTINCT keyword before the list of columns in the SELECT query
          */
-        public function distinct() {
+        public function distinct()
+        {
             $this->_distinct = true;
+
             return $this;
         }
 
@@ -825,8 +887,8 @@
          *
          * The final (optional) argument specifies an alias for the joined table.
          */
-        protected function _add_join_source($join_operator, $table, $constraint, $table_alias=null) {
-
+        protected function _add_join_source($join_operator, $table, $constraint, $table_alias=null)
+        {
             $join_operator = trim("{$join_operator} JOIN");
 
             $table = $this->_quote_identifier($table);
@@ -846,76 +908,87 @@
             }
 
             $this->_join_sources[] = "{$join_operator} {$table} ON {$constraint}";
+
             return $this;
         }
 
         /**
          * Add a simple JOIN source to the query
          */
-        public function join($table, $constraint, $table_alias=null) {
+        public function join($table, $constraint, $table_alias=null)
+        {
             return $this->_add_join_source("", $table, $constraint, $table_alias);
         }
 
         /**
          * Add an INNER JOIN souce to the query
          */
-        public function inner_join($table, $constraint, $table_alias=null) {
+        public function inner_join($table, $constraint, $table_alias=null)
+        {
             return $this->_add_join_source("INNER", $table, $constraint, $table_alias);
         }
 
         /**
          * Add a LEFT OUTER JOIN souce to the query
          */
-        public function left_outer_join($table, $constraint, $table_alias=null) {
+        public function left_outer_join($table, $constraint, $table_alias=null)
+        {
             return $this->_add_join_source("LEFT OUTER", $table, $constraint, $table_alias);
         }
 
         /**
          * Add an RIGHT OUTER JOIN souce to the query
          */
-        public function right_outer_join($table, $constraint, $table_alias=null) {
+        public function right_outer_join($table, $constraint, $table_alias=null)
+        {
             return $this->_add_join_source("RIGHT OUTER", $table, $constraint, $table_alias);
         }
 
         /**
          * Add an FULL OUTER JOIN souce to the query
          */
-        public function full_outer_join($table, $constraint, $table_alias=null) {
+        public function full_outer_join($table, $constraint, $table_alias=null)
+        {
             return $this->_add_join_source("FULL OUTER", $table, $constraint, $table_alias);
         }
 
         /**
          * Internal method to add a HAVING condition to the query
          */
-        protected function _add_having($fragment, $values=array()) {
+        protected function _add_having($fragment, $values=array())
+        {
             return $this->_add_condition('having', $fragment, $values);
         }
 
         /**
          * Internal method to add a HAVING condition to the query
          */
-        protected function _add_simple_having($column_name, $separator, $value) {
+        protected function _add_simple_having($column_name, $separator, $value)
+        {
             return $this->_add_simple_condition('having', $column_name, $separator, $value);
         }
 
         /**
          * Internal method to add a WHERE condition to the query
          */
-        protected function _add_where($fragment, $values=array()) {
+        protected function _add_where($fragment, $values=array())
+        {
             return $this->_add_condition('where', $fragment, $values);
         }
 
         /**
          * Internal method to add a WHERE condition to the query
          */
-        protected function _add_simple_where($column_name, $separator, $value) {
+        protected function _add_simple_where($column_name, $separator, $value)
+        {
             return $this->_add_simple_condition('where', $column_name, $separator, $value);
         }
 
         /**
          * Internal method to add a HAVING or WHERE condition to the query
          */
-        protected function _add_condition($type, $fragment, $values=array()) {
+        protected function _add_condition($type, $fragment, $values=array())
+        {
             $conditions_class_property_name = "_{$type}_conditions";
             if (!is_array($values)) {
                 $values = array($values);
@@ -924,6 +997,7 @@
                 self::CONDITION_FRAGMENT => $fragment,
                 self::CONDITION_VALUES => $values,
             ));
+
             return $this;
         }
 
@@ -933,30 +1007,34 @@
          * be passed to the _add_condition method. Avoids duplication
          * of the call to _quote_identifier
          */
-        protected function _add_simple_condition($type, $column_name, $separator, $value) {
+        protected function _add_simple_condition($type, $column_name, $separator, $value)
+        {
             // Add the table name in case of ambiguous columns
             if (count($this->_join_sources) > 0 && strpos($column_name, '.') === false) {
                 $column_name = "{$this->_table_name}.{$column_name}";
             }
             $column_name = $this->_quote_identifier($column_name);
+
             return $this->_add_condition($type, "{$column_name} {$separator} ?", $value);
-        } 
+        }
 
         /**
          * Return a string containing the given number of question marks,
          * separated by commas. Eg "?, ?, ?"
          */
-        protected function _create_placeholders($fields) {
-            if(!empty($fields)) {
+        protected function _create_placeholders($fields)
+        {
+            if (!empty($fields)) {
                 $db_fields = array();
-                foreach($fields as $key => $value) {
+                foreach ($fields as $key => $value) {
                     // Process expression fields directly into the query
-                    if(array_key_exists($key, $this->_expr_fields)) {
+                    if (array_key_exists($key, $this->_expr_fields)) {
                         $db_fields[] = $value;
                     } else {
                         $db_fields[] = '?';
                     }
                 }
+
                 return implode(', ', $db_fields);
             }
         }
@@ -967,7 +1045,8 @@
          * added, and these will be ANDed together when the final query
          * is built.
          */
-        public function where($column_name, $value) {
+        public function where($column_name, $value)
+        {
             return $this->where_equal($column_name, $value);
         }
 
@@ -975,97 +1054,114 @@
          * More explicitly named version of for the where() method.
          * Can be used if preferred.
          */
-        public function where_equal($column_name, $value) {
+        public function where_equal($column_name, $value)
+        {
             return $this->_add_simple_where($column_name, '=', $value);
         }
 
         /**
          * Add a WHERE column != value clause to your query.
          */
-        public function where_not_equal($column_name, $value) {
+        public function where_not_equal($column_name, $value)
+        {
             return $this->_add_simple_where($column_name, '!=', $value);
         }
 
         /**
          * Special method to query the table by its primary key
          */
-        public function where_id_is($id) {
+        public function where_id_is($id)
+        {
             return $this->where($this->_get_id_column_name(), $id);
         }
 
         /**
          * Add a WHERE ... LIKE clause to your query.
          */
-        public function where_like($column_name, $value) {
+        public function where_like($column_name, $value)
+        {
             return $this->_add_simple_where($column_name, 'LIKE', $value);
         }
 
         /**
          * Add where WHERE ... NOT LIKE clause to your query.
          */
-        public function where_not_like($column_name, $value) {
+        public function where_not_like($column_name, $value)
+        {
             return $this->_add_simple_where($column_name, 'NOT LIKE', $value);
         }
 
         /**
          * Add a WHERE ... > clause to your query
          */
-        public function where_gt($column_name, $value) {
+        public function where_gt($column_name, $value)
+        {
             return $this->_add_simple_where($column_name, '>', $value);
         }
 
         /**
          * Add a WHERE ... < clause to your query
          */
-        public function where_lt($column_name, $value) {
+        public function where_lt($column_name, $value)
+        {
             return $this->_add_simple_where($column_name, '<', $value);
         }
 
         /**
          * Add a WHERE ... >= clause to your query
          */
-        public function where_gte($column_name, $value) {
+        public function where_gte($column_name, $value)
+        {
             return $this->_add_simple_where($column_name, '>=', $value);
         }
 
         /**
          * Add a WHERE ... <= clause to your query
          */
-        public function where_lte($column_name, $value) {
+        public function where_lte($column_name, $value)
+        {
             return $this->_add_simple_where($column_name, '<=', $value);
         }
 
         /**
          * Add a WHERE ... IN clause to your query
          */
-        public function where_in($column_name, $values) {
+        public function where_in($column_name, $values)
+        {
             $column_name = $this->_quote_identifier($column_name);
             $placeholders = $this->_create_placeholders($values);
+
             return $this->_add_where("{$column_name} IN ({$placeholders})", $values);
         }
 
         /**
          * Add a WHERE ... NOT IN clause to your query
          */
-        public function where_not_in($column_name, $values) {
+        public function where_not_in($column_name, $values)
+        {
             $column_name = $this->_quote_identifier($column_name);
             $placeholders = $this->_create_placeholders($values);
+
             return $this->_add_where("{$column_name} NOT IN ({$placeholders})", $values);
         }
 
         /**
          * Add a WHERE column IS NULL clause to your query
          */
-        public function where_null($column_name) {
+        public function where_null($column_name)
+        {
             $column_name = $this->_quote_identifier($column_name);
+
             return $this->_add_where("{$column_name} IS NULL");
         }
 
         /**
          * Add a WHERE column IS NOT NULL clause to your query
          */
-        public function where_not_null($column_name) {
+        public function where_not_null($column_name)
+        {
             $column_name = $this->_quote_identifier($column_name);
+
             return $this->_add_where("{$column_name} IS NOT NULL");
         }
 
@@ -1074,71 +1170,86 @@
          * contain question mark placeholders, which will be bound
          * to the parameters supplied in the second argument.
          */
-        public function where_raw($clause, $parameters=array()) {
+        public function where_raw($clause, $parameters=array())
+        {
             return $this->_add_where($clause, $parameters);
         }
 
         /**
          * Add a LIMIT to the query
          */
-        public function limit($limit) {
+        public function limit($limit)
+        {
             $this->_limit = $limit;
+
             return $this;
         }
 
         /**
          * Add an OFFSET to the query
          */
-        public function offset($offset) {
+        public function offset($offset)
+        {
             $this->_offset = $offset;
+
             return $this;
         }
 
         /**
          * Add an ORDER BY clause to the query
          */
-        protected function _add_order_by($column_name, $ordering) {
+        protected function _add_order_by($column_name, $ordering)
+        {
             $column_name = $this->_quote_identifier($column_name);
             $this->_order_by[] = "{$column_name} {$ordering}";
+
             return $this;
         }
 
         /**
          * Add an ORDER BY column DESC clause
          */
-        public function order_by_desc($column_name) {
+        public function order_by_desc($column_name)
+        {
             return $this->_add_order_by($column_name, 'DESC');
         }
 
         /**
          * Add an ORDER BY column ASC clause
          */
-        public function order_by_asc($column_name) {
+        public function order_by_asc($column_name)
+        {
             return $this->_add_order_by($column_name, 'ASC');
         }
 
         /**
          * Add an unquoted expression as an ORDER BY clause
          */
-        public function order_by_expr($clause) {
+        public function order_by_expr($clause)
+        {
             $this->_order_by[] = $clause;
+
             return $this;
         }
 
         /**
          * Add a column to the list of columns to GROUP BY
          */
-        public function group_by($column_name) {
+        public function group_by($column_name)
+        {
             $column_name = $this->_quote_identifier($column_name);
             $this->_group_by[] = $column_name;
+
             return $this;
         }
 
         /**
-         * Add an unquoted expression to the list of columns to GROUP BY 
+         * Add an unquoted expression to the list of columns to GROUP BY
          */
-        public function group_by_expr($expr) {
+        public function group_by_expr($expr)
+        {
             $this->_group_by[] = $expr;
+
             return $this;
         }
 
@@ -1148,7 +1259,8 @@
          * added, and these will be ANDed together when the final query
          * is built.
          */
-        public function having($column_name, $value) {
+        public function having($column_name, $value)
+        {
             return $this->having_equal($column_name, $value);
         }
 
@@ -1156,97 +1268,114 @@
          * More explicitly named version of for the having() method.
          * Can be used if preferred.
          */
-        public function having_equal($column_name, $value) {
+        public function having_equal($column_name, $value)
+        {
             return $this->_add_simple_having($column_name, '=', $value);
         }
 
         /**
          * Add a HAVING column != value clause to your query.
          */
-        public function having_not_equal($column_name, $value) {
+        public function having_not_equal($column_name, $value)
+        {
             return $this->_add_simple_having($column_name, '!=', $value);
         }
 
         /**
          * Special method to query the table by its primary key
          */
-        public function having_id_is($id) {
+        public function having_id_is($id)
+        {
             return $this->having($this->_get_id_column_name(), $id);
         }
 
         /**
          * Add a HAVING ... LIKE clause to your query.
          */
-        public function having_like($column_name, $value) {
+        public function having_like($column_name, $value)
+        {
             return $this->_add_simple_having($column_name, 'LIKE', $value);
         }
 
         /**
          * Add where HAVING ... NOT LIKE clause to your query.
          */
-        public function having_not_like($column_name, $value) {
+        public function having_not_like($column_name, $value)
+        {
             return $this->_add_simple_having($column_name, 'NOT LIKE', $value);
         }
 
         /**
          * Add a HAVING ... > clause to your query
          */
-        public function having_gt($column_name, $value) {
+        public function having_gt($column_name, $value)
+        {
             return $this->_add_simple_having($column_name, '>', $value);
         }
 
         /**
          * Add a HAVING ... < clause to your query
          */
-        public function having_lt($column_name, $value) {
+        public function having_lt($column_name, $value)
+        {
             return $this->_add_simple_having($column_name, '<', $value);
         }
 
         /**
          * Add a HAVING ... >= clause to your query
          */
-        public function having_gte($column_name, $value) {
+        public function having_gte($column_name, $value)
+        {
             return $this->_add_simple_having($column_name, '>=', $value);
         }
 
         /**
          * Add a HAVING ... <= clause to your query
          */
-        public function having_lte($column_name, $value) {
+        public function having_lte($column_name, $value)
+        {
             return $this->_add_simple_having($column_name, '<=', $value);
         }
 
         /**
          * Add a HAVING ... IN clause to your query
          */
-        public function having_in($column_name, $values) {
+        public function having_in($column_name, $values)
+        {
             $column_name = $this->_quote_identifier($column_name);
             $placeholders = $this->_create_placeholders($values);
+
             return $this->_add_having("{$column_name} IN ({$placeholders})", $values);
         }
 
         /**
          * Add a HAVING ... NOT IN clause to your query
          */
-        public function having_not_in($column_name, $values) {
+        public function having_not_in($column_name, $values)
+        {
             $column_name = $this->_quote_identifier($column_name);
             $placeholders = $this->_create_placeholders($values);
+
             return $this->_add_having("{$column_name} NOT IN ({$placeholders})", $values);
         }
 
         /**
          * Add a HAVING column IS NULL clause to your query
          */
-        public function having_null($column_name) {
+        public function having_null($column_name)
+        {
             $column_name = $this->_quote_identifier($column_name);
+
             return $this->_add_having("{$column_name} IS NULL");
         }
 
         /**
          * Add a HAVING column IS NOT NULL clause to your query
          */
-        public function having_not_null($column_name) {
+        public function having_not_null($column_name)
+        {
             $column_name = $this->_quote_identifier($column_name);
+
             return $this->_add_having("{$column_name} IS NOT NULL");
         }
 
@@ -1255,7 +1384,8 @@
          * contain question mark placeholders, which will be bound
          * to the parameters supplied in the second argument.
          */
-        public function having_raw($clause, $parameters=array()) {
+        public function having_raw($clause, $parameters=array())
+        {
             return $this->_add_having($clause, $parameters);
         }
 
@@ -1263,11 +1393,13 @@
          * Build a SELECT statement based on the clauses that have
          * been passed to this instance by chaining method calls.
          */
-        protected function _build_select() {
+        protected function _build_select()
+        {
             // If the query is raw, just set the $this->_values to be
             // the raw query parameters and return the raw query
             if ($this->_is_raw_query) {
                 $this->_values = $this->_raw_parameters;
+
                 return $this->_raw_query;
             }
 
@@ -1288,7 +1420,8 @@
         /**
          * Build the start of the SELECT statement
          */
-        protected function _build_select_start() {
+        protected function _build_select_start()
+        {
             $result_columns = join(', ', $this->_result_columns);
 
             if ($this->_distinct) {
@@ -1300,13 +1433,15 @@
             if (!is_null($this->_table_alias)) {
                 $fragment .= " " . $this->_quote_identifier($this->_table_alias);
             }
+
             return $fragment;
         }
 
         /**
          * Build the JOIN sources
          */
-        protected function _build_join() {
+        protected function _build_join()
+        {
             if (count($this->_join_sources) === 0) {
                 return '';
             }
@@ -1317,24 +1452,28 @@
         /**
          * Build the WHERE clause(s)
          */
-        protected function _build_where() {
+        protected function _build_where()
+        {
             return $this->_build_conditions('where');
         }
 
         /**
          * Build the HAVING clause(s)
          */
-        protected function _build_having() {
+        protected function _build_having()
+        {
             return $this->_build_conditions('having');
         }
 
         /**
          * Build GROUP BY
          */
-        protected function _build_group_by() {
+        protected function _build_group_by()
+        {
             if (count($this->_group_by) === 0) {
                 return '';
             }
+
             return "GROUP BY " . join(", ", $this->_group_by);
         }
 
@@ -1343,7 +1482,8 @@
          * @param string $type
          * @return string
          */
-        protected function _build_conditions($type) {
+        protected function _build_conditions($type)
+        {
             $conditions_class_property_name = "_{$type}_conditions";
             // If there are no clauses, return empty string
             if (count($this->$conditions_class_property_name) === 0) {
@@ -1362,38 +1502,46 @@
         /**
          * Build ORDER BY
          */
-        protected function _build_order_by() {
+        protected function _build_order_by()
+        {
             if (count($this->_order_by) === 0) {
                 return '';
             }
+
             return "ORDER BY " . join(", ", $this->_order_by);
         }
 
         /**
          * Build LIMIT
          */
-        protected function _build_limit() {
+        protected function _build_limit()
+        {
             if (!is_null($this->_limit)) {
                 $clause = 'LIMIT';
                 if (self::$_db[$this->_connection_name]->getAttribute(PDO::ATTR_DRIVER_NAME) == 'firebird') {
                     $clause = 'ROWS';
                 }
+
                 return "$clause " . $this->_limit;
             }
+
             return '';
         }
 
         /**
          * Build OFFSET
          */
-        protected function _build_offset() {
+        protected function _build_offset()
+        {
             if (!is_null($this->_offset)) {
                 $clause = 'OFFSET';
                 if (self::$_db[$this->_connection_name]->getAttribute(PDO::ATTR_DRIVER_NAME) == 'firebird') {
                     $clause = 'TO';
                 }
+
                 return "$clause " . $this->_offset;
             }
+
             return '';
         }
 
@@ -1401,7 +1549,8 @@
          * Wrapper around PHP's join function which
          * only adds the pieces if they are not empty.
          */
-        protected function _join_if_not_empty($glue, $pieces) {
+        protected function _join_if_not_empty($glue, $pieces)
+        {
             $filtered_pieces = array();
             foreach ($pieces as $piece) {
                 if (is_string($piece)) {
@@ -1411,6 +1560,7 @@
                     $filtered_pieces[] = $piece;
                 }
             }
+
             return join($glue, $filtered_pieces);
         }
 
@@ -1419,9 +1569,11 @@
          * (table names, column names etc). This method can
          * also deal with dot-separated identifiers eg table.column
          */
-        protected function _quote_identifier($identifier) {
+        protected function _quote_identifier($identifier)
+        {
             $parts = explode('.', $identifier);
             $parts = array_map(array($this, '_quote_identifier_part'), $parts);
+
             return join('.', $parts);
         }
 
@@ -1430,7 +1582,8 @@
          * part of an identifier, using the identifier quote
          * character specified in the config (or autodetected).
          */
-        protected function _quote_identifier_part($part) {
+        protected function _quote_identifier_part($part)
+        {
             if ($part === '*') {
                 return $part;
             }
@@ -1447,9 +1600,11 @@
         /**
          * Create a cache key for the given query and parameters.
          */
-        protected static function _create_cache_key($query, $parameters) {
+        protected static function _create_cache_key($query, $parameters)
+        {
             $parameter_string = join(',', $parameters);
             $key = $query . ':' . $parameter_string;
+
             return sha1($key);
         }
 
@@ -1457,24 +1612,28 @@
          * Check the query cache for the given cache key. If a value
          * is cached for the key, return the value. Otherwise, return false.
          */
-        protected static function _check_query_cache($cache_key, $connection_name = self::DEFAULT_CONNECTION) {
+        protected static function _check_query_cache($cache_key, $connection_name = self::DEFAULT_CONNECTION)
+        {
             if (isset(self::$_query_cache[$connection_name][$cache_key])) {
                 return self::$_query_cache[$connection_name][$cache_key];
             }
+
             return false;
         }
 
         /**
          * Clear the query cache
          */
-        public static function clear_cache() {
+        public static function clear_cache()
+        {
             self::$_query_cache = array();
         }
 
         /**
          * Add the given value to the query cache.
          */
-        protected static function _cache_query_result($cache_key, $value, $connection_name = self::DEFAULT_CONNECTION) {
+        protected static function _cache_query_result($cache_key, $value, $connection_name = self::DEFAULT_CONNECTION)
+        {
             if (!isset(self::$_query_cache[$connection_name])) {
                 self::$_query_cache[$connection_name] = array();
             }
@@ -1485,7 +1644,8 @@
          * Execute the SELECT query that has been built up by chaining methods
          * on this class. Return an array of rows as associative arrays.
          */
-        protected function _run() {
+        protected function _run()
+        {
             $query = $this->_build_select();
             $caching_enabled = self::$_config[$this->_connection_name]['caching'];
 
@@ -1524,11 +1684,13 @@
          * names may optionally be supplied as arguments,
          * if so, only those keys will be returned.
          */
-        public function as_array() {
+        public function as_array()
+        {
             if (func_num_args() === 0) {
                 return $this->_data;
             }
             $args = func_get_args();
+
             return array_intersect_key($this->_data, array_flip($args));
         }
 
@@ -1536,7 +1698,8 @@
          * Return the value of a property of this object (database row)
          * or null if not present.
          */
-        public function get($key) {
+        public function get($key)
+        {
             return isset($this->_data[$key]) ? $this->_data[$key] : null;
         }
 
@@ -1544,20 +1707,23 @@
          * Return the name of the column in the database table which contains
          * the primary key ID of the row.
          */
-        protected function _get_id_column_name() {
+        protected function _get_id_column_name()
+        {
             if (!is_null($this->_instance_id_column)) {
                 return $this->_instance_id_column;
             }
             if (isset(self::$_config[$this->_connection_name]['id_column_overrides'][$this->_table_name])) {
                 return self::$_config[$this->_connection_name]['id_column_overrides'][$this->_table_name];
             }
+
             return self::$_config[$this->_connection_name]['id_column'];
         }
 
         /**
          * Get the primary key ID of this object.
          */
-        public function id() {
+        public function id()
+        {
             return $this->get($this->_get_id_column_name());
         }
 
@@ -1568,7 +1734,8 @@
          * Flags the properties as 'dirty' so they will be saved to the
          * database when save() is called.
          */
-        public function set($key, $value = null) {
+        public function set($key, $value = null)
+        {
             $this->_set_orm_property($key, $value);
         }
 
@@ -1577,11 +1744,12 @@
          * To set multiple properties at once, pass an associative array
          * as the first parameter and leave out the second parameter.
          * Flags the properties as 'dirty' so they will be saved to the
-         * database when save() is called. 
+         * database when save() is called.
          * @param string|array $key
          * @param string|null $value
          */
-        public function set_expr($key, $value = null) {
+        public function set_expr($key, $value = null)
+        {
             $this->_set_orm_property($key, $value, true);
         }
 
@@ -1591,7 +1759,8 @@
          * @param string|null $value
          * @param bool $raw Whether this value should be treated as raw or not
          */
-        protected function _set_orm_property($key, $value = null, $expr = false) {
+        protected function _set_orm_property($key, $value = null, $expr = false)
+        {
             if (!is_array($key)) {
                 $key = array($key => $value);
             }
@@ -1600,7 +1769,7 @@
                 $this->_dirty_fields[$field] = $value;
                 if (false === $expr and isset($this->_expr_fields[$field])) {
                     unset($this->_expr_fields[$field]);
-                } else if (true === $expr) {
+                } elseif (true === $expr) {
                     $this->_expr_fields[$field] = true;
                 }
             }
@@ -1610,7 +1779,8 @@
          * Check whether the given field has been changed since this
          * object was saved.
          */
-        public function is_dirty($key) {
+        public function is_dirty($key)
+        {
             return isset($this->_dirty_fields[$key]);
         }
 
@@ -1618,7 +1788,8 @@
          * Check whether the model was the result of a call to create() or not
          * @return bool
          */
-        public function is_new() {
+        public function is_new()
+        {
             return $this->_is_new;
         }
 
@@ -1626,7 +1797,8 @@
          * Save any fields which have been modified on this object
          * to the database.
          */
-        public function save() {
+        public function save()
+        {
             $query = array();
 
             // remove any expression fields as they are already baked into the query
@@ -1649,7 +1821,7 @@
             if ($this->_is_new) {
                 $this->_is_new = false;
                 if (is_null($this->id())) {
-                    if(self::$_db[$this->_connection_name]->getAttribute(PDO::ATTR_DRIVER_NAME) == 'pgsql') {
+                    if (self::$_db[$this->_connection_name]->getAttribute(PDO::ATTR_DRIVER_NAME) == 'pgsql') {
                         $this->_data[$this->_get_id_column_name()] = self::get_last_statement()->fetchColumn();
                     } else {
                         $this->_data[$this->_get_id_column_name()] = self::$_db[$this->_connection_name]->lastInsertId();
@@ -1658,19 +1830,21 @@
             }
 
             $this->_dirty_fields = array();
+
             return $success;
         }
 
         /**
          * Build an UPDATE query
          */
-        protected function _build_update() {
+        protected function _build_update()
+        {
             $query = array();
             $query[] = "UPDATE {$this->_quote_identifier($this->_table_name)} SET";
 
             $field_list = array();
             foreach ($this->_dirty_fields as $key => $value) {
-                if(!array_key_exists($key, $this->_expr_fields)) {
+                if (!array_key_exists($key, $this->_expr_fields)) {
                     $value = '?';
                 }
                 $field_list[] = "{$this->_quote_identifier($key)} = $value";
@@ -1679,13 +1853,15 @@
             $query[] = "WHERE";
             $query[] = $this->_quote_identifier($this->_get_id_column_name());
             $query[] = "= ?";
+
             return join(" ", $query);
         }
 
         /**
          * Build an INSERT query
          */
-        protected function _build_insert() {
+        protected function _build_insert()
+        {
             $query[] = "INSERT INTO";
             $query[] = $this->_quote_identifier($this->_table_name);
             $field_list = array_map(array($this, '_quote_identifier'), array_keys($this->_dirty_fields));
@@ -1705,7 +1881,8 @@
         /**
          * Delete this record from the database
          */
-        public function delete() {
+        public function delete()
+        {
             $query = join(" ", array(
                 "DELETE FROM",
                 $this->_quote_identifier($this->_table_name),
@@ -1720,7 +1897,8 @@
         /**
          * Delete many records from the database
          */
-        public function delete_many() {
+        public function delete_many()
+        {
             // Build and return the full DELETE statement by concatenating
             // the results of calling each separate builder method.
             $query = $this->_join_if_not_empty(" ", array(
@@ -1736,22 +1914,26 @@
         // ---  ArrayAccess  --- //
         // --------------------- //
 
-        public function offsetExists($key) {
+        public function offsetExists($key)
+        {
             return isset($this->_data[$key]);
         }
 
-        public function offsetGet($key) {
+        public function offsetGet($key)
+        {
             return $this->get($key);
         }
 
-        public function offsetSet($key, $value) {
-            if(is_null($key)) {
+        public function offsetSet($key, $value)
+        {
+            if (is_null($key)) {
                 throw new InvalidArgumentException('You must specify a key/array index.');
             }
             $this->set($key, $value);
         }
 
-        public function offsetUnset($key) {
+        public function offsetUnset($key)
+        {
             unset($this->_data[$key]);
             unset($this->_dirty_fields[$key]);
         }
@@ -1759,20 +1941,24 @@
         // --------------------- //
         // --- MAGIC METHODS --- //
         // --------------------- //
-        public function __get($key) {
+        public function __get($key)
+        {
             return $this->offsetGet($key);
         }
 
-        public function __set($key, $value) {
+        public function __set($key, $value)
+        {
             $this->offsetSet($key, $value);
         }
 
-        public function __unset($key) {
+        public function __unset($key)
+        {
             $this->offsetUnset($key);
         }
 
 
-        public function __isset($key) {
+        public function __isset($key)
+        {
             return $this->offsetExists($key);
         }
     }
@@ -1785,7 +1971,8 @@
      * @author Simon Holywell <treffynnon@php.net>
      * @link http://stackoverflow.com/a/13370709/461813 StackOverflow answer
      */
-    class IdiormString {
+    class IdiormString
+    {
         protected $subject;
         protected $search;
         protected $replace;
@@ -1795,7 +1982,8 @@
          * @param string $subject
          * @return \self
          */
-        public static function value($subject) {
+        public static function value($subject)
+        {
             return new self($subject);
         }
 
@@ -1807,7 +1995,8 @@
          * @param string $subject
          * @return string
          */
-        public static function str_replace_outside_quotes($search, $replace, $subject) {
+        public static function str_replace_outside_quotes($search, $replace, $subject)
+        {
             return self::value($subject)->replace_outside_quotes($search, $replace);
         }
 
@@ -1815,7 +2004,8 @@
          * Set the base string object
          * @param string $subject
          */
-        public function __construct($subject) {
+        public function __construct($subject)
+        {
             $this->subject = (string) $subject;
         }
 
@@ -1826,9 +2016,11 @@
          * @param string $replace
          * @return string
          */
-        public function replace_outside_quotes($search, $replace) {
+        public function replace_outside_quotes($search, $replace)
+        {
             $this->search = $search;
             $this->replace = $replace;
+
             return $this->_str_replace_outside_quotes();
         }
 
@@ -1839,7 +2031,8 @@
          * @link http://stackoverflow.com/a/13370709/461813 StackOverflow answer
          * @return string
          */
-        protected function _str_replace_outside_quotes(){
+        protected function _str_replace_outside_quotes()
+        {
             $re_valid = '/
                 # Validate string having embedded quoted substrings.
                 ^                           # Anchor to start of string.
@@ -1861,6 +2054,7 @@
                   )                         # End $1: Quoted chunk.
                 | ([^\'"\\\\]+)             # or $2: an unquoted chunk (no escapes).
                 /sx';
+
             return preg_replace_callback($re_parse, array($this, '_str_replace_outside_quotes_cb'), $this->subject);
         }
 
@@ -1872,7 +2066,8 @@
          * @param array $matches
          * @return string
          */
-        protected function _str_replace_outside_quotes_cb($matches) {
+        protected function _str_replace_outside_quotes_cb($matches)
+        {
             // Return quoted string chunks (in group $1) unaltered.
             if ($matches[1]) return $matches[1];
             // Process only unquoted chunks (in group $2).
@@ -1885,7 +2080,8 @@
      * A result set class for working with collections of model instances
      * @author Simon Holywell <treffynnon@php.net>
      */
-    class IdiormResultSet implements Countable, IteratorAggregate, ArrayAccess, Serializable {
+    class IdiormResultSet implements Countable, IteratorAggregate, ArrayAccess, Serializable
+    {
         /**
          * The current result set as an array
          * @var array
@@ -1896,7 +2092,8 @@
          * Optionally set the contents of the result set by passing in array
          * @param array $results
          */
-        public function __construct(array $results = array()) {
+        public function __construct(array $results = array())
+        {
             $this->set_results($results);
         }
 
@@ -1904,7 +2101,8 @@
          * Set the contents of the result set by passing in array
          * @param array $results
          */
-        public function set_results(array $results) {
+        public function set_results(array $results)
+        {
             $this->_results = $results;
         }
 
@@ -1912,7 +2110,8 @@
          * Get the current result set as an array
          * @return array
          */
-        public function get_results() {
+        public function get_results()
+        {
             return $this->_results;
         }
 
@@ -1920,15 +2119,17 @@
          * Get the current result set as an array
          * @return array
          */
-        public function as_array() {
+        public function as_array()
+        {
             return $this->get_results();
         }
-        
+
         /**
          * Get the number of records in the result set
          * @return int
          */
-        public function count() {
+        public function count()
+        {
             return count($this->_results);
         }
 
@@ -1937,7 +2138,8 @@
          * over the result set.
          * @return \ArrayIterator
          */
-        public function getIterator() {
+        public function getIterator()
+        {
             return new ArrayIterator($this->_results);
         }
 
@@ -1946,7 +2148,8 @@
          * @param int|string $offset
          * @return bool
          */
-        public function offsetExists($offset) {
+        public function offsetExists($offset)
+        {
             return isset($this->_results[$offset]);
         }
 
@@ -1955,16 +2158,18 @@
          * @param int|string $offset
          * @return mixed
          */
-        public function offsetGet($offset) {
+        public function offsetGet($offset)
+        {
             return $this->_results[$offset];
         }
-        
+
         /**
          * ArrayAccess
          * @param int|string $offset
          * @param mixed $value
          */
-        public function offsetSet($offset, $value) {
+        public function offsetSet($offset, $value)
+        {
             $this->_results[$offset] = $value;
         }
 
@@ -1972,7 +2177,8 @@
          * ArrayAccess
          * @param int|string $offset
          */
-        public function offsetUnset($offset) {
+        public function offsetUnset($offset)
+        {
             unset($this->_results[$offset]);
         }
 
@@ -1980,7 +2186,8 @@
          * Serializable
          * @return string
          */
-        public function serialize() {
+        public function serialize()
+        {
             return serialize($this->_results);
         }
 
@@ -1989,7 +2196,8 @@
          * @param string $serialized
          * @return array
          */
-        public function unserialize($serialized) {
+        public function unserialize($serialized)
+        {
             return unserialize($serialized);
         }
 
@@ -2002,10 +2210,12 @@
          * @param array $params
          * @return \IdiormResultSet
          */
-        public function __call($method, $params = array()) {
-            foreach($this->_results as $model) {
+        public function __call($method, $params = array())
+        {
+            foreach ($this->_results as $model) {
                 call_user_func_array(array($model, $method), $params);
             }
+
             return $this;
         }
     }
diff --git a/libraries/PHPMailer/PHPMailer.php b/libraries/PHPMailer/PHPMailer.php
index 929e9a2..f76ecac 100644
--- a/libraries/PHPMailer/PHPMailer.php
+++ b/libraries/PHPMailer/PHPMailer.php
@@ -40,8 +40,8 @@ if (version_compare(PHP_VERSION, '5.0.0', '<') ) exit("Sorry, this version of PH
  * PHP email creation and transport class
  * @package PHPMailer
  */
-class PHPMailer {
-
+class PHPMailer
+{
   /////////////////////////////////////////////////
   // PROPERTIES, PUBLIC
   /////////////////////////////////////////////////
@@ -171,7 +171,7 @@ class PHPMailer {
    * @var boolean
    */
   public $UseSendmailOptions  = true;
-  
+
   /**
    * Path to PHPMailer plugins.  Useful if the SMTP class
    * is in a different directory than the PHP include path.
@@ -264,7 +264,7 @@ class PHPMailer {
    *  @var string
    */
   public $AuthType      = '';
-  
+
   /**
    *  Sets SMTP realm.
    *  @var string
@@ -406,82 +406,82 @@ class PHPMailer {
    * @var SMTP An instance of the SMTP sender class
    * @access protected
    */
-  protected   $smtp           = null;
+  protected $smtp           = null;
   /**
    * @var array An array of 'to' addresses
    * @access protected
    */
-  protected   $to             = array();
+  protected $to             = array();
   /**
    * @var array An array of 'cc' addresses
    * @access protected
    */
-  protected   $cc             = array();
+  protected $cc             = array();
   /**
    * @var array An array of 'bcc' addresses
    * @access protected
    */
-  protected   $bcc            = array();
+  protected $bcc            = array();
   /**
    * @var array An array of reply-to name and address
    * @access protected
    */
-  protected   $ReplyTo        = array();
+  protected $ReplyTo        = array();
   /**
    * @var array An array of all kinds of addresses: to, cc, bcc, replyto
    * @access protected
    */
-  protected   $all_recipients = array();
+  protected $all_recipients = array();
   /**
    * @var array An array of attachments
    * @access protected
    */
-  protected   $attachment     = array();
+  protected $attachment     = array();
   /**
    * @var array An array of custom headers
    * @access protected
    */
-  protected   $CustomHeader   = array();
+  protected $CustomHeader   = array();
   /**
    * @var string The message's MIME type
    * @access protected
    */
-  protected   $message_type   = '';
+  protected $message_type   = '';
   /**
    * @var array An array of MIME boundary strings
    * @access protected
    */
-  protected   $boundary       = array();
+  protected $boundary       = array();
   /**
    * @var array An array of available languages
    * @access protected
    */
-  protected   $language       = array();
+  protected $language       = array();
   /**
    * @var integer The number of errors encountered
    * @access protected
    */
-  protected   $error_count    = 0;
+  protected $error_count    = 0;
   /**
    * @var string The filename of a DKIM certificate file
    * @access protected
    */
-  protected   $sign_cert_file = '';
+  protected $sign_cert_file = '';
   /**
    * @var string The filename of a DKIM key file
    * @access protected
    */
-  protected   $sign_key_file  = '';
+  protected $sign_key_file  = '';
   /**
    * @var string The password of a DKIM key
    * @access protected
    */
-  protected   $sign_key_pass  = '';
+  protected $sign_key_pass  = '';
   /**
    * @var boolean Whether to throw exceptions for errors
    * @access protected
    */
-  protected   $exceptions     = false;
+  protected $exceptions     = false;
 
   /////////////////////////////////////////////////
   // CONSTANTS
@@ -491,7 +491,7 @@ class PHPMailer {
   const STOP_CONTINUE = 1; // message?, likely ok to continue processing
   const STOP_CRITICAL = 2; // message, plus full stop, critical error reached
   const CRLF = "\r\n";     // SMTP RFC specified EOL
-  
+
   /////////////////////////////////////////////////
   // METHODS, VARIABLES
   /////////////////////////////////////////////////
@@ -509,12 +509,14 @@ class PHPMailer {
    * @access private
    * @return bool
    */
-  private function mail_passthru($to, $subject, $body, $header, $params) {
+  private function mail_passthru($to, $subject, $body, $header, $params)
+  {
     if ( ini_get('safe_mode') || !($this->UseSendmailOptions) ) {
         $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($subject)), $body, $header);
     } else {
         $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($subject)), $body, $header, $params);
     }
+
     return $rt;
   }
 
@@ -522,7 +524,8 @@ class PHPMailer {
    * Outputs debugging info via user-defined method
    * @param string $str
    */
-  private function edebug($str) {
+  private function edebug($str)
+  {
     if ($this->Debugoutput == "error_log") {
         error_log($str);
     } else {
@@ -534,7 +537,8 @@ class PHPMailer {
    * Constructor
    * @param boolean $exceptions Should we throw external exceptions?
    */
-  public function __construct($exceptions = false) {
+  public function __construct($exceptions = false)
+  {
     $this->exceptions = ($exceptions == true);
   }
 
@@ -543,7 +547,8 @@ class PHPMailer {
    * @param bool $ishtml
    * @return void
    */
-  public function IsHTML($ishtml = true) {
+  public function IsHTML($ishtml = true)
+  {
     if ($ishtml) {
       $this->ContentType = 'text/html';
     } else {
@@ -555,7 +560,8 @@ class PHPMailer {
    * Sets Mailer to send message using SMTP.
    * @return void
    */
-  public function IsSMTP() {
+  public function IsSMTP()
+  {
     $this->Mailer = 'smtp';
   }
 
@@ -563,7 +569,8 @@ class PHPMailer {
    * Sets Mailer to send message using PHP mail() function.
    * @return void
    */
-  public function IsMail() {
+  public function IsMail()
+  {
     $this->Mailer = 'mail';
   }
 
@@ -571,7 +578,8 @@ class PHPMailer {
    * Sets Mailer to send message using the $Sendmail program.
    * @return void
    */
-  public function IsSendmail() {
+  public function IsSendmail()
+  {
     if (!stristr(ini_get('sendmail_path'), 'sendmail')) {
       $this->Sendmail = '/var/qmail/bin/sendmail';
     }
@@ -582,7 +590,8 @@ class PHPMailer {
    * Sets Mailer to send message using the qmail MTA.
    * @return void
    */
-  public function IsQmail() {
+  public function IsQmail()
+  {
     if (stristr(ini_get('sendmail_path'), 'qmail')) {
       $this->Sendmail = '/var/qmail/bin/sendmail';
     }
@@ -599,7 +608,8 @@ class PHPMailer {
    * @param string $name
    * @return boolean true on success, false if address already used
    */
-  public function AddAddress($address, $name = '') {
+  public function AddAddress($address, $name = '')
+  {
     return $this->AddAnAddress('to', $address, $name);
   }
 
@@ -610,7 +620,8 @@ class PHPMailer {
    * @param string $name
    * @return boolean true on success, false if address already used
    */
-  public function AddCC($address, $name = '') {
+  public function AddCC($address, $name = '')
+  {
     return $this->AddAnAddress('cc', $address, $name);
   }
 
@@ -621,7 +632,8 @@ class PHPMailer {
    * @param string $name
    * @return boolean true on success, false if address already used
    */
-  public function AddBCC($address, $name = '') {
+  public function AddBCC($address, $name = '')
+  {
     return $this->AddAnAddress('bcc', $address, $name);
   }
 
@@ -631,7 +643,8 @@ class PHPMailer {
    * @param string $name
    * @return boolean
    */
-  public function AddReplyTo($address, $name = '') {
+  public function AddReplyTo($address, $name = '')
+  {
     return $this->AddAnAddress('Reply-To', $address, $name);
   }
 
@@ -645,7 +658,8 @@ class PHPMailer {
    * @return boolean true on success, false if address already used or invalid in some way
    * @access protected
    */
-  protected function AddAnAddress($kind, $address, $name = '') {
+  protected function AddAnAddress($kind, $address, $name = '')
+  {
     if (!preg_match('/^(to|cc|bcc|Reply-To)$/', $kind)) {
       $this->SetError($this->Lang('Invalid recipient array').': '.$kind);
       if ($this->exceptions) {
@@ -654,6 +668,7 @@ class PHPMailer {
       if ($this->SMTPDebug) {
         $this->edebug($this->Lang('Invalid recipient array').': '.$kind);
       }
+
       return false;
     }
     $address = trim($address);
@@ -666,20 +681,24 @@ class PHPMailer {
       if ($this->SMTPDebug) {
         $this->edebug($this->Lang('invalid_address').': '.$address);
       }
+
       return false;
     }
     if ($kind != 'Reply-To') {
       if (!isset($this->all_recipients[strtolower($address)])) {
         array_push($this->$kind, array($address, $name));
         $this->all_recipients[strtolower($address)] = true;
+
         return true;
       }
     } else {
       if (!array_key_exists(strtolower($address), $this->ReplyTo)) {
         $this->ReplyTo[strtolower($address)] = array($address, $name);
+
       return true;
     }
   }
+
   return false;
 }
 
@@ -691,7 +710,8 @@ class PHPMailer {
    * @throws phpmailerException
  * @return boolean
  */
-  public function SetFrom($address, $name = '', $auto = 1) {
+  public function SetFrom($address, $name = '', $auto = 1)
+  {
     $address = trim($address);
     $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
     if (!$this->ValidateAddress($address)) {
@@ -702,6 +722,7 @@ class PHPMailer {
       if ($this->SMTPDebug) {
         $this->edebug($this->Lang('invalid_address').': '.$address);
       }
+
       return false;
     }
     $this->From = $address;
@@ -714,6 +735,7 @@ class PHPMailer {
         $this->Sender = $address;
       }
     }
+
     return true;
   }
 
@@ -732,11 +754,12 @@ class PHPMailer {
    * @static
    * @access public
    */
-  public static function ValidateAddress($address) {
+  public static function ValidateAddress($address)
+  {
   if ((defined('PCRE_VERSION')) && (version_compare(PCRE_VERSION, '8.0') >= 0)) {
     return preg_match('/^(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){255,})(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){65,}@)((?>(?>(?>((?>(?>(?>\x0D\x0A)?[   ])+|(?>[  ]*\x0D\x0A)?[   ]+)?)(\((?>(?2)(?>[\x01-\x08\x0B\x0C\x0E-\'*-\[\]-\x7F]|\\\[\x00-\x7F]|(?3)))*(?2)\)))+(?2))|(?2))?)([!#-\'*+\/-9=?^-~-]+|"(?>(?2)(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\x7F]))*(?2)")(?>(?1)\.(?1)(?4))*(?1)@(?!(?1)[a-z0-9-]{64,})(?1)(?>([a-z0-9](?>[a-z0-9-]*[a-z0-9])?)(?>(?1)\.(?!(?1)[a-z0-9-]{64,})(?1)(?5)){0,126}|\[(?:(?>IPv6:(?>([a-f0-9]{1,4})(?>:(?6)){7}|(?!(?:.*[a-f0-9][:\]]){7,})((?6)(?>:(?6)){0,5})?::(?7)?))|(?>(?>IPv6:(?>(?6)(?>:(?6)){5}:|(?!(?:.*[a-f0-9]:){5,})(?8)?::(?>((?6)(?>:(?6)){0,3}):)?))?(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])(?>\.(?9)){3}))\])(?1)$/isD', $address);
   } elseif (function_exists('filter_var')) { //Introduced in PHP 5.2
-        if(filter_var($address, FILTER_VALIDATE_EMAIL) === FALSE) {
+        if (filter_var($address, FILTER_VALIDATE_EMAIL) === FALSE) {
           return false;
         } else {
           return true;
@@ -757,9 +780,11 @@ class PHPMailer {
    * @throws phpmailerException
    * @return bool
    */
-  public function Send() {
+  public function Send()
+  {
     try {
       if(!$this->PreSend()) return false;
+
       return $this->PostSend();
     } catch (phpmailerException $e) {
       $this->mailHeader = '';
@@ -767,6 +792,7 @@ class PHPMailer {
       if ($this->exceptions) {
         throw $e;
       }
+
       return false;
     }
   }
@@ -776,7 +802,8 @@ class PHPMailer {
    * @throws phpmailerException
    * @return bool
    */
-  public function PreSend() {
+  public function PreSend()
+  {
     try {
       $this->mailHeader = "";
       if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
@@ -784,7 +811,7 @@ class PHPMailer {
       }
 
       // Set whether the message is multipart/alternative
-      if(!empty($this->AltBody)) {
+      if (!empty($this->AltBody)) {
         $this->ContentType = 'multipart/alternative';
       }
 
@@ -807,7 +834,7 @@ class PHPMailer {
           $this->mailHeader .= $this->HeaderLine("To", "undisclosed-recipients:;");
         }
         $this->mailHeader .= $this->HeaderLine('Subject', $this->EncodeHeader($this->SecureHeader(trim($this->Subject))));
-        // if(count($this->cc) > 0) {
+        // if (count($this->cc) > 0) {
             // $this->mailHeader .= $this->AddrAppend("Cc", $this->cc);
         // }
       }
@@ -825,6 +852,7 @@ class PHPMailer {
       if ($this->exceptions) {
         throw $e;
       }
+
       return false;
     }
   }
@@ -835,10 +863,11 @@ class PHPMailer {
    * @throws phpmailerException
    * @return bool
    */
-  public function PostSend() {
+  public function PostSend()
+  {
     try {
       // Choose the mailer and send through it
-      switch($this->Mailer) {
+      switch ($this->Mailer) {
         case 'sendmail':
           return $this->SendmailSend($this->MIMEHeader, $this->MIMEBody);
         case 'smtp':
@@ -857,6 +886,7 @@ class PHPMailer {
         $this->edebug($e->getMessage()."\n");
       }
     }
+
     return false;
   }
 
@@ -868,7 +898,8 @@ class PHPMailer {
    * @access protected
    * @return bool
    */
-  protected function SendmailSend($header, $body) {
+  protected function SendmailSend($header, $body)
+  {
     if ($this->Sender != '') {
       $sendmail = sprintf("%s -oi -f%s -t", escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
     } else {
@@ -876,7 +907,7 @@ class PHPMailer {
     }
     if ($this->SingleTo === true) {
       foreach ($this->SingleToArray as $val) {
-        if(!@$mail = popen($sendmail, 'w')) {
+        if (!@$mail = popen($sendmail, 'w')) {
           throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
         }
         fputs($mail, "To: " . $val . "\n");
@@ -886,12 +917,12 @@ class PHPMailer {
         // implement call back function if it exists
         $isSent = ($result == 0) ? 1 : 0;
         $this->doCallback($isSent, $val, $this->cc, $this->bcc, $this->Subject, $body);
-        if($result != 0) {
+        if ($result != 0) {
           throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
         }
       }
     } else {
-      if(!@$mail = popen($sendmail, 'w')) {
+      if (!@$mail = popen($sendmail, 'w')) {
         throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
       }
       fputs($mail, $header);
@@ -900,10 +931,11 @@ class PHPMailer {
       // implement call back function if it exists
       $isSent = ($result == 0) ? 1 : 0;
       $this->doCallback($isSent, $this->to, $this->cc, $this->bcc, $this->Subject, $body);
-      if($result != 0) {
+      if ($result != 0) {
         throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
       }
     }
+
     return true;
   }
 
@@ -915,9 +947,10 @@ class PHPMailer {
    * @access protected
    * @return bool
    */
-  protected function MailSend($header, $body) {
+  protected function MailSend($header, $body)
+  {
     $toArr = array();
-    foreach($this->to as $t) {
+    foreach ($this->to as $t) {
       $toArr[] = $this->AddrFormat($t);
     }
     $to = implode(', ', $toArr);
@@ -948,9 +981,10 @@ class PHPMailer {
     if (isset($old_from)) {
       ini_set('sendmail_from', $old_from);
     }
-    if(!$rt) {
+    if (!$rt) {
       throw new phpmailerException($this->Lang('instantiate'), self::STOP_CRITICAL);
     }
+
     return true;
   }
 
@@ -964,21 +998,22 @@ class PHPMailer {
    * @access protected
    * @return bool
    */
-  protected function SmtpSend($header, $body) {
+  protected function SmtpSend($header, $body)
+  {
     require_once $this->PluginDir . 'class.smtp.php';
     $bad_rcpt = array();
 
-    if(!$this->SmtpConnect()) {
+    if (!$this->SmtpConnect()) {
       throw new phpmailerException($this->Lang('smtp_connect_failed'), self::STOP_CRITICAL);
     }
     $smtp_from = ($this->Sender == '') ? $this->From : $this->Sender;
-    if(!$this->smtp->Mail($smtp_from)) {
+    if (!$this->smtp->Mail($smtp_from)) {
       $this->SetError($this->Lang('from_failed') . $smtp_from . " : " . implode(",",$this->smtp->getError())) ;
       throw new phpmailerException($this->ErrorInfo, self::STOP_CRITICAL);
     }
 
     // Attempt to send attach all recipients
-    foreach($this->to as $to) {
+    foreach ($this->to as $to) {
       if (!$this->smtp->Recipient($to[0])) {
         $bad_rcpt[] = $to[0];
         // implement call back function if it exists
@@ -990,7 +1025,7 @@ class PHPMailer {
         $this->doCallback($isSent, $to[0], '', '', $this->Subject, $body);
       }
     }
-    foreach($this->cc as $cc) {
+    foreach ($this->cc as $cc) {
       if (!$this->smtp->Recipient($cc[0])) {
         $bad_rcpt[] = $cc[0];
         // implement call back function if it exists
@@ -1002,7 +1037,7 @@ class PHPMailer {
         $this->doCallback($isSent, '', $cc[0], '', $this->Subject, $body);
       }
     }
-    foreach($this->bcc as $bcc) {
+    foreach ($this->bcc as $bcc) {
       if (!$this->smtp->Recipient($bcc[0])) {
         $bad_rcpt[] = $bcc[0];
         // implement call back function if it exists
@@ -1020,15 +1055,16 @@ class PHPMailer {
       $badaddresses = implode(', ', $bad_rcpt);
       throw new phpmailerException($this->Lang('recipients_failed') . $badaddresses);
     }
-    if(!$this->smtp->Data($header . $body)) {
+    if (!$this->smtp->Data($header . $body)) {
       throw new phpmailerException($this->Lang('data_not_accepted'), self::STOP_CRITICAL);
     }
-    if($this->SMTPKeepAlive == true) {
+    if ($this->SMTPKeepAlive == true) {
       $this->smtp->Reset();
     } else {
         $this->smtp->Quit();
         $this->smtp->Close();
     }
+
     return true;
   }
 
@@ -1040,8 +1076,9 @@ class PHPMailer {
    * @throws phpmailerException
    * @return bool
    */
-  public function SmtpConnect() {
-    if(is_null($this->smtp)) {
+  public function SmtpConnect()
+  {
+    if (is_null($this->smtp)) {
       $this->smtp = new SMTP;
     }
 
@@ -1053,7 +1090,7 @@ class PHPMailer {
 
     // Retry while there is no connection
     try {
-      while($index < count($hosts) && !$connection) {
+      while ($index < count($hosts) && !$connection) {
         $hostinfo = array();
         if (preg_match('/^(.+):([0-9]+)$/', $hosts[$index], $hostinfo)) {
           $host = $hostinfo[1];
@@ -1099,6 +1136,7 @@ class PHPMailer {
         throw $e;
       }
     }
+
     return true;
   }
 
@@ -1106,9 +1144,10 @@ class PHPMailer {
    * Closes the active SMTP session if one exists.
    * @return void
    */
-  public function SmtpClose() {
+  public function SmtpClose()
+  {
     if ($this->smtp !== null) {
-      if($this->smtp->Connected()) {
+      if ($this->smtp->Connected()) {
         $this->smtp->Quit();
         $this->smtp->Close();
       }
@@ -1123,7 +1162,8 @@ class PHPMailer {
    * @return bool
   * @access public
   */
-  function SetLanguage($langcode = 'en', $lang_path = 'language/') {
+  public function SetLanguage($langcode = 'en', $lang_path = 'language/')
+  {
     //Define full set of translatable strings
     $PHPMAILER_LANG = array(
       'authenticate'         => 'SMTP Error: Could not authenticate.',
@@ -1151,6 +1191,7 @@ class PHPMailer {
       $l = @include $lang_path.'phpmailer.lang-'.$langcode.'.php';
     }
     $this->language = $PHPMAILER_LANG;
+
     return ($l == true); //Returns false if language not found
   }
 
@@ -1158,7 +1199,8 @@ class PHPMailer {
   * Return the current array of language strings
   * @return array
   */
-  public function GetTranslations() {
+  public function GetTranslations()
+  {
     return $this->language;
   }
 
@@ -1173,7 +1215,8 @@ class PHPMailer {
    * @param array $addr
    * @return string
    */
-  public function AddrAppend($type, $addr) {
+  public function AddrAppend($type, $addr)
+  {
     $addr_str = $type . ': ';
     $addresses = array();
     foreach ($addr as $a) {
@@ -1191,7 +1234,8 @@ class PHPMailer {
    * @param string $addr
    * @return string
    */
-  public function AddrFormat($addr) {
+  public function AddrFormat($addr)
+  {
     if (empty($addr[1])) {
       return $this->SecureHeader($addr[0]);
     } else {
@@ -1209,7 +1253,8 @@ class PHPMailer {
    * @access public
    * @return string
    */
-  public function WrapText($message, $length, $qp_mode = false) {
+  public function WrapText($message, $length, $qp_mode = false)
+  {
     $soft_break = ($qp_mode) ? sprintf(" =%s", $this->LE) : $this->LE;
     // If utf-8 encoding is used, we will need to make sure we don't
     // split multibyte characters when we wrap
@@ -1293,7 +1338,8 @@ class PHPMailer {
    * @param int    $maxLength   find last character boundary prior to this length
    * @return int
    */
-  public function UTF8CharBoundary($encodedText, $maxLength) {
+  public function UTF8CharBoundary($encodedText, $maxLength)
+  {
     $foundSplitPos = false;
     $lookBack = 3;
     while (!$foundSplitPos) {
@@ -1322,6 +1368,7 @@ class PHPMailer {
         $foundSplitPos = true;
       }
     }
+
     return $maxLength;
   }
 
@@ -1331,12 +1378,13 @@ class PHPMailer {
    * @access public
    * @return void
    */
-  public function SetWordWrap() {
-    if($this->WordWrap < 1) {
+  public function SetWordWrap()
+  {
+    if ($this->WordWrap < 1) {
       return;
     }
 
-    switch($this->message_type) {
+    switch ($this->message_type) {
       case 'alt':
       case 'alt_inline':
       case 'alt_attach':
@@ -1354,7 +1402,8 @@ class PHPMailer {
    * @access public
    * @return string The assembled header
    */
-  public function CreateHeader() {
+  public function CreateHeader()
+  {
     $result = '';
 
     // Set the boundaries
@@ -1378,13 +1427,13 @@ class PHPMailer {
     }
 
     // To be created automatically by mail()
-    if($this->Mailer != 'mail') {
+    if ($this->Mailer != 'mail') {
       if ($this->SingleTo === true) {
-        foreach($this->to as $t) {
+        foreach ($this->to as $t) {
           $this->SingleToArray[] = $this->AddrFormat($t);
         }
       } else {
-        if(count($this->to) > 0) {
+        if (count($this->to) > 0) {
           $result .= $this->AddrAppend('To', $this->to);
         } elseif (count($this->cc) == 0) {
           $result .= $this->HeaderLine('To', 'undisclosed-recipients:;');
@@ -1398,25 +1447,25 @@ class PHPMailer {
     $result .= $this->AddrAppend('From', $from);
 
     // sendmail and mail() extract Cc from the header before sending
-    if(count($this->cc) > 0) {
+    if (count($this->cc) > 0) {
       $result .= $this->AddrAppend('Cc', $this->cc);
     }
 
     // sendmail and mail() extract Bcc from the header before sending
-    if((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->bcc) > 0)) {
+    if ((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->bcc) > 0)) {
       $result .= $this->AddrAppend('Bcc', $this->bcc);
     }
 
-    if(count($this->ReplyTo) > 0) {
+    if (count($this->ReplyTo) > 0) {
       $result .= $this->AddrAppend('Reply-To', $this->ReplyTo);
     }
 
     // mail() sets the subject itself
-    if($this->Mailer != 'mail') {
+    if ($this->Mailer != 'mail') {
       $result .= $this->HeaderLine('Subject', $this->EncodeHeader($this->SecureHeader($this->Subject)));
     }
 
-    if($this->MessageID != '') {
+    if ($this->MessageID != '') {
       $result .= $this->HeaderLine('Message-ID', $this->MessageID);
     } else {
       $result .= sprintf("Message-ID: <%s@%s>%s", $uniq_id, $this->ServerHostname(), $this->LE);
@@ -1431,12 +1480,12 @@ class PHPMailer {
       }
     }
 
-    if($this->ConfirmReadingTo != '') {
+    if ($this->ConfirmReadingTo != '') {
       $result .= $this->HeaderLine('Disposition-Notification-To', '<' . trim($this->ConfirmReadingTo) . '>');
     }
 
     // Add custom headers
-    for($index = 0; $index < count($this->CustomHeader); $index++) {
+    for ($index = 0; $index < count($this->CustomHeader); $index++) {
       $result .= $this->HeaderLine(trim($this->CustomHeader[$index][0]), $this->EncodeHeader(trim($this->CustomHeader[$index][1])));
     }
     if (!$this->sign_key_file) {
@@ -1452,9 +1501,10 @@ class PHPMailer {
    * @access public
    * @return string
    */
-  public function GetMailMIME() {
+  public function GetMailMIME()
+  {
     $result = '';
-    switch($this->message_type) {
+    switch ($this->message_type) {
       case 'inline':
         $result .= $this->HeaderLine('Content-Type', 'multipart/related;');
         $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
@@ -1478,7 +1528,7 @@ class PHPMailer {
         break;
     }
 
-    if($this->Mailer != 'mail') {
+    if ($this->Mailer != 'mail') {
       $result .= $this->LE;
     }
 
@@ -1490,18 +1540,19 @@ class PHPMailer {
    * @access public
    * @return string
    */
-  public function GetSentMIMEMessage() {
+  public function GetSentMIMEMessage()
+  {
     return $this->MIMEHeader . $this->mailHeader . self::CRLF . $this->MIMEBody;
   }
 
-
   /**
    * Assembles the message body.  Returns an empty string on failure.
    * @access public
    * @throws phpmailerException
    * @return string The assembled message body
    */
-  public function CreateBody() {
+  public function CreateBody()
+  {
     $body = '';
 
     if ($this->sign_key_file) {
@@ -1510,7 +1561,7 @@ class PHPMailer {
 
     $this->SetWordWrap();
 
-    switch($this->message_type) {
+    switch ($this->message_type) {
       case 'inline':
         $body .= $this->GetBoundary($this->boundary[1], '', '', '');
         $body .= $this->EncodeString($this->Body, $this->Encoding);
@@ -1637,15 +1688,16 @@ class PHPMailer {
    * @param string $encoding
    * @return string
    */
-  protected function GetBoundary($boundary, $charSet, $contentType, $encoding) {
+  protected function GetBoundary($boundary, $charSet, $contentType, $encoding)
+  {
     $result = '';
-    if($charSet == '') {
+    if ($charSet == '') {
       $charSet = $this->CharSet;
     }
-    if($contentType == '') {
+    if ($contentType == '') {
       $contentType = $this->ContentType;
     }
-    if($encoding == '') {
+    if ($encoding == '') {
       $encoding = $this->Encoding;
     }
     $result .= $this->TextLine('--' . $boundary);
@@ -1663,7 +1715,8 @@ class PHPMailer {
    * @param string $boundary
    * @return string
    */
-  protected function EndBoundary($boundary) {
+  protected function EndBoundary($boundary)
+  {
     return $this->LE . '--' . $boundary . '--' . $this->LE;
   }
 
@@ -1672,7 +1725,8 @@ class PHPMailer {
    * @access protected
    * @return void
    */
-  protected function SetMessageType() {
+  protected function SetMessageType()
+  {
     $this->message_type = array();
     if($this->AlternativeExists()) $this->message_type[] = "alt";
     if($this->InlineImageExists()) $this->message_type[] = "inline";
@@ -1688,7 +1742,8 @@ class PHPMailer {
    * @param string $value
    * @return string
    */
-  public function HeaderLine($name, $value) {
+  public function HeaderLine($name, $value)
+  {
     return $name . ': ' . $value . $this->LE;
   }
 
@@ -1698,7 +1753,8 @@ class PHPMailer {
    * @param string $value
    * @return string
    */
-  public function TextLine($value) {
+  public function TextLine($value)
+  {
     return $value . $this->LE;
   }
 
@@ -1717,13 +1773,14 @@ class PHPMailer {
    * @throws phpmailerException
    * @return bool
    */
-  public function AddAttachment($path, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
+  public function AddAttachment($path, $name = '', $encoding = 'base64', $type = 'application/octet-stream')
+  {
     try {
       if ( !@is_file($path) ) {
         throw new phpmailerException($this->Lang('file_access') . $path, self::STOP_CONTINUE);
       }
       $filename = basename($path);
-      if ( $name == '' ) {
+      if ($name == '') {
         $name = $filename;
       }
 
@@ -1750,6 +1807,7 @@ class PHPMailer {
         return false;
       }
     }
+
     return true;
   }
 
@@ -1757,7 +1815,8 @@ class PHPMailer {
   * Return the current array of attachments
   * @return array
   */
-  public function GetAttachments() {
+  public function GetAttachments()
+  {
     return $this->attachment;
   }
 
@@ -1769,7 +1828,8 @@ class PHPMailer {
    * @param string $boundary
    * @return string
    */
-  protected function AttachAll($disposition_type, $boundary) {
+  protected function AttachAll($disposition_type, $boundary)
+  {
     // Return text of body
     $mime = array();
     $cidUniq = array();
@@ -1778,7 +1838,7 @@ class PHPMailer {
     // Add all attachments
     foreach ($this->attachment as $attachment) {
       // CHECK IF IT IS A VALID DISPOSITION_FILTER
-      if($attachment[6] == $disposition_type) {
+      if ($attachment[6] == $disposition_type) {
         // Check for string attachment
         $string = '';
         $path = '';
@@ -1805,22 +1865,22 @@ class PHPMailer {
         $mime[] = sprintf("Content-Type: %s; name=\"%s\"%s", $type, $this->EncodeHeader($this->SecureHeader($name)), $this->LE);
         $mime[] = sprintf("Content-Transfer-Encoding: %s%s", $encoding, $this->LE);
 
-        if($disposition == 'inline') {
+        if ($disposition == 'inline') {
           $mime[] = sprintf("Content-ID: <%s>%s", $cid, $this->LE);
         }
 
         $mime[] = sprintf("Content-Disposition: %s; filename=\"%s\"%s", $disposition, $this->EncodeHeader($this->SecureHeader($name)), $this->LE.$this->LE);
 
         // Encode as string attachment
-        if($bString) {
+        if ($bString) {
           $mime[] = $this->EncodeString($string, $encoding);
-          if($this->IsError()) {
+          if ($this->IsError()) {
             return '';
           }
           $mime[] = $this->LE.$this->LE;
         } else {
           $mime[] = $this->EncodeFile($path, $encoding);
-          if($this->IsError()) {
+          if ($this->IsError()) {
             return '';
           }
           $mime[] = $this->LE.$this->LE;
@@ -1843,7 +1903,8 @@ class PHPMailer {
    * @access protected
    * @return string
    */
-  protected function EncodeFile($path, $encoding = 'base64') {
+  protected function EncodeFile($path, $encoding = 'base64')
+  {
     try {
       if (!is_readable($path)) {
         throw new phpmailerException($this->Lang('file_open') . $path, self::STOP_CONTINUE);
@@ -1858,7 +1919,7 @@ class PHPMailer {
         if (version_compare(PHP_VERSION, '5.3.0', '<')) {
           set_magic_quotes_runtime(0);
         } else {
-          ini_set('magic_quotes_runtime', 0); 
+          ini_set('magic_quotes_runtime', 0);
         }
       }
       $file_buffer  = file_get_contents($path);
@@ -1867,12 +1928,14 @@ class PHPMailer {
         if (version_compare(PHP_VERSION, '5.3.0', '<')) {
           set_magic_quotes_runtime($magic_quotes);
         } else {
-          ini_set('magic_quotes_runtime', $magic_quotes); 
+          ini_set('magic_quotes_runtime', $magic_quotes);
         }
       }
+
       return $file_buffer;
     } catch (Exception $e) {
       $this->SetError($e->getMessage());
+
       return '';
     }
   }
@@ -1885,9 +1948,10 @@ class PHPMailer {
    * @access public
    * @return string
    */
-  public function EncodeString($str, $encoding = 'base64') {
+  public function EncodeString($str, $encoding = 'base64')
+  {
     $encoded = '';
-    switch(strtolower($encoding)) {
+    switch (strtolower($encoding)) {
       case 'base64':
         $encoded = chunk_split(base64_encode($str), 76, $this->LE);
         break;
@@ -1908,6 +1972,7 @@ class PHPMailer {
         $this->SetError($this->Lang('encoding') . $encoding);
         break;
     }
+
     return $encoded;
   }
 
@@ -1918,7 +1983,8 @@ class PHPMailer {
    * @param string $position
    * @return string
    */
-  public function EncodeHeader($str, $position = 'text') {
+  public function EncodeHeader($str, $position = 'text')
+  {
     $x = 0;
 
     switch (strtolower($position)) {
@@ -1979,10 +2045,12 @@ class PHPMailer {
    * @param string $str multi-byte text to wrap encode
    * @return bool
    */
-  public function HasMultiBytes($str) {
+  public function HasMultiBytes($str)
+  {
     if (function_exists('mb_strlen')) {
       return (strlen($str) > mb_strlen($str, $this->CharSet));
     } else { // Assume no multibytes (we can't handle without mbstring functions anyway)
+
       return false;
     }
   }
@@ -1996,7 +2064,8 @@ class PHPMailer {
    * @param string $lf string to use as linefeed/end-of-line
    * @return string
    */
-  public function Base64EncodeWrapMB($str, $lf=null) {
+  public function Base64EncodeWrapMB($str, $lf=null)
+  {
     $start = "=?".$this->CharSet."?B?";
     $end = "?=";
     $encoded = "";
@@ -2020,14 +2089,14 @@ class PHPMailer {
         $chunk = mb_substr($str, $i, $offset, $this->CharSet);
         $chunk = base64_encode($chunk);
         $lookBack++;
-      }
-      while (strlen($chunk) > $length);
+      } while (strlen($chunk) > $length);
 
       $encoded .= $chunk . $lf;
     }
 
     // Chomp the last linefeed
     $encoded = substr($encoded, 0, -strlen($lf));
+
     return $encoded;
   }
 
@@ -2041,37 +2110,38 @@ class PHPMailer {
    * @internal param string $string the text to encode
   * @return string
   */
-  public function EncodeQPphp( $input = '', $line_max = 76, $space_conv = false) {
+  public function EncodeQPphp( $input = '', $line_max = 76, $space_conv = false)
+  {
     $hex = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F');
     $lines = preg_split('/(?:\r\n|\r|\n)/', $input);
     $eol = "\r\n";
     $escape = '=';
     $output = '';
-    while( list(, $line) = each($lines) ) {
+    while ( list(, $line) = each($lines) ) {
       $linlen = strlen($line);
       $newline = '';
-      for($i = 0; $i < $linlen; $i++) {
+      for ($i = 0; $i < $linlen; $i++) {
         $c = substr( $line, $i, 1 );
         $dec = ord( $c );
         if ( ( $i == 0 ) && ( $dec == 46 ) ) { // convert first point in the line into =2E
           $c = '=2E';
         }
-        if ( $dec == 32 ) {
+        if ($dec == 32) {
           if ( $i == ( $linlen - 1 ) ) { // convert space at eol only
             $c = '=20';
-          } else if ( $space_conv ) {
+          } elseif ($space_conv) {
             $c = '=20';
           }
         } elseif ( ($dec == 61) || ($dec < 32 ) || ($dec > 126) ) { // always encode "\t", which is *not* required
-          $h2 = (integer)floor($dec/16);
-          $h1 = (integer)floor($dec%16);
+          $h2 = (integer) floor($dec/16);
+          $h1 = (integer) floor($dec%16);
           $c = $escape.$hex[$h2].$hex[$h1];
         }
         if ( (strlen($newline) + strlen($c)) >= $line_max ) { // CRLF is not counted
           $output .= $newline.$escape.$eol; //  soft line break; " =\r\n" is okay
           $newline = '';
           // check if newline first character will be point or not
-          if ( $dec == 46 ) {
+          if ($dec == 46) {
             $c = '=2E';
           }
         }
@@ -2079,6 +2149,7 @@ class PHPMailer {
       } // end of for
       $output .= $newline.$eol;
     } // end of while
+
     return $output;
   }
 
@@ -2094,12 +2165,15 @@ class PHPMailer {
   * @return string
   * @author Marcus Bointon
   */
-  public function EncodeQP($string, $line_max = 76, $space_conv = false) {
+  public function EncodeQP($string, $line_max = 76, $space_conv = false)
+  {
     if (function_exists('quoted_printable_encode')) { //Use native function if it's available (>= PHP5.3)
+
       return quoted_printable_encode($string);
     }
     $filters = stream_get_filters();
     if (!in_array('convert.*', $filters)) { //Got convert stream filter?
+
       return $this->EncodeQPphp($string, $line_max, $space_conv); //Fall back to old implementation
     }
     $fp = fopen('php://temp/', 'r+');
@@ -2112,6 +2186,7 @@ class PHPMailer {
     stream_filter_remove($s);
     $out = preg_replace('/^\./m', '=2E', $out); //Encode . if it is first char on a line, workaround for bug in Exchange
     fclose($fp);
+
     return $out;
   }
 
@@ -2123,7 +2198,8 @@ class PHPMailer {
    * @access public
    * @return string
    */
-  public function EncodeQ($str, $position = 'text') {
+  public function EncodeQ($str, $position = 'text')
+  {
     //There should not be any EOL in the string
   $pattern="";
     $encoded = str_replace(array("\r", "\n"), '', $str);
@@ -2144,13 +2220,13 @@ class PHPMailer {
         $pattern = '\075\000-\011\013\014\016-\037\077\137\177-\377' . $pattern;
         break;
     }
-    
+
     if (preg_match_all("/[{$pattern}]/", $encoded, $matches)) {
       foreach (array_unique($matches[0]) as $char) {
         $encoded = str_replace($char, '=' . sprintf('%02X', ord($char)), $encoded);
       }
     }
-    
+
     //Replace every spaces to _ (more readable than =20)
     return str_replace(' ', '_', $encoded);
 }
@@ -2166,7 +2242,8 @@ class PHPMailer {
    * @param string $type File extension (MIME) type.
    * @return void
    */
-  public function AddStringAttachment($string, $filename, $encoding = 'base64', $type = 'application/octet-stream') {
+  public function AddStringAttachment($string, $filename, $encoding = 'base64', $type = 'application/octet-stream')
+  {
     // Append to $attachment array
     $this->attachment[] = array(
       0 => $string,
@@ -2193,15 +2270,16 @@ class PHPMailer {
    * @param string $type File extension (MIME) type.
    * @return bool
    */
-  public function AddEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
-
+  public function AddEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = 'application/octet-stream')
+  {
     if ( !@is_file($path) ) {
       $this->SetError($this->Lang('file_access') . $path);
+
       return false;
     }
 
     $filename = basename($path);
-    if ( $name == '' ) {
+    if ($name == '') {
       $name = $filename;
     }
 
@@ -2233,7 +2311,8 @@ class PHPMailer {
    * @param string $type File extension (MIME) type.
    * @return bool
    */
-  public function AddStringEmbeddedImage($string, $cid, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
+  public function AddStringEmbeddedImage($string, $cid, $name = '', $encoding = 'base64', $type = 'application/octet-stream')
+  {
     // Append to $attachment array
     $this->attachment[] = array(
       0 => $string,
@@ -2252,12 +2331,14 @@ class PHPMailer {
    * @access public
    * @return bool
    */
-  public function InlineImageExists() {
-    foreach($this->attachment as $attachment) {
+  public function InlineImageExists()
+  {
+    foreach ($this->attachment as $attachment) {
       if ($attachment[6] == 'inline') {
         return true;
       }
     }
+
     return false;
   }
 
@@ -2265,12 +2346,14 @@ class PHPMailer {
    * Returns true if an attachment (non-inline) is present.
    * @return bool
    */
-  public function AttachmentExists() {
-    foreach($this->attachment as $attachment) {
+  public function AttachmentExists()
+  {
+    foreach ($this->attachment as $attachment) {
       if ($attachment[6] == 'attachment') {
         return true;
       }
     }
+
     return false;
   }
 
@@ -2278,7 +2361,8 @@ class PHPMailer {
    * Does this message have an alternative body set?
    * @return bool
    */
-  public function AlternativeExists() {
+  public function AlternativeExists()
+  {
     return !empty($this->AltBody);
   }
 
@@ -2290,8 +2374,9 @@ class PHPMailer {
    * Clears all recipients assigned in the TO array.  Returns void.
    * @return void
    */
-  public function ClearAddresses() {
-    foreach($this->to as $to) {
+  public function ClearAddresses()
+  {
+    foreach ($this->to as $to) {
       unset($this->all_recipients[strtolower($to[0])]);
     }
     $this->to = array();
@@ -2301,8 +2386,9 @@ class PHPMailer {
    * Clears all recipients assigned in the CC array.  Returns void.
    * @return void
    */
-  public function ClearCCs() {
-    foreach($this->cc as $cc) {
+  public function ClearCCs()
+  {
+    foreach ($this->cc as $cc) {
       unset($this->all_recipients[strtolower($cc[0])]);
     }
     $this->cc = array();
@@ -2312,8 +2398,9 @@ class PHPMailer {
    * Clears all recipients assigned in the BCC array.  Returns void.
    * @return void
    */
-  public function ClearBCCs() {
-    foreach($this->bcc as $bcc) {
+  public function ClearBCCs()
+  {
+    foreach ($this->bcc as $bcc) {
       unset($this->all_recipients[strtolower($bcc[0])]);
     }
     $this->bcc = array();
@@ -2323,7 +2410,8 @@ class PHPMailer {
    * Clears all recipients assigned in the ReplyTo array.  Returns void.
    * @return void
    */
-  public function ClearReplyTos() {
+  public function ClearReplyTos()
+  {
     $this->ReplyTo = array();
   }
 
@@ -2332,7 +2420,8 @@ class PHPMailer {
    * array.  Returns void.
    * @return void
    */
-  public function ClearAllRecipients() {
+  public function ClearAllRecipients()
+  {
     $this->to = array();
     $this->cc = array();
     $this->bcc = array();
@@ -2344,7 +2433,8 @@ class PHPMailer {
    * attachments.  Returns void.
    * @return void
    */
-  public function ClearAttachments() {
+  public function ClearAttachments()
+  {
     $this->attachment = array();
   }
 
@@ -2352,7 +2442,8 @@ class PHPMailer {
    * Clears all custom headers.  Returns void.
    * @return void
    */
-  public function ClearCustomHeaders() {
+  public function ClearCustomHeaders()
+  {
     $this->CustomHeader = array();
   }
 
@@ -2366,7 +2457,8 @@ class PHPMailer {
    * @param string $msg
    * @return void
    */
-  protected function SetError($msg) {
+  protected function SetError($msg)
+  {
     $this->error_count++;
     if ($this->Mailer == 'smtp' and !is_null($this->smtp)) {
       $lasterror = $this->smtp->getError();
@@ -2383,11 +2475,12 @@ class PHPMailer {
    * @return string
    * @static
    */
-  public static function RFCDate() {
+  public static function RFCDate()
+  {
     $tz = date('Z');
     $tzs = ($tz < 0) ? '-' : '+';
     $tz = abs($tz);
-    $tz = (int)($tz/3600)*100 + ($tz%3600)/60;
+    $tz = (int) ($tz/3600)*100 + ($tz%3600)/60;
     $result = sprintf("%s %s%04d", date('D, j M Y H:i:s'), $tzs, $tz);
 
     return $result;
@@ -2398,7 +2491,8 @@ class PHPMailer {
    * @access protected
    * @return string
    */
-  protected function ServerHostname() {
+  protected function ServerHostname()
+  {
     if (!empty($this->Hostname)) {
       $result = $this->Hostname;
     } elseif (isset($_SERVER['SERVER_NAME'])) {
@@ -2416,12 +2510,13 @@ class PHPMailer {
    * @param string $key
    * @return string
    */
-  protected function Lang($key) {
-    if(count($this->language) < 1) {
+  protected function Lang($key)
+  {
+    if (count($this->language) < 1) {
       $this->SetLanguage('en'); // set the default language
     }
 
-    if(isset($this->language[$key])) {
+    if (isset($this->language[$key])) {
       return $this->language[$key];
     } else {
       return 'Language string failed to load: ' . $key;
@@ -2433,7 +2528,8 @@ class PHPMailer {
    * @access public
    * @return bool
    */
-  public function IsError() {
+  public function IsError()
+  {
     return ($this->error_count > 0);
   }
 
@@ -2443,13 +2539,15 @@ class PHPMailer {
    * @param string $str String to FixEOL
    * @return string
    */
-  public function FixEOL($str) {
+  public function FixEOL($str)
+  {
   // condense down to \n
   $nstr = str_replace(array("\r\n", "\r"), "\n", $str);
   // Now convert LE as needed
   if ($this->LE !== "\n") {
     $nstr = str_replace("\n", $this->LE, $nstr);
   }
+
     return  $nstr;
   }
 
@@ -2461,7 +2559,8 @@ class PHPMailer {
    * @param string $value header value
    * @return void
    */
-  public function AddCustomHeader($name, $value=null) {
+  public function AddCustomHeader($name, $value=null)
+  {
   if ($value === null) {
     // Value passed in as name:value
     $this->CustomHeader[] = explode(':', $name, 2);
@@ -2477,10 +2576,11 @@ class PHPMailer {
    * @param string $basedir baseline directory for path
    * @return string $message
    */
-  public function MsgHTML($message, $basedir = '') {
+  public function MsgHTML($message, $basedir = '')
+  {
     preg_match_all("/(src|background)=[\"'](.*)[\"']/Ui", $message, $images);
-    if(isset($images[2])) {
-      foreach($images[2] as $i => $url) {
+    if (isset($images[2])) {
+      foreach ($images[2] as $i => $url) {
         // do not change urls for absolute images (thanks to corvuscorax)
         if (!preg_match('#^[A-z]+://#', $url)) {
           $filename = basename($url);
@@ -2510,6 +2610,7 @@ class PHPMailer {
     if (empty($this->AltBody)) {
       $this->AltBody = 'To view this email message, open it in a program that understands HTML!' . "\n\n";
     }
+
     return $message;
   }
 
@@ -2520,7 +2621,8 @@ class PHPMailer {
    * @return string MIME type of ext
    * @static
    */
-  public static function _mime_types($ext = '') {
+  public static function _mime_types($ext = '')
+  {
     $mimes = array(
       'xl'    =>  'application/excel',
       'hqx'   =>  'application/mac-binhex40',
@@ -2609,6 +2711,7 @@ class PHPMailer {
       'avi'   =>  'video/x-msvideo',
       'movie' =>  'video/x-sgi-movie'
     );
+
     return (!isset($mimes[strtolower($ext)])) ? 'application/octet-stream' : $mimes[strtolower($ext)];
   }
 
@@ -2626,7 +2729,8 @@ class PHPMailer {
    * @return bool
   * @todo Should this not be using __set() magic function?
   */
-  public function set($name, $value = '') {
+  public function set($name, $value = '')
+  {
     try {
       if (isset($this->$name) ) {
         $this->$name = $value;
@@ -2639,6 +2743,7 @@ class PHPMailer {
         return false;
       }
     }
+
     return true;
   }
 
@@ -2648,7 +2753,8 @@ class PHPMailer {
    * @param string $str String
    * @return string
    */
-  public function SecureHeader($str) {
+  public function SecureHeader($str)
+  {
     return trim(str_replace(array("\r", "\n"), '', $str));
   }
 
@@ -2660,7 +2766,8 @@ class PHPMailer {
    * @param string $key_filename Parameter File Name
    * @param string $key_pass Password for private key
    */
-  public function Sign($cert_filename, $key_filename, $key_pass) {
+  public function Sign($cert_filename, $key_filename, $key_pass)
+  {
     $this->sign_cert_file = $cert_filename;
     $this->sign_key_file = $key_filename;
     $this->sign_key_pass = $key_pass;
@@ -2673,7 +2780,8 @@ class PHPMailer {
    * @param string $txt
    * @return string
    */
-  public function DKIM_QP($txt) {
+  public function DKIM_QP($txt)
+  {
     $line = '';
     for ($i = 0; $i < strlen($txt); $i++) {
       $ord = ord($txt[$i]);
@@ -2683,6 +2791,7 @@ class PHPMailer {
         $line .= "=".sprintf("%02X", $ord);
       }
     }
+
     return $line;
   }
 
@@ -2693,7 +2802,8 @@ class PHPMailer {
    * @param string $s Header
    * @return string
    */
-  public function DKIM_Sign($s) {
+  public function DKIM_Sign($s)
+  {
     $privKeyStr = file_get_contents($this->DKIM_private);
     if ($this->DKIM_passphrase != '') {
       $privKey = openssl_pkey_get_private($privKeyStr, $this->DKIM_passphrase);
@@ -2703,6 +2813,7 @@ class PHPMailer {
     if (openssl_sign($s, $signature, $privKey)) {
       return base64_encode($signature);
     }
+
     return '';
   }
 
@@ -2713,7 +2824,8 @@ class PHPMailer {
    * @param string $s Header
    * @return string
    */
-  public function DKIM_HeaderC($s) {
+  public function DKIM_HeaderC($s)
+  {
     $s = preg_replace("/\r\n\s+/", " ", $s);
     $lines = explode("\r\n", $s);
     foreach ($lines as $key => $line) {
@@ -2723,6 +2835,7 @@ class PHPMailer {
       $lines[$key] = $heading.":".trim($value) ; // Don't forget to remove WSP around the value
     }
     $s = implode("\r\n", $lines);
+
     return $s;
   }
 
@@ -2733,7 +2846,8 @@ class PHPMailer {
    * @param string $body Message Body
    * @return string
    */
-  public function DKIM_BodyC($body) {
+  public function DKIM_BodyC($body)
+  {
     if ($body == '') return "\r\n";
     // stabilize line endings
     $body = str_replace("\r\n", "\n", $body);
@@ -2742,6 +2856,7 @@ class PHPMailer {
     while (substr($body, strlen($body) - 4, 4) == "\r\n\r\n") {
       $body = substr($body, 0, strlen($body) - 2);
     }
+
     return $body;
   }
 
@@ -2754,7 +2869,8 @@ class PHPMailer {
    * @param string $body Body
    * @return string
    */
-  public function DKIM_Add($headers_line, $subject, $body) {
+  public function DKIM_Add($headers_line, $subject, $body)
+  {
     $DKIMsignatureType    = 'rsa-sha1'; // Signature & hash algorithms
     $DKIMcanonicalization = 'relaxed/simple'; // Canonicalization of header/body
     $DKIMquery            = 'dns/txt'; // Query method
@@ -2763,7 +2879,7 @@ class PHPMailer {
     $headers              = explode($this->LE, $headers_line);
   $from_header          = "";
   $to_header            = "";
-    foreach($headers as $header) {
+    foreach ($headers as $header) {
       if (strpos($header, 'From:') === 0) {
         $from_header = $header;
       } elseif (strpos($header, 'To:') === 0) {
@@ -2788,6 +2904,7 @@ class PHPMailer {
                 "\tb=";
     $toSign   = $this->DKIM_HeaderC($from_header . "\r\n" . $to_header . "\r\n" . $subject_header . "\r\n" . $dkimhdrs);
     $signed   = $this->DKIM_Sign($toSign);
+
     return "X-PHPMAILER-DKIM: code.google.com/a/apache-extras.org/p/phpmailer/\r\n".$dkimhdrs.$signed."\r\n";
   }
 
@@ -2801,7 +2918,8 @@ class PHPMailer {
    * @param string $body
    * @param string $from
    */
-  protected function doCallback($isSent, $to, $cc, $bcc, $subject, $body, $from=null) {
+  protected function doCallback($isSent, $to, $cc, $bcc, $subject, $body, $from=null)
+  {
     if (!empty($this->action_function) && is_callable($this->action_function)) {
       $params = array($isSent, $to, $cc, $bcc, $subject, $body, $from);
       call_user_func_array($this->action_function, $params);
@@ -2813,14 +2931,16 @@ class PHPMailer {
  * Exception handler for PHPMailer
  * @package PHPMailer
  */
-class phpmailerException extends Exception {
+class phpmailerException extends Exception
+{
   /**
    * Prettify error message output
    * @return string
    */
-  public function errorMessage() {
+  public function errorMessage()
+  {
     $errorMsg = '<strong>' . $this->getMessage() . "</strong><br />\n";
+
     return $errorMsg;
   }
 }
-?>