ci-bonfire / Sprint

application/helpers/markdown_extended_helper.php

Indentation +140 added lines, -140 removed lines

@@ -1,98 +1,98 @@ 
 <?php
 
 if (! function_exists('Markdown')) {
-    require_once('markdown_helper.php');
+	require_once('markdown_helper.php');
 }
 define('MARKDOWNEXTRAEXTENDED_VERSION', "0.3");
 
 function MarkdownExtended($text, $default_classes = array())
 {
-    $parser = new MarkdownExtraExtended_Parser($default_classes);
-    return $parser->transform($text);
+	$parser = new MarkdownExtraExtended_Parser($default_classes);
+	return $parser->transform($text);
 }
 
 class MarkdownExtraExtended_Parser extends MarkdownExtra_Parser
 {
 
-    # Tags that are always treated as block tags:
-    var $block_tags_re = 'figure|figcaption|p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|form|fieldset|iframe|hr|legend';
-
-    var $default_classes;
-
-    function MarkdownExtraExtended_Parser($default_classes = array())
-    {
-        $default_classes = $default_classes;
-
-        $this->block_gamut += array(
-            "doFencedFigures" => 7,
-        );
-
-        parent::MarkdownExtra_Parser();
-    }
-
-    function transform($text)
-    {
-        $text = parent::transform($text);
-        return $text;
-    }
-
-    function doHardBreaks($text)
-    {
-        # Do hard breaks:
-        # EXTENDED: changed to allow breaks without two spaces and just one new line
-        # original code /* return preg_replace_callback('/ {2,}\n/', */
-        return preg_replace_callback(
-            '/ *\n/',
-            array(&$this, '_doHardBreaks_callback'),
-            $text
-        );
-    }
-
-    function doBlockQuotes($text)
-    {
-        $text = preg_replace_callback(
-            '/
+	# Tags that are always treated as block tags:
+	var $block_tags_re = 'figure|figcaption|p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|form|fieldset|iframe|hr|legend';
+
+	var $default_classes;
+
+	function MarkdownExtraExtended_Parser($default_classes = array())
+	{
+		$default_classes = $default_classes;
+
+		$this->block_gamut += array(
+			"doFencedFigures" => 7,
+		);
+
+		parent::MarkdownExtra_Parser();
+	}
+
+	function transform($text)
+	{
+		$text = parent::transform($text);
+		return $text;
+	}
+
+	function doHardBreaks($text)
+	{
+		# Do hard breaks:
+		# EXTENDED: changed to allow breaks without two spaces and just one new line
+		# original code /* return preg_replace_callback('/ {2,}\n/', */
+		return preg_replace_callback(
+			'/ *\n/',
+			array(&$this, '_doHardBreaks_callback'),
+			$text
+		);
+	}
+
+	function doBlockQuotes($text)
+	{
+		$text = preg_replace_callback(
+			'/
 			(?>^[ ]*>[ ]?
 				(?:\((.+?)\))?
 				[ ]*(.+\n(?:.+\n)*)
 			)+
 			/xm',
-            array(&$this, '_doBlockQuotes_callback'),
-            $text
-        );
-
-        return $text;
-    }
-
-    function _doBlockQuotes_callback($matches)
-    {
-        $cite = $matches[1];
-        $bq   = '> ' . $matches[2];
-        # trim one level of quoting - trim whitespace-only lines
-        $bq = preg_replace('/^[ ]*>[ ]?|^[ ]+$/m', '', $bq);
-        $bq = $this->runBlockGamut($bq); # recurse
-
-        $bq = preg_replace('/^/m', "  ", $bq);
-        # These leading spaces cause problem with <pre> content,
-        # so we need to fix that:
-        $bq = preg_replace_callback(
-            '{(\s*<pre>.+?</pre>)}sx',
-            array(&$this, '_doBlockQuotes_callback2'),
-            $bq
-        );
-
-        $res = "<blockquote";
-        $res .= empty($cite) ? ">" : " cite=\"$cite\">";
-        $res .= "\n$bq\n</blockquote>";
-        return "\n" . $this->hashBlock($res) . "\n\n";
-    }
-
-    function doFencedCodeBlocks($text)
-    {
-        $less_than_tab = $this->tab_width;
-
-        $text = preg_replace_callback(
-            '{
+			array(&$this, '_doBlockQuotes_callback'),
+			$text
+		);
+
+		return $text;
+	}
+
+	function _doBlockQuotes_callback($matches)
+	{
+		$cite = $matches[1];
+		$bq   = '> ' . $matches[2];
+		# trim one level of quoting - trim whitespace-only lines
+		$bq = preg_replace('/^[ ]*>[ ]?|^[ ]+$/m', '', $bq);
+		$bq = $this->runBlockGamut($bq); # recurse
+
+		$bq = preg_replace('/^/m', "  ", $bq);
+		# These leading spaces cause problem with <pre> content,
+		# so we need to fix that:
+		$bq = preg_replace_callback(
+			'{(\s*<pre>.+?</pre>)}sx',
+			array(&$this, '_doBlockQuotes_callback2'),
+			$bq
+		);
+
+		$res = "<blockquote";
+		$res .= empty($cite) ? ">" : " cite=\"$cite\">";
+		$res .= "\n$bq\n</blockquote>";
+		return "\n" . $this->hashBlock($res) . "\n\n";
+	}
+
+	function doFencedCodeBlocks($text)
+	{
+		$less_than_tab = $this->tab_width;
+
+		$text = preg_replace_callback(
+			'{
 				(?:\n|\A)
 				# 1: Opening marker
 				(
@@ -112,34 +112,34 @@ 
 				# Closing marker.
 				\1 [ ]* \n
 			}xm',
-            array(&$this, '_doFencedCodeBlocks_callback'),
-            $text
-        );
-
-        return $text;
-    }
-
-    function _doFencedCodeBlocks_callback($matches)
-    {
-        $codeblock = $matches[4];
-        $codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
-        $codeblock = preg_replace_callback(
-            '/^\n+/',
-            array(&$this, '_doFencedCodeBlocks_newlines'),
-            $codeblock
-        );
-        //$codeblock = "<pre><code>$codeblock</code></pre>";
-        //$cb = "<pre><code";
-        $cb = empty($matches[3]) ? "<pre><code" : "<pre class=\"linenums:$matches[3]\"><code";
-        $cb .= empty($matches[2]) ? ">" : " class=\"language-$matches[2]\">";
-        $cb .= "$codeblock</code></pre>";
-        return "\n\n" . $this->hashBlock($cb) . "\n\n";
-    }
-
-    function doFencedFigures($text)
-    {
-        $text = preg_replace_callback(
-            '{
+			array(&$this, '_doFencedCodeBlocks_callback'),
+			$text
+		);
+
+		return $text;
+	}
+
+	function _doFencedCodeBlocks_callback($matches)
+	{
+		$codeblock = $matches[4];
+		$codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
+		$codeblock = preg_replace_callback(
+			'/^\n+/',
+			array(&$this, '_doFencedCodeBlocks_newlines'),
+			$codeblock
+		);
+		//$codeblock = "<pre><code>$codeblock</code></pre>";
+		//$cb = "<pre><code";
+		$cb = empty($matches[3]) ? "<pre><code" : "<pre class=\"linenums:$matches[3]\"><code";
+		$cb .= empty($matches[2]) ? ">" : " class=\"language-$matches[2]\">";
+		$cb .= "$codeblock</code></pre>";
+		return "\n\n" . $this->hashBlock($cb) . "\n\n";
+	}
+
+	function doFencedFigures($text)
+	{
+		$text = preg_replace_callback(
+			'{
 			(?:\n|\A)
 			# 1: Opening marker
 			(
@@ -159,41 +159,41 @@ 
 			# Closing marker.
 			\1 [ ]?(?:\[([^\]]+)\])?[ ]* \n
 		}xm',
-            array(&$this, '_doFencedFigures_callback'),
-            $text
-        );
-
-        return $text;
-    }
-
-    function _doFencedFigures_callback($matches)
-    {
-        # get figcaption
-        $topcaption    = empty($matches[2]) ? null : $this->runBlockGamut($matches[2]);
-        $bottomcaption = empty($matches[5]) ? null : $this->runBlockGamut($matches[5]);
-        $figure        = $matches[3];
-        $figure        = $this->runBlockGamut($figure); # recurse
-
-        $figure = preg_replace('/^/m', "  ", $figure);
-        # These leading spaces cause problem with <pre> content,
-        # so we need to fix that - reuse blockqoute code to handle this:
-        $figure = preg_replace_callback(
-            '{(\s*<pre>.+?</pre>)}sx',
-            array(&$this, '_doBlockQuotes_callback2'),
-            $figure
-        );
-
-        $res = "<figure>";
-        if (!empty($topcaption)) {
-            $res .= "\n<figcaption>$topcaption</figcaption>";
-        }
-        $res .= "\n$figure\n";
-        if (!empty($bottomcaption) && empty($topcaption)) {
-            $res .= "<figcaption>$bottomcaption</figcaption>";
-        }
-        $res .= "</figure>";
-        return "\n" . $this->hashBlock($res) . "\n\n";
-    }
+			array(&$this, '_doFencedFigures_callback'),
+			$text
+		);
+
+		return $text;
+	}
+
+	function _doFencedFigures_callback($matches)
+	{
+		# get figcaption
+		$topcaption    = empty($matches[2]) ? null : $this->runBlockGamut($matches[2]);
+		$bottomcaption = empty($matches[5]) ? null : $this->runBlockGamut($matches[5]);
+		$figure        = $matches[3];
+		$figure        = $this->runBlockGamut($figure); # recurse
+
+		$figure = preg_replace('/^/m', "  ", $figure);
+		# These leading spaces cause problem with <pre> content,
+		# so we need to fix that - reuse blockqoute code to handle this:
+		$figure = preg_replace_callback(
+			'{(\s*<pre>.+?</pre>)}sx',
+			array(&$this, '_doBlockQuotes_callback2'),
+			$figure
+		);
+
+		$res = "<figure>";
+		if (!empty($topcaption)) {
+			$res .= "\n<figcaption>$topcaption</figcaption>";
+		}
+		$res .= "\n$figure\n";
+		if (!empty($bottomcaption) && empty($topcaption)) {
+			$res .= "<figcaption>$bottomcaption</figcaption>";
+		}
+		$res .= "</figure>";
+		return "\n" . $this->hashBlock($res) . "\n\n";
+	}
 }
 
 ?>

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (! function_exists('Markdown')) {
+if ( ! function_exists('Markdown')) {
     require_once('markdown_helper.php');
 }
 define('MARKDOWNEXTRAEXTENDED_VERSION', "0.3");
@@ -67,7 +67,7 @@ 
     function _doBlockQuotes_callback($matches)
     {
         $cite = $matches[1];
-        $bq   = '> ' . $matches[2];
+        $bq   = '> '.$matches[2];
         # trim one level of quoting - trim whitespace-only lines
         $bq = preg_replace('/^[ ]*>[ ]?|^[ ]+$/m', '', $bq);
         $bq = $this->runBlockGamut($bq); # recurse
@@ -84,7 +84,7 @@ 
         $res = "<blockquote";
         $res .= empty($cite) ? ">" : " cite=\"$cite\">";
         $res .= "\n$bq\n</blockquote>";
-        return "\n" . $this->hashBlock($res) . "\n\n";
+        return "\n".$this->hashBlock($res)."\n\n";
     }
 
     function doFencedCodeBlocks($text)
@@ -133,7 +133,7 @@ 
         $cb = empty($matches[3]) ? "<pre><code" : "<pre class=\"linenums:$matches[3]\"><code";
         $cb .= empty($matches[2]) ? ">" : " class=\"language-$matches[2]\">";
         $cb .= "$codeblock</code></pre>";
-        return "\n\n" . $this->hashBlock($cb) . "\n\n";
+        return "\n\n".$this->hashBlock($cb)."\n\n";
     }
 
     function doFencedFigures($text)
@@ -184,15 +184,15 @@ 
         );
 
         $res = "<figure>";
-        if (!empty($topcaption)) {
+        if ( ! empty($topcaption)) {
             $res .= "\n<figcaption>$topcaption</figcaption>";
         }
         $res .= "\n$figure\n";
-        if (!empty($bottomcaption) && empty($topcaption)) {
+        if ( ! empty($bottomcaption) && empty($topcaption)) {
             $res .= "<figcaption>$bottomcaption</figcaption>";
         }
         $res .= "</figure>";
-        return "\n" . $this->hashBlock($res) . "\n\n";
+        return "\n".$this->hashBlock($res)."\n\n";
     }
 }
 

application/language/english/application_lang.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 $lang['cron.invalid_task']      = 'Not a valid task.';
 $lang['cron.running_task']      = "Running task: %s...";
 $lang['cron.done_with_msg']     = "Done with message:\n%s\n";
-$lang['cron.not_scheduled_until']   = "'%s' Not scheduled to run until %s.";
+$lang['cron.not_scheduled_until'] = "'%s' Not scheduled to run until %s.";
 $lang['cron.nothing_scheduled'] = "No Tasks scheduled to run currently.";
 
 // Forge

application/libraries/MY_Form_validation.php

Indentation +112 added lines, -112 removed lines

@@ -3,117 +3,117 @@
 if (! class_exists('MY_Form_validation'))
 {
 
-    class MY_Form_validation extends CI_Form_validation {
-        /**
-         * @var object The CodeIgniter core object.
-         */
-        public $CI;
-
-        //--------------------------------------------------------------------
-
-        /**
-         * Check if the field has an error associated with it.
-         *
-         * @param string $field The name of the field
-         *
-         * @return bool
-         */
-        public function has_error( $field = NULL )
-        {
-            if ( empty( $field ) )
-            {
-                return FALSE;
-            }
-
-            return ! empty( $this->_field_data[ $field ]['error'] );
-        }
-
-        //--------------------------------------------------------------------
-
-        /**
-         * Performs the actual form validation
-         *
-         * @param string $module Name of the module
-         * @param string $group Name of the group array containing the rules
-         *
-         * @return bool Success or Failure
-         */
-        public function run($group = '', $module = '')
-        {
-            is_object($module) && $this->CI =& $module;
-            return parent::run($group);
-        }
-
-        //--------------------------------------------------------------------
-
-        //--------------------------------------------------------------------
-        // Validation Rules
-        //--------------------------------------------------------------------
-
-        /**
-         * Checks that a value is unique in the database.
-         *
-         * i.e. '…|required|unique[users.name,users.id]|trim…'
-         *
-         * <code>
-         * "unique[tablename.fieldname,tablename.(primaryKey-used-for-updates)]"
-         * </code>
-         *
-         * @author Adapted from Burak Guzel <http://net.tutsplus.com/tutorials/php/6-codeigniter-hacks-for-the-masters/>
-         *
-         * @param mixed $value The value to be checked.
-         * @param mixed $params The table and field to check against, if a second
-         * field is passed in this is used as "AND NOT EQUAL".
-         *
-         * @return bool True if the value is unique for that field, else false.
-         */
-        public function is_unique( $value, $params )
-        {
-            if ( empty( $this->CI->db ) )
-            {
-                $this->CI->load->database();
-            }
-
-            // Allow for more than 1 parameter.
-            $fields = explode( ",", $params );
-
-            // Extract the table and field from the first parameter.
-            list( $table, $field ) = explode( '.', $fields[0], 2 );
-
-            // Setup the db request.
-            $this->CI->db->select( $field )
-                         ->from( $table )
-                         ->where( $field, $value )
-                         ->limit( 1 );
-
-            // Check whether a second parameter was passed to be used as an
-            // "AND NOT EQUAL" where clause
-            // eg "select * from users where users.name='test' AND users.id != 4
-            if ( isset( $fields[1] ) )
-            {
-                // Extract the table and field from the second parameter
-                list( $where_table, $where_field ) = explode( '.', $fields[1], 2 );
-
-                // Get the value from the post's $where_field. If the value is set,
-                // add "AND NOT EQUAL" where clause.
-                $where_value = $this->CI->input->post( $where_field );
-                if ( isset( $where_value ) )
-                {
-                    $this->CI->db->where( "{$where_table}.{$where_field} !=", $where_value );
-                }
-            }
-
-            // If any rows are returned from the database, validation fails
-            $query = $this->CI->db->get();
-            if ( $query->row() )
-            {
-                $this->CI->form_validation->set_message( 'unique', 'The %s field is already in use.' );
-
-                return FALSE;
-            }
-
-            return TRUE;
-        }
-    }
+	class MY_Form_validation extends CI_Form_validation {
+		/**
+		 * @var object The CodeIgniter core object.
+		 */
+		public $CI;
+
+		//--------------------------------------------------------------------
+
+		/**
+		 * Check if the field has an error associated with it.
+		 *
+		 * @param string $field The name of the field
+		 *
+		 * @return bool
+		 */
+		public function has_error( $field = NULL )
+		{
+			if ( empty( $field ) )
+			{
+				return FALSE;
+			}
+
+			return ! empty( $this->_field_data[ $field ]['error'] );
+		}
+
+		//--------------------------------------------------------------------
+
+		/**
+		 * Performs the actual form validation
+		 *
+		 * @param string $module Name of the module
+		 * @param string $group Name of the group array containing the rules
+		 *
+		 * @return bool Success or Failure
+		 */
+		public function run($group = '', $module = '')
+		{
+			is_object($module) && $this->CI =& $module;
+			return parent::run($group);
+		}
+
+		//--------------------------------------------------------------------
+
+		//--------------------------------------------------------------------
+		// Validation Rules
+		//--------------------------------------------------------------------
+
+		/**
+		 * Checks that a value is unique in the database.
+		 *
+		 * i.e. '…|required|unique[users.name,users.id]|trim…'
+		 *
+		 * <code>
+		 * "unique[tablename.fieldname,tablename.(primaryKey-used-for-updates)]"
+		 * </code>
+		 *
+		 * @author Adapted from Burak Guzel <http://net.tutsplus.com/tutorials/php/6-codeigniter-hacks-for-the-masters/>
+		 *
+		 * @param mixed $value The value to be checked.
+		 * @param mixed $params The table and field to check against, if a second
+		 * field is passed in this is used as "AND NOT EQUAL".
+		 *
+		 * @return bool True if the value is unique for that field, else false.
+		 */
+		public function is_unique( $value, $params )
+		{
+			if ( empty( $this->CI->db ) )
+			{
+				$this->CI->load->database();
+			}
+
+			// Allow for more than 1 parameter.
+			$fields = explode( ",", $params );
+
+			// Extract the table and field from the first parameter.
+			list( $table, $field ) = explode( '.', $fields[0], 2 );
+
+			// Setup the db request.
+			$this->CI->db->select( $field )
+						 ->from( $table )
+						 ->where( $field, $value )
+						 ->limit( 1 );
+
+			// Check whether a second parameter was passed to be used as an
+			// "AND NOT EQUAL" where clause
+			// eg "select * from users where users.name='test' AND users.id != 4
+			if ( isset( $fields[1] ) )
+			{
+				// Extract the table and field from the second parameter
+				list( $where_table, $where_field ) = explode( '.', $fields[1], 2 );
+
+				// Get the value from the post's $where_field. If the value is set,
+				// add "AND NOT EQUAL" where clause.
+				$where_value = $this->CI->input->post( $where_field );
+				if ( isset( $where_value ) )
+				{
+					$this->CI->db->where( "{$where_table}.{$where_field} !=", $where_value );
+				}
+			}
+
+			// If any rows are returned from the database, validation fails
+			$query = $this->CI->db->get();
+			if ( $query->row() )
+			{
+				$this->CI->form_validation->set_message( 'unique', 'The %s field is already in use.' );
+
+				return FALSE;
+			}
+
+			return TRUE;
+		}
+	}
 
 }

Spacing +20 added lines, -20 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (! class_exists('MY_Form_validation'))
+if ( ! class_exists('MY_Form_validation'))
 {
 
     class MY_Form_validation extends CI_Form_validation {
@@ -18,14 +18,14 @@ 
          *
          * @return bool
          */
-        public function has_error( $field = NULL )
+        public function has_error($field = NULL)
         {
-            if ( empty( $field ) )
+            if (empty($field))
             {
                 return FALSE;
             }
 
-            return ! empty( $this->_field_data[ $field ]['error'] );
+            return ! empty($this->_field_data[$field]['error']);
         }
 
         //--------------------------------------------------------------------
@@ -40,7 +40,7 @@ 
          */
         public function run($group = '', $module = '')
         {
-            is_object($module) && $this->CI =& $module;
+            is_object($module) && $this->CI = & $module;
             return parent::run($group);
         }
 
@@ -67,47 +67,47 @@ 
          *
          * @return bool True if the value is unique for that field, else false.
          */
-        public function is_unique( $value, $params )
+        public function is_unique($value, $params)
         {
-            if ( empty( $this->CI->db ) )
+            if (empty($this->CI->db))
             {
                 $this->CI->load->database();
             }
 
             // Allow for more than 1 parameter.
-            $fields = explode( ",", $params );
+            $fields = explode(",", $params);
 
             // Extract the table and field from the first parameter.
-            list( $table, $field ) = explode( '.', $fields[0], 2 );
+            list($table, $field) = explode('.', $fields[0], 2);
 
             // Setup the db request.
-            $this->CI->db->select( $field )
-                         ->from( $table )
-                         ->where( $field, $value )
-                         ->limit( 1 );
+            $this->CI->db->select($field)
+                         ->from($table)
+                         ->where($field, $value)
+                         ->limit(1);
 
             // Check whether a second parameter was passed to be used as an
             // "AND NOT EQUAL" where clause
             // eg "select * from users where users.name='test' AND users.id != 4
-            if ( isset( $fields[1] ) )
+            if (isset($fields[1]))
             {
                 // Extract the table and field from the second parameter
-                list( $where_table, $where_field ) = explode( '.', $fields[1], 2 );
+                list($where_table, $where_field) = explode('.', $fields[1], 2);
 
                 // Get the value from the post's $where_field. If the value is set,
                 // add "AND NOT EQUAL" where clause.
-                $where_value = $this->CI->input->post( $where_field );
-                if ( isset( $where_value ) )
+                $where_value = $this->CI->input->post($where_field);
+                if (isset($where_value))
                 {
-                    $this->CI->db->where( "{$where_table}.{$where_field} !=", $where_value );
+                    $this->CI->db->where("{$where_table}.{$where_field} !=", $where_value);
                 }
             }
 
             // If any rows are returned from the database, validation fails
             $query = $this->CI->db->get();
-            if ( $query->row() )
+            if ($query->row())
             {
-                $this->CI->form_validation->set_message( 'unique', 'The %s field is already in use.' );
+                $this->CI->form_validation->set_message('unique', 'The %s field is already in use.');
 
                 return FALSE;
             }

application/mailers/CronMailer.php

Indentation +28 added lines, -28 removed lines

@@ -2,33 +2,33 @@
 
 class CronMailer extends \Myth\Mail\BaseMailer {
 
-    protected $from     = null;
-    protected $to       = null;
-
-    public function __construct()
-    {
-        $this->from = [ config_item('site.auth_email'), config_item('site.name') ];
-        $this->to   = config_item('site.auth_email');
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sends the output from the cronjob to the admin.
-     *
-     * @param $output
-     */
-    public function results($output=null)
-    {
-        $data = [
-            'output' => $output,
-            'site_name' => config_item('site.name')
-        ];
-
-        // Send it immediately - don't queue.
-        return $this->send($this->to, "Cron Results from ". config_item('site.name'), $data);
-    }
-
-    //--------------------------------------------------------------------
+	protected $from     = null;
+	protected $to       = null;
+
+	public function __construct()
+	{
+		$this->from = [ config_item('site.auth_email'), config_item('site.name') ];
+		$this->to   = config_item('site.auth_email');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sends the output from the cronjob to the admin.
+	 *
+	 * @param $output
+	 */
+	public function results($output=null)
+	{
+		$data = [
+			'output' => $output,
+			'site_name' => config_item('site.name')
+		];
+
+		// Send it immediately - don't queue.
+		return $this->send($this->to, "Cron Results from ". config_item('site.name'), $data);
+	}
+
+	//--------------------------------------------------------------------
 
 }

Spacing +3 added lines, -3 removed lines

@@ -7,7 +7,7 @@ 
 
     public function __construct()
     {
-        $this->from = [ config_item('site.auth_email'), config_item('site.name') ];
+        $this->from = [config_item('site.auth_email'), config_item('site.name')];
         $this->to   = config_item('site.auth_email');
     }
 
@@ -18,7 +18,7 @@ 
      *
      * @param $output
      */
-    public function results($output=null)
+    public function results($output = null)
     {
         $data = [
             'output' => $output,
@@ -26,7 +26,7 @@ 
         ];
 
         // Send it immediately - don't queue.
-        return $this->send($this->to, "Cron Results from ". config_item('site.name'), $data);
+        return $this->send($this->to, "Cron Results from ".config_item('site.name'), $data);
     }
 
     //--------------------------------------------------------------------

application/mailers/UserMailer.php

Indentation +70 added lines, -70 removed lines

@@ -2,85 +2,85 @@
 
 class UserMailer extends \Myth\Mail\BaseMailer {
 
-    protected $from     = null;
-    protected $to       = null;
+	protected $from     = null;
+	protected $to       = null;
 
-    public function __construct()
-    {
-        $this->from = [ config_item('site.auth_email'), config_item('site.name') ];
-    }
+	public function __construct()
+	{
+		$this->from = [ config_item('site.auth_email'), config_item('site.name') ];
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Sends the output from the cronjob to the admin.
-     *
-     * The params array contains:
-     *  - user_id
-     *  - email
-     *  - token
-     *
-     * @param $params
-     * @return bool
-     */
-    public function didRegister($params=null)
-    {
-        $data = [
-            'user_id'   => $params['user_id'],
-            'email'     => $params['email'],
-            'link'      => site_url( \Myth\Route::named('activate_user') ),
-            'token'     => $params['token'],
-            'site_name' => config_item('site.name'),
-            'site_link' => site_url()
-        ];
+	/**
+	 * Sends the output from the cronjob to the admin.
+	 *
+	 * The params array contains:
+	 *  - user_id
+	 *  - email
+	 *  - token
+	 *
+	 * @param $params
+	 * @return bool
+	 */
+	public function didRegister($params=null)
+	{
+		$data = [
+			'user_id'   => $params['user_id'],
+			'email'     => $params['email'],
+			'link'      => site_url( \Myth\Route::named('activate_user') ),
+			'token'     => $params['token'],
+			'site_name' => config_item('site.name'),
+			'site_link' => site_url()
+		];
 
-        // Send it immediately - don't queue.
-        return $this->send($params['email'], lang('auth.register_subject'), $data);
-    }
+		// Send it immediately - don't queue.
+		return $this->send($params['email'], lang('auth.register_subject'), $data);
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Sends the Password Reset Instructions email.
-     *
-     * @param array  $user
-     * @param string $token
-     * @return bool
-     */
-    public function remindUser($user, $token)
-    {
-        $data = [
-            'email' => $user['email'],
-            'code'  => $token,
-            'link'  => site_url( \Myth\Route::named('reset_pass') ),
-            'site_name' => config_item('site.name'),
-            'site_link' => site_url()
-        ];
+	/**
+	 * Sends the Password Reset Instructions email.
+	 *
+	 * @param array  $user
+	 * @param string $token
+	 * @return bool
+	 */
+	public function remindUser($user, $token)
+	{
+		$data = [
+			'email' => $user['email'],
+			'code'  => $token,
+			'link'  => site_url( \Myth\Route::named('reset_pass') ),
+			'site_name' => config_item('site.name'),
+			'site_link' => site_url()
+		];
 
-        // Send it immediately - don't queue.
-        return $this->send($user['email'], lang('auth.remind_subject'), $data);
-    }
+		// Send it immediately - don't queue.
+		return $this->send($user['email'], lang('auth.remind_subject'), $data);
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Sends the Password Reset Confirmation email.
-     *
-     * @param array  $user
-     * @return bool
-     */
-    public function resetPassword($user)
-    {
-        $data = [
-            'email' => $user['email'],
-            'link'  => site_url( \Myth\Route::named('forgot_pass') ),
-            'site_name' => config_item('site.name'),
-            'site_link' => site_url()
-        ];
+	/**
+	 * Sends the Password Reset Confirmation email.
+	 *
+	 * @param array  $user
+	 * @return bool
+	 */
+	public function resetPassword($user)
+	{
+		$data = [
+			'email' => $user['email'],
+			'link'  => site_url( \Myth\Route::named('forgot_pass') ),
+			'site_name' => config_item('site.name'),
+			'site_link' => site_url()
+		];
 
-        // Send it immediately - don't queue.
-        return $this->send($user['email'], lang('auth.reset_subject'), $data);
-    }
+		// Send it immediately - don't queue.
+		return $this->send($user['email'], lang('auth.reset_subject'), $data);
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 }

Spacing +5 added lines, -5 removed lines

@@ -7,7 +7,7 @@ 
 
     public function __construct()
     {
-        $this->from = [ config_item('site.auth_email'), config_item('site.name') ];
+        $this->from = [config_item('site.auth_email'), config_item('site.name')];
     }
 
     //--------------------------------------------------------------------
@@ -23,12 +23,12 @@ 
      * @param $params
      * @return bool
      */
-    public function didRegister($params=null)
+    public function didRegister($params = null)
     {
         $data = [
             'user_id'   => $params['user_id'],
             'email'     => $params['email'],
-            'link'      => site_url( \Myth\Route::named('activate_user') ),
+            'link'      => site_url(\Myth\Route::named('activate_user')),
             'token'     => $params['token'],
             'site_name' => config_item('site.name'),
             'site_link' => site_url()
@@ -52,7 +52,7 @@ 
         $data = [
             'email' => $user['email'],
             'code'  => $token,
-            'link'  => site_url( \Myth\Route::named('reset_pass') ),
+            'link'  => site_url(\Myth\Route::named('reset_pass')),
             'site_name' => config_item('site.name'),
             'site_link' => site_url()
         ];
@@ -73,7 +73,7 @@ 
     {
         $data = [
             'email' => $user['email'],
-            'link'  => site_url( \Myth\Route::named('forgot_pass') ),
+            'link'  => site_url(\Myth\Route::named('forgot_pass')),
             'site_name' => config_item('site.name'),
             'site_link' => site_url()
         ];

application/third_party/HMVC/Router.php

Indentation +302 added lines, -302 removed lines

@@ -1,310 +1,310 @@
 <?php
 /**
- * @name		CodeIgniter HMVC Modules
- * @author		Jens Segers
- * @link		http://www.jenssegers.be
- * @license		MIT License Copyright (c) 2012 Jens Segers
- *
- * @author      hArpanet
- * @link        http://harpanet.com
- *              Updated for CI 3.0-dev.
- *              Added _set_default_controller() to allow default_controller
- *              (specified in config/routes.php) to reside in a module of the same name.
- *
- * Inspired by wiredesignz's HMVC Router.
- * https://bitbucket.org/wiredesignz/codeigniter-modular-extensions-hmvc/
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
+	 * @name		CodeIgniter HMVC Modules
+	 * @author		Jens Segers
+	 * @link		http://www.jenssegers.be
+	 * @license		MIT License Copyright (c) 2012 Jens Segers
+	 *
+	 * @author      hArpanet
+	 * @link        http://harpanet.com
+	 *              Updated for CI 3.0-dev.
+	 *              Added _set_default_controller() to allow default_controller
+	 *              (specified in config/routes.php) to reside in a module of the same name.
+	 *
+	 * Inspired by wiredesignz's HMVC Router.
+	 * https://bitbucket.org/wiredesignz/codeigniter-modular-extensions-hmvc/
+	 *
+	 * Permission is hereby granted, free of charge, to any person obtaining a copy
+	 * of this software and associated documentation files (the "Software"), to deal
+	 * in the Software without restriction, including without limitation the rights
+	 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+	 * copies of the Software, and to permit persons to whom the Software is
+	 * furnished to do so, subject to the following conditions:
+	 *
+	 * The above copyright notice and this permission notice shall be included in
+	 * all copies or substantial portions of the Software.
+	 *
+	 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+	 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+	 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+	 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+	 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+	 * THE SOFTWARE.
+	 */
 
 if (!defined("BASEPATH"))
-    exit("No direct script access allowed");
+	exit("No direct script access allowed");
 
 class HMVC_Router extends CI_Router {
 
-    /**
-     * Current module name
-     *
-     * @var string
-     * @access public
-     */
-    var $module = '';
-
-    /**
-     * Constructor
-     *
-     * Runs the route mapping function.
-     */
-    function __construct() {
-
-        $this->config =& load_class('Config', 'core');
-
-        // Process 'modules_locations' from config
-        $locations = $this->config->item('modules_locations');
-
-        if (!$locations) {
-            $locations = array(APPPATH . 'modules/');
-        } else if (!is_array($locations)) {
-            $locations = array($locations);
-        }
-
-        // Make sure all paths are the same format
-        foreach ($locations as &$location) {
-            $location = realpath($location);
-            $location = str_replace('\\', '/', $location);
-            $location = rtrim($location, '/') . '/';
-        }
-
-        $this->config->set_item('modules_locations', $locations);
-
-
-        parent::__construct();
-    }
-
-    /**
-     * Validates the supplied segments.  Attempts to determine the path to
-     * the controller.
-     *
-     * @access	private
-     * @param	array
-     * @return	array
-     */
-    function _validate_request($segments) {
-        if (count($segments) == 0) {
-            return $segments;
-        }
-
-        // Locate the controller with modules support
-        if ($located = $this->locate($segments)) {
-            return $located;
-        }
-
-        // Is there a 404 override?
-        if (!empty($this->routes['404_override'])) {
-            $segments = explode('/', $this->routes['404_override']);
-            if ($located = $this->locate($segments)) {
-                return $located;
-            }
-        }
-
-        // Nothing else to do at this point but show a 404
-        show_404($segments[0]);
-    }
-
-    /**
-     * Parse Routes
-     *
-     * This function matches any routes that may exist in
-     * the config/routes.php file against the URI to
-     * determine if the class/method need to be remapped.
-     *
-     * NOTE: The first segment must stay the name of the
-     * module, otherwise it is impossible to detect
-     * the current module in this method.
-     *
-     * @access	private
-     * @return	void
-     */
-    function _parse_routes() {
-        // Apply the current module's routing config
-
-        // CI v3.x has URI starting at segment 1
-        $segstart = (intval(substr(CI_VERSION,0,1)) > 2) ? 1 : 0;
-
-        if ($module = $this->uri->segment($segstart)) {
-            foreach ($this->config->item('modules_locations') as $location) {
-                if (is_file($file = $location . $module . '/config/routes.php')) {
-                    include ($file);
-
-                    $route = (!isset($route) or !is_array($route)) ? array() : $route;
-                    $this->routes = array_merge($this->routes, $route);
-                    unset($route);
-                }
-            }
-        }
-
-        // Let parent do the heavy routing
-        return parent::_parse_routes();
-    }
-
-    /**
-     * The logic of locating a controller is grouped in this function
-     *
-     * @param	array
-     * @return	array
-     */
-    function locate($segments) {
-        // anon function to ucfirst a string if CI ver > 2 (for backwards compatibility)
-        $_ucfirst = function($cn) {return (intval(substr(CI_VERSION,0,1)) > 2) ? ucfirst($cn) : $cn;};
-
-        list($module, $directory, $controller) = array_pad($segments, 3, NULL);
-
-        // Look for it in the standar APPPATH/controllers first so that it can override modules.
-        $c = count($segments);
-        $s = $segments;
-        // Loop through our segments and return as soon as a controller
-        // is found or when such a directory doesn't exist
-        while ($c-- > 0)
-        {
-            $test = $this->directory
-                    .ucfirst($this->translate_uri_dashes === TRUE ? str_replace('-', '_', $s[0]) : $s[0]);
-
-            if ( ! file_exists(APPPATH.'controllers/'.$test.'.php') && is_dir(APPPATH.'controllers/'.$this->directory.$s[0]))
-            {
-                $this->set_directory(array_shift($s), TRUE);
-                continue;
-            }
-            elseif (file_exists(APPPATH .'controllers/'. $test .'.php'))
-            {
-                return $s;
-            }
-        }
-
-        unset($s);
-
-        // Now look for it in all of our modules.
-        foreach ($this->config->item('modules_locations') as $location) {
-            $relative = $location;
-
-            // Make path relative to controllers directory
-            $start = rtrim(realpath(APPPATH), '/');
-            $parts = explode('/', str_replace('\\', '/', $start));
-
-            // Iterate all parts and replace absolute part with relative part
-            for ($i = 1; $i <= count($parts); $i++) {
-                $relative = str_replace(implode('/', $parts) . '/', str_repeat('../', $i), $relative, $count);
-                array_pop($parts);
-
-                // Stop iteration if found
-                if ($count)
-                    break;
-            }
-
-            // Does a module exist? (/modules/xyz/controllers/)
-            if (is_dir($source = $location . $module . '/controllers/')) {
-                $this->module = $module;
-                $this->directory = $relative . $module . '/controllers/';
-
-                // Module root controller?
-                if ($directory && is_file($source . $_ucfirst($directory) . '.php')) {
-                    $this->class = $directory;
-                    return array_slice($segments, 1);
-                }
-
-                // Module sub-directory?
-                if ($directory && is_dir($source . $directory . '/')) {
-                    $source = $source . $directory . '/';
-                    $this->directory .= $directory . '/';
-
-                    // Module sub-directory controller?
-                    if (is_file($source . $_ucfirst($directory) . '.php')) {
-                        return array_slice($segments, 1);
-                    }
-
-                    // Module sub-directory  default controller?
-                    if (is_file($source . $_ucfirst($this->default_controller) . '.php')) {
-                        $segments[1] = $this->default_controller;
-                        return array_slice($segments, 1);
-                    }
-
-                    // Module sub-directory sub-controller?
-                    if ($controller && is_file($source . $_ucfirst($controller) . '.php')) {
-                        return array_slice($segments, 2);
-                    }
-                }
-
-                // Module controller?
-                if (is_file($source . $_ucfirst($module) . '.php')) {
-                    return $segments;
-                }
-
-                // Module default controller?
-                if (is_file($source . $_ucfirst($this->default_controller) . '.php')) {
-                    $segments[0] = $this->default_controller;
-                    return $segments;
-                }
-            }
-        }
-
-        // Default controller?
-        if (is_file(APPPATH . 'controllers/' . $module . '/' . $_ucfirst($this->default_controller) . '.php')) {
-            $segments[0] = $this->default_controller;
-            return $segments;
-        }
-    }
-
-    /**
-     * Set the module name
-     *
-     * @param	string
-     * @return	void
-     */
-    function set_module($module) {
-        $this->module = $module;
-    }
-
-    /**
-     * Set default controller
-     *
-     * First we check in normal APPPATH/controller's location,
-     * then in Modules named after the default_controller
-     * @author  hArpanet - based on system/core/Router.php
-     *
-     * @return  void
-     */
-    protected function _set_default_controller()
-    {
-        // controller in APPPATH/controllers takes priority over module with same name
-        parent::_set_default_controller();
-
-        // see if parent found a controller
-        $class = $this->fetch_class();
-
-        if (empty($class)) {
-
-            // no 'normal' controller found,
-            // get the class/method from the default_controller route
-            if (sscanf($this->default_controller, '%[^/]/%s', $class, $method) !== 2)
-            {
-                $method = 'index';
-            }
-
-            // try to locate default controller in modules
-            if ($located = $this->locate(array($class, $class, $method))) {
-
-                log_message('debug', 'No URI present. Default module controller set.');
-            }
-        }
-
-        // Nothing found - this will trigger 404 later
-    }
-
-    // --------------------------------------------------------------------
-
-
-    /**
-     * Fetch the module
-     *
-     * @access	public
-     * @return	string
-     */
-    function fetch_module() {
-        return $this->module;
-    }
+	/**
+	 * Current module name
+	 *
+	 * @var string
+	 * @access public
+	 */
+	var $module = '';
+
+	/**
+	 * Constructor
+	 *
+	 * Runs the route mapping function.
+	 */
+	function __construct() {
+
+		$this->config =& load_class('Config', 'core');
+
+		// Process 'modules_locations' from config
+		$locations = $this->config->item('modules_locations');
+
+		if (!$locations) {
+			$locations = array(APPPATH . 'modules/');
+		} else if (!is_array($locations)) {
+			$locations = array($locations);
+		}
+
+		// Make sure all paths are the same format
+		foreach ($locations as &$location) {
+			$location = realpath($location);
+			$location = str_replace('\\', '/', $location);
+			$location = rtrim($location, '/') . '/';
+		}
+
+		$this->config->set_item('modules_locations', $locations);
+
+
+		parent::__construct();
+	}
+
+	/**
+	 * Validates the supplied segments.  Attempts to determine the path to
+	 * the controller.
+	 *
+	 * @access	private
+	 * @param	array
+	 * @return	array
+	 */
+	function _validate_request($segments) {
+		if (count($segments) == 0) {
+			return $segments;
+		}
+
+		// Locate the controller with modules support
+		if ($located = $this->locate($segments)) {
+			return $located;
+		}
+
+		// Is there a 404 override?
+		if (!empty($this->routes['404_override'])) {
+			$segments = explode('/', $this->routes['404_override']);
+			if ($located = $this->locate($segments)) {
+				return $located;
+			}
+		}
+
+		// Nothing else to do at this point but show a 404
+		show_404($segments[0]);
+	}
+
+	/**
+	 * Parse Routes
+	 *
+	 * This function matches any routes that may exist in
+	 * the config/routes.php file against the URI to
+	 * determine if the class/method need to be remapped.
+	 *
+	 * NOTE: The first segment must stay the name of the
+	 * module, otherwise it is impossible to detect
+	 * the current module in this method.
+	 *
+	 * @access	private
+	 * @return	void
+	 */
+	function _parse_routes() {
+		// Apply the current module's routing config
+
+		// CI v3.x has URI starting at segment 1
+		$segstart = (intval(substr(CI_VERSION,0,1)) > 2) ? 1 : 0;
+
+		if ($module = $this->uri->segment($segstart)) {
+			foreach ($this->config->item('modules_locations') as $location) {
+				if (is_file($file = $location . $module . '/config/routes.php')) {
+					include ($file);
+
+					$route = (!isset($route) or !is_array($route)) ? array() : $route;
+					$this->routes = array_merge($this->routes, $route);
+					unset($route);
+				}
+			}
+		}
+
+		// Let parent do the heavy routing
+		return parent::_parse_routes();
+	}
+
+	/**
+	 * The logic of locating a controller is grouped in this function
+	 *
+	 * @param	array
+	 * @return	array
+	 */
+	function locate($segments) {
+		// anon function to ucfirst a string if CI ver > 2 (for backwards compatibility)
+		$_ucfirst = function($cn) {return (intval(substr(CI_VERSION,0,1)) > 2) ? ucfirst($cn) : $cn;};
+
+		list($module, $directory, $controller) = array_pad($segments, 3, NULL);
+
+		// Look for it in the standar APPPATH/controllers first so that it can override modules.
+		$c = count($segments);
+		$s = $segments;
+		// Loop through our segments and return as soon as a controller
+		// is found or when such a directory doesn't exist
+		while ($c-- > 0)
+		{
+			$test = $this->directory
+					.ucfirst($this->translate_uri_dashes === TRUE ? str_replace('-', '_', $s[0]) : $s[0]);
+
+			if ( ! file_exists(APPPATH.'controllers/'.$test.'.php') && is_dir(APPPATH.'controllers/'.$this->directory.$s[0]))
+			{
+				$this->set_directory(array_shift($s), TRUE);
+				continue;
+			}
+			elseif (file_exists(APPPATH .'controllers/'. $test .'.php'))
+			{
+				return $s;
+			}
+		}
+
+		unset($s);
+
+		// Now look for it in all of our modules.
+		foreach ($this->config->item('modules_locations') as $location) {
+			$relative = $location;
+
+			// Make path relative to controllers directory
+			$start = rtrim(realpath(APPPATH), '/');
+			$parts = explode('/', str_replace('\\', '/', $start));
+
+			// Iterate all parts and replace absolute part with relative part
+			for ($i = 1; $i <= count($parts); $i++) {
+				$relative = str_replace(implode('/', $parts) . '/', str_repeat('../', $i), $relative, $count);
+				array_pop($parts);
+
+				// Stop iteration if found
+				if ($count)
+					break;
+			}
+
+			// Does a module exist? (/modules/xyz/controllers/)
+			if (is_dir($source = $location . $module . '/controllers/')) {
+				$this->module = $module;
+				$this->directory = $relative . $module . '/controllers/';
+
+				// Module root controller?
+				if ($directory && is_file($source . $_ucfirst($directory) . '.php')) {
+					$this->class = $directory;
+					return array_slice($segments, 1);
+				}
+
+				// Module sub-directory?
+				if ($directory && is_dir($source . $directory . '/')) {
+					$source = $source . $directory . '/';
+					$this->directory .= $directory . '/';
+
+					// Module sub-directory controller?
+					if (is_file($source . $_ucfirst($directory) . '.php')) {
+						return array_slice($segments, 1);
+					}
+
+					// Module sub-directory  default controller?
+					if (is_file($source . $_ucfirst($this->default_controller) . '.php')) {
+						$segments[1] = $this->default_controller;
+						return array_slice($segments, 1);
+					}
+
+					// Module sub-directory sub-controller?
+					if ($controller && is_file($source . $_ucfirst($controller) . '.php')) {
+						return array_slice($segments, 2);
+					}
+				}
+
+				// Module controller?
+				if (is_file($source . $_ucfirst($module) . '.php')) {
+					return $segments;
+				}
+
+				// Module default controller?
+				if (is_file($source . $_ucfirst($this->default_controller) . '.php')) {
+					$segments[0] = $this->default_controller;
+					return $segments;
+				}
+			}
+		}
+
+		// Default controller?
+		if (is_file(APPPATH . 'controllers/' . $module . '/' . $_ucfirst($this->default_controller) . '.php')) {
+			$segments[0] = $this->default_controller;
+			return $segments;
+		}
+	}
+
+	/**
+	 * Set the module name
+	 *
+	 * @param	string
+	 * @return	void
+	 */
+	function set_module($module) {
+		$this->module = $module;
+	}
+
+	/**
+	 * Set default controller
+	 *
+	 * First we check in normal APPPATH/controller's location,
+	 * then in Modules named after the default_controller
+	 * @author  hArpanet - based on system/core/Router.php
+	 *
+	 * @return  void
+	 */
+	protected function _set_default_controller()
+	{
+		// controller in APPPATH/controllers takes priority over module with same name
+		parent::_set_default_controller();
+
+		// see if parent found a controller
+		$class = $this->fetch_class();
+
+		if (empty($class)) {
+
+			// no 'normal' controller found,
+			// get the class/method from the default_controller route
+			if (sscanf($this->default_controller, '%[^/]/%s', $class, $method) !== 2)
+			{
+				$method = 'index';
+			}
+
+			// try to locate default controller in modules
+			if ($located = $this->locate(array($class, $class, $method))) {
+
+				log_message('debug', 'No URI present. Default module controller set.');
+			}
+		}
+
+		// Nothing found - this will trigger 404 later
+	}
+
+	// --------------------------------------------------------------------
+
+
+	/**
+	 * Fetch the module
+	 *
+	 * @access	public
+	 * @return	string
+	 */
+	function fetch_module() {
+		return $this->module;
+	}
 }

Spacing +25 added lines, -25 removed lines

@@ -33,7 +33,7 @@ 
  * THE SOFTWARE.
  */
 
-if (!defined("BASEPATH"))
+if ( ! defined("BASEPATH"))
     exit("No direct script access allowed");
 
 class HMVC_Router extends CI_Router {
@@ -53,14 +53,14 @@ 
      */
     function __construct() {
 
-        $this->config =& load_class('Config', 'core');
+        $this->config = & load_class('Config', 'core');
 
         // Process 'modules_locations' from config
         $locations = $this->config->item('modules_locations');
 
-        if (!$locations) {
-            $locations = array(APPPATH . 'modules/');
-        } else if (!is_array($locations)) {
+        if ( ! $locations) {
+            $locations = array(APPPATH.'modules/');
+        } else if ( ! is_array($locations)) {
             $locations = array($locations);
         }
 
@@ -68,7 +68,7 @@ 
         foreach ($locations as &$location) {
             $location = realpath($location);
             $location = str_replace('\\', '/', $location);
-            $location = rtrim($location, '/') . '/';
+            $location = rtrim($location, '/').'/';
         }
 
         $this->config->set_item('modules_locations', $locations);
@@ -96,7 +96,7 @@ 
         }
 
         // Is there a 404 override?
-        if (!empty($this->routes['404_override'])) {
+        if ( ! empty($this->routes['404_override'])) {
             $segments = explode('/', $this->routes['404_override']);
             if ($located = $this->locate($segments)) {
                 return $located;
@@ -125,14 +125,14 @@ 
         // Apply the current module's routing config
 
         // CI v3.x has URI starting at segment 1
-        $segstart = (intval(substr(CI_VERSION,0,1)) > 2) ? 1 : 0;
+        $segstart = (intval(substr(CI_VERSION, 0, 1)) > 2) ? 1 : 0;
 
         if ($module = $this->uri->segment($segstart)) {
             foreach ($this->config->item('modules_locations') as $location) {
-                if (is_file($file = $location . $module . '/config/routes.php')) {
+                if (is_file($file = $location.$module.'/config/routes.php')) {
                     include ($file);
 
-                    $route = (!isset($route) or !is_array($route)) ? array() : $route;
+                    $route = ( ! isset($route) or ! is_array($route)) ? array() : $route;
                     $this->routes = array_merge($this->routes, $route);
                     unset($route);
                 }
@@ -151,7 +151,7 @@ 
      */
     function locate($segments) {
         // anon function to ucfirst a string if CI ver > 2 (for backwards compatibility)
-        $_ucfirst = function($cn) {return (intval(substr(CI_VERSION,0,1)) > 2) ? ucfirst($cn) : $cn;};
+        $_ucfirst = function($cn) {return (intval(substr(CI_VERSION, 0, 1)) > 2) ? ucfirst($cn) : $cn; };
 
         list($module, $directory, $controller) = array_pad($segments, 3, NULL);
 
@@ -170,7 +170,7 @@ 
                 $this->set_directory(array_shift($s), TRUE);
                 continue;
             }
-            elseif (file_exists(APPPATH .'controllers/'. $test .'.php'))
+            elseif (file_exists(APPPATH.'controllers/'.$test.'.php'))
             {
                 return $s;
             }
@@ -188,7 +188,7 @@ 
 
             // Iterate all parts and replace absolute part with relative part
             for ($i = 1; $i <= count($parts); $i++) {
-                $relative = str_replace(implode('/', $parts) . '/', str_repeat('../', $i), $relative, $count);
+                $relative = str_replace(implode('/', $parts).'/', str_repeat('../', $i), $relative, $count);
                 array_pop($parts);
 
                 // Stop iteration if found
@@ -197,45 +197,45 @@ 
             }
 
             // Does a module exist? (/modules/xyz/controllers/)
-            if (is_dir($source = $location . $module . '/controllers/')) {
+            if (is_dir($source = $location.$module.'/controllers/')) {
                 $this->module = $module;
-                $this->directory = $relative . $module . '/controllers/';
+                $this->directory = $relative.$module.'/controllers/';
 
                 // Module root controller?
-                if ($directory && is_file($source . $_ucfirst($directory) . '.php')) {
+                if ($directory && is_file($source.$_ucfirst($directory).'.php')) {
                     $this->class = $directory;
                     return array_slice($segments, 1);
                 }
 
                 // Module sub-directory?
-                if ($directory && is_dir($source . $directory . '/')) {
-                    $source = $source . $directory . '/';
-                    $this->directory .= $directory . '/';
+                if ($directory && is_dir($source.$directory.'/')) {
+                    $source = $source.$directory.'/';
+                    $this->directory .= $directory.'/';
 
                     // Module sub-directory controller?
-                    if (is_file($source . $_ucfirst($directory) . '.php')) {
+                    if (is_file($source.$_ucfirst($directory).'.php')) {
                         return array_slice($segments, 1);
                     }
 
                     // Module sub-directory  default controller?
-                    if (is_file($source . $_ucfirst($this->default_controller) . '.php')) {
+                    if (is_file($source.$_ucfirst($this->default_controller).'.php')) {
                         $segments[1] = $this->default_controller;
                         return array_slice($segments, 1);
                     }
 
                     // Module sub-directory sub-controller?
-                    if ($controller && is_file($source . $_ucfirst($controller) . '.php')) {
+                    if ($controller && is_file($source.$_ucfirst($controller).'.php')) {
                         return array_slice($segments, 2);
                     }
                 }
 
                 // Module controller?
-                if (is_file($source . $_ucfirst($module) . '.php')) {
+                if (is_file($source.$_ucfirst($module).'.php')) {
                     return $segments;
                 }
 
                 // Module default controller?
-                if (is_file($source . $_ucfirst($this->default_controller) . '.php')) {
+                if (is_file($source.$_ucfirst($this->default_controller).'.php')) {
                     $segments[0] = $this->default_controller;
                     return $segments;
                 }
@@ -243,7 +243,7 @@ 
         }
 
         // Default controller?
-        if (is_file(APPPATH . 'controllers/' . $module . '/' . $_ucfirst($this->default_controller) . '.php')) {
+        if (is_file(APPPATH.'controllers/'.$module.'/'.$_ucfirst($this->default_controller).'.php')) {
             $segments[0] = $this->default_controller;
             return $segments;
         }

Braces +6 added lines, -5 removed lines

@@ -33,8 +33,9 @@ 
  * THE SOFTWARE.
  */
 
-if (!defined("BASEPATH"))
+if (!defined("BASEPATH")) {
     exit("No direct script access allowed");
+}
 
 class HMVC_Router extends CI_Router {
 
@@ -169,8 +170,7 @@ 
             {
                 $this->set_directory(array_shift($s), TRUE);
                 continue;
-            }
-            elseif (file_exists(APPPATH .'controllers/'. $test .'.php'))
+            } elseif (file_exists(APPPATH .'controllers/'. $test .'.php'))
             {
                 return $s;
             }
@@ -192,8 +192,9 @@ 
                 array_pop($parts);
 
                 // Stop iteration if found
-                if ($count)
-                    break;
+                if ($count) {
+                                    break;
+                }
             }
 
             // Does a module exist? (/modules/xyz/controllers/)

application/views/emails/usermailer/didRegister.html.php

Spacing +2 added lines, -2 removed lines

@@ -11,8 +11,8 @@
             <p>If that was you - then click the link below to activate your account:</p>
 
             <p>
-                <a href="<?= $link ."?e={$email}&code={$token}" ?>">
-                    <?= $link ."?e={$email}&code={$token}" ?>
+                <a href="<?= $link."?e={$email}&code={$token}" ?>">
+                    <?= $link."?e={$email}&code={$token}" ?>
                 </a>
             </p>
 

application/views/emails/usermailer/didRegister.text.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 
 If that was you - then click the link below to activate your account:
 
-<?= $link ."?e={$email}&code={$token}" ?>
+<?= $link."?e={$email}&code={$token}" ?>
 
 If the link does not work, please visit the following page: <?= $link ?> and enter the following token when asked:
 

application/views/emails/usermailer/remindUser.html.php

Spacing +2 added lines, -2 removed lines

@@ -11,8 +11,8 @@
             <p>If you do need to reset your password, please visit the following link:</p>
             
             <p>
-                <a href="<?= $link ."?e={$email}&code={$code}" ?>">
-                    <?= $link ."?e={$email}&code={$code}" ?>
+                <a href="<?= $link."?e={$email}&code={$code}" ?>">
+                    <?= $link."?e={$email}&code={$code}" ?>
                 </a>
             </p>