ci-bonfire / Sprint

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

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

application/models/User_model.php

Indentation +356 added lines, -356 removed lines

@@ -4,363 +4,363 @@
 
 class User_model extends \Myth\Models\CIDbModel {
 
-    protected $table_name = 'users';
-
-    protected $soft_deletes = true;
-
-    protected $set_created = true;
-
-    protected $set_modified = false;
-
-    protected $protected_attributes = ['id', 'submit'];
-
-    protected $validation_rules = [
-        [
-            'field' => 'first_name',
-            'label' => 'lang:auth.first_name',
-            'rules' => 'trim|alpha|max_length[255]'
-        ],
-        [
-            'field' => 'last_name',
-            'label' => 'lang:auth.last_name',
-            'rules' => 'trim|alpha|max_length[255]'
-        ],
-        [
-            'field' => 'email',
-            'label' => 'lang:auth.email',
-            'rules' => 'trim|valid_email|max_length[255]'
-        ],
-        [
-            'field' => 'username',
-            'label' => 'lang:auth.username',
-            'rules' => 'trim|alpha_numeric|max_length[255]'
-        ],
-        [
-            'field' => 'password',
-            'label' => 'lang:auth.password',
-            'rules' => 'trim|max_length[255]|isStrongPassword'
-        ],
-        [
-            'field' => 'pass_confirm',
-            'label' => 'lang:auth.pass_confirm',
-            'rules' => 'trim|matches[password]'
-        ],
-    ];
-
-    protected $insert_validate_rules = [
-        'email'        => 'required|is_unique[users.email]',
-        'username'     => 'required|is_unique[users.username]',
-        'password'     => 'required',
-        'pass_confirm' => 'required'
-    ];
-
-    protected $before_insert = ['hashPassword'];
-    protected $before_update = ['hashPassword'];
-    protected $after_insert  = ['updateMeta'];
-    protected $after_update  = ['updateMeta'];
-
-    // The columns in the 'users_meta' table - for auto updating of profile information.
-    protected $meta_fields = ['first_name', 'last_name'];
-
-    protected $fields = ['id', 'email', 'username', 'password_hash', 'reset_hash', 'activate_hash', 'created_on', 'status', 'status_message', 'active', 'deleted', 'force_pass_reset'];
-
-    //--------------------------------------------------------------------
-
-    public function __construct()
-    {
-        parent::__construct();
-
-        $this->load->helper('auth/password');
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Works with any find queries to return user_meta information.
-     *
-     * @return $this
-     */
-    public function withMeta()
-    {
-        $this->after_find[] = 'grabMeta';
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * If exists, will take our password out of the data array, and
-     * create a new hash for it, which is inserted back into the
-     * data array to be saved to the database.
-     *
-     * @param array $data
-     *
-     * @return array
-     */
-    protected function hashPassword($data)
-    {
-        if (isset($data['fields']))
-        {
-            $data = $data['fields'];
-        }
-
-        if (isset($data['password']))
-        {
-            $data['password_hash'] = \Myth\Auth\Password::hashPassword($data['password']);
-
-            unset($data['password'], $data['pass_confirm']);
-        }
-
-        return $data;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * A callback designed to work with Digest Authentication to create
-     * and store the $A1 value since we'll never have access to the
-     * password except during inserts or updates.
-     *
-     * This assumes that this is working as part of an API and that
-     * the api config file is already loaded into memory.
-     *
-     * @param $data
-     *
-     * @return $data
-     */
-    public function createDigestKey($data)
-    {
-        $field = config_item('api.auth_field');
-        $value = null;
-
-        // If it's an update, we probably won't have the username/email
-        // so grab it so that we can use it.
-        if (! empty($data[ $this->primary_key ]))
-        {
-            if (! isset($data[$field]) )
-            {
-                $value = $this->get_field( $data['id'], $field );
-            }
-        }
-        // However, if it's an insert, then we should have it, If we don't, leave.
-        else
-        {
-            if (empty($data[$field]))
-            {
-                return $data;
-            }
-
-            $value = $data[$field];
-        }
-
-        // Still here? then create the hash based on the current realm.
-        if (! empty($data['password']) )
-        {
-            $key = md5($value .':'. config_item('api.realm') .':'. $data['password']);
-            $data['api_key'] = $key;
-        }
-
-        return $data;
-    }
-
-    //--------------------------------------------------------------------
-
-
-    /**
-     * A callback method intended to hook into the after_insert and after_udpate
-     * methods.
-     *
-     * NOTE: Will only work for insert and update methods.
-     *
-     * @param array $data
-     * @return mixed
-     */
-    public function updateMeta($data)
-    {
-        // If no 'id' is in the $data array, then
-        // we don't have successful insert, get out of here
-        if (empty($data['id']) || ($data['method'] != 'insert' && $data['method'] != 'update'))
-        {
-            return $data;
-        }
-
-        // Collect any meta fields
-        foreach ($data['fields'] as $key => $value)
-        {
-            if (in_array($key, $this->meta_fields))
-            {
-                $this->db->where('user_id', $data['id']);
-                $this->db->where('meta_key', $key);
-                $query = $this->db->get('user_meta');
-
-                $obj = [
-                    'user_id'    => $data['id'],
-                    'meta_key'   => $key,
-                    'meta_value' => $value
-                ];
-
-                if ($query->num_rows() == 0)
-                {
-                    $this->db->insert('user_meta', $obj);
-                }
-                else if ($query->num_rows() > 0)
-                {
-                    $this->db->where('user_id', $data['id'])
-                             ->where('meta_key', $key)
-                             ->set('meta_value', $value)
-                             ->update('user_meta', $obj);
-                }
-            }
-        }
-
-        return $data;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Adds a single piece of meta information to a user.
-     *
-     * @param $user_id
-     * @param $key
-     * @param null $value
-     *
-     * @return object
-     */
-    public function saveMetaToUser($user_id, $key, $value=null)
-    {
-        if (! Events::trigger('beforeAddMetaToUser', [$user_id, $key]))
-        {
-            return false;
-        }
-
-        $user_id = (int)$user_id;
-
-        // Does this key already exist?
-        $test = $this->db->where([ 'user_id' => $user_id, 'meta_key' => $key ])->get('user_meta');
-
-        // Doesn't exist, so insert it.
-        if (! $test->num_rows())
-        {
-            $data = [
-                'user_id'       => $user_id,
-                'meta_key'      => $key,
-                'meta_value'    => $value
-            ];
-
-            return $this->db->insert('user_meta', $data);
-        }
-
-        // Otherwise, we need to update the existing.
-        return $this->db->where('user_id', $user_id)
-                        ->where('meta_key', $key)
-                        ->set('meta_value', $value)
-                        ->update('user_meta');
-    }
+	protected $table_name = 'users';
+
+	protected $soft_deletes = true;
+
+	protected $set_created = true;
+
+	protected $set_modified = false;
+
+	protected $protected_attributes = ['id', 'submit'];
+
+	protected $validation_rules = [
+		[
+			'field' => 'first_name',
+			'label' => 'lang:auth.first_name',
+			'rules' => 'trim|alpha|max_length[255]'
+		],
+		[
+			'field' => 'last_name',
+			'label' => 'lang:auth.last_name',
+			'rules' => 'trim|alpha|max_length[255]'
+		],
+		[
+			'field' => 'email',
+			'label' => 'lang:auth.email',
+			'rules' => 'trim|valid_email|max_length[255]'
+		],
+		[
+			'field' => 'username',
+			'label' => 'lang:auth.username',
+			'rules' => 'trim|alpha_numeric|max_length[255]'
+		],
+		[
+			'field' => 'password',
+			'label' => 'lang:auth.password',
+			'rules' => 'trim|max_length[255]|isStrongPassword'
+		],
+		[
+			'field' => 'pass_confirm',
+			'label' => 'lang:auth.pass_confirm',
+			'rules' => 'trim|matches[password]'
+		],
+	];
+
+	protected $insert_validate_rules = [
+		'email'        => 'required|is_unique[users.email]',
+		'username'     => 'required|is_unique[users.username]',
+		'password'     => 'required',
+		'pass_confirm' => 'required'
+	];
+
+	protected $before_insert = ['hashPassword'];
+	protected $before_update = ['hashPassword'];
+	protected $after_insert  = ['updateMeta'];
+	protected $after_update  = ['updateMeta'];
+
+	// The columns in the 'users_meta' table - for auto updating of profile information.
+	protected $meta_fields = ['first_name', 'last_name'];
+
+	protected $fields = ['id', 'email', 'username', 'password_hash', 'reset_hash', 'activate_hash', 'created_on', 'status', 'status_message', 'active', 'deleted', 'force_pass_reset'];
+
+	//--------------------------------------------------------------------
+
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->load->helper('auth/password');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Works with any find queries to return user_meta information.
+	 *
+	 * @return $this
+	 */
+	public function withMeta()
+	{
+		$this->after_find[] = 'grabMeta';
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * If exists, will take our password out of the data array, and
+	 * create a new hash for it, which is inserted back into the
+	 * data array to be saved to the database.
+	 *
+	 * @param array $data
+	 *
+	 * @return array
+	 */
+	protected function hashPassword($data)
+	{
+		if (isset($data['fields']))
+		{
+			$data = $data['fields'];
+		}
+
+		if (isset($data['password']))
+		{
+			$data['password_hash'] = \Myth\Auth\Password::hashPassword($data['password']);
+
+			unset($data['password'], $data['pass_confirm']);
+		}
+
+		return $data;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * A callback designed to work with Digest Authentication to create
+	 * and store the $A1 value since we'll never have access to the
+	 * password except during inserts or updates.
+	 *
+	 * This assumes that this is working as part of an API and that
+	 * the api config file is already loaded into memory.
+	 *
+	 * @param $data
+	 *
+	 * @return $data
+	 */
+	public function createDigestKey($data)
+	{
+		$field = config_item('api.auth_field');
+		$value = null;
+
+		// If it's an update, we probably won't have the username/email
+		// so grab it so that we can use it.
+		if (! empty($data[ $this->primary_key ]))
+		{
+			if (! isset($data[$field]) )
+			{
+				$value = $this->get_field( $data['id'], $field );
+			}
+		}
+		// However, if it's an insert, then we should have it, If we don't, leave.
+		else
+		{
+			if (empty($data[$field]))
+			{
+				return $data;
+			}
+
+			$value = $data[$field];
+		}
+
+		// Still here? then create the hash based on the current realm.
+		if (! empty($data['password']) )
+		{
+			$key = md5($value .':'. config_item('api.realm') .':'. $data['password']);
+			$data['api_key'] = $key;
+		}
+
+		return $data;
+	}
+
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * A callback method intended to hook into the after_insert and after_udpate
+	 * methods.
+	 *
+	 * NOTE: Will only work for insert and update methods.
+	 *
+	 * @param array $data
+	 * @return mixed
+	 */
+	public function updateMeta($data)
+	{
+		// If no 'id' is in the $data array, then
+		// we don't have successful insert, get out of here
+		if (empty($data['id']) || ($data['method'] != 'insert' && $data['method'] != 'update'))
+		{
+			return $data;
+		}
+
+		// Collect any meta fields
+		foreach ($data['fields'] as $key => $value)
+		{
+			if (in_array($key, $this->meta_fields))
+			{
+				$this->db->where('user_id', $data['id']);
+				$this->db->where('meta_key', $key);
+				$query = $this->db->get('user_meta');
+
+				$obj = [
+					'user_id'    => $data['id'],
+					'meta_key'   => $key,
+					'meta_value' => $value
+				];
+
+				if ($query->num_rows() == 0)
+				{
+					$this->db->insert('user_meta', $obj);
+				}
+				else if ($query->num_rows() > 0)
+				{
+					$this->db->where('user_id', $data['id'])
+							 ->where('meta_key', $key)
+							 ->set('meta_value', $value)
+							 ->update('user_meta', $obj);
+				}
+			}
+		}
+
+		return $data;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Adds a single piece of meta information to a user.
+	 *
+	 * @param $user_id
+	 * @param $key
+	 * @param null $value
+	 *
+	 * @return object
+	 */
+	public function saveMetaToUser($user_id, $key, $value=null)
+	{
+		if (! Events::trigger('beforeAddMetaToUser', [$user_id, $key]))
+		{
+			return false;
+		}
+
+		$user_id = (int)$user_id;
+
+		// Does this key already exist?
+		$test = $this->db->where([ 'user_id' => $user_id, 'meta_key' => $key ])->get('user_meta');
+
+		// Doesn't exist, so insert it.
+		if (! $test->num_rows())
+		{
+			$data = [
+				'user_id'       => $user_id,
+				'meta_key'      => $key,
+				'meta_value'    => $value
+			];
+
+			return $this->db->insert('user_meta', $data);
+		}
+
+		// Otherwise, we need to update the existing.
+		return $this->db->where('user_id', $user_id)
+						->where('meta_key', $key)
+						->set('meta_value', $value)
+						->update('user_meta');
+	}
     
-    //--------------------------------------------------------------------
-
-    /**
-     * Gets the value of a single Meta item from a user.
-     *
-     * @param $user_id
-     * @param $key
-     *
-     * @return mixed
-     */
-    public function getMetaItem($user_id, $key)
-    {
-        $query = $this->db->where('user_id', (int)$user_id)
-                          ->where('meta_key', $key)
-                          ->select('meta_value')
-                          ->get('user_meta');
-
-        if (! $query->num_rows())
-        {
-            return null;
-        }
-
-        return $query->row()->meta_value;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Deletes one or more meta values from a user.
-     *
-     * @param $user_id
-     * @param $key
-     *
-     * @return bool
-     */
-    public function removeMetaFromUser($user_id, $key)
-    {
-        if (! Events::trigger('beforeRemoveMetaFromUser', [$user_id, $key]))
-        {
-            return false;
-        }
-
-	    if (is_array($key))
-	    {
-		    $this->db->where_in('meta_key', $key);
-	    }
-	    else
-	    {
-		    $this->db->where('meta_key', $key);
-	    }
-
-        $this->db->where('user_id', (int)$user_id)
-                 ->delete('user_meta');
-    }
-
-    //--------------------------------------------------------------------
-
-    public function getMetaForUser($user_id)
-    {
-        $query = $this->db->where('user_id', (int)$user_id)
-                          ->select('meta_key, meta_value')
-                          ->get('user_meta');
-
-        $rows = $query->result();
-
-        $meta = [];
-
-        if (count($rows))
-        {
-            array_walk( $rows, function ( $row ) use ( &$meta )
-            {
-                $meta[ $row->meta_key ] = $row->meta_value;
-            } );
-        }
-
-        return $meta;
-    }
-
-    //--------------------------------------------------------------------
-
-    protected function grabMeta($data)
-    {
-        if (strpos($data['method'], 'find') === false)
-        {
-            return $data;
-        }
-
-        $meta = $this->getMetaForUser($data['fields']->id);
-
-        if (is_object($data['fields']))
-        {
-            $data['fields']->meta = (object)$meta;
-        }
-        else
-        {
-            $data['fields']['meta']= $meta;
-        }
-
-        return $data;
-    }
-
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+
+	/**
+	 * Gets the value of a single Meta item from a user.
+	 *
+	 * @param $user_id
+	 * @param $key
+	 *
+	 * @return mixed
+	 */
+	public function getMetaItem($user_id, $key)
+	{
+		$query = $this->db->where('user_id', (int)$user_id)
+						  ->where('meta_key', $key)
+						  ->select('meta_value')
+						  ->get('user_meta');
+
+		if (! $query->num_rows())
+		{
+			return null;
+		}
+
+		return $query->row()->meta_value;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Deletes one or more meta values from a user.
+	 *
+	 * @param $user_id
+	 * @param $key
+	 *
+	 * @return bool
+	 */
+	public function removeMetaFromUser($user_id, $key)
+	{
+		if (! Events::trigger('beforeRemoveMetaFromUser', [$user_id, $key]))
+		{
+			return false;
+		}
+
+		if (is_array($key))
+		{
+			$this->db->where_in('meta_key', $key);
+		}
+		else
+		{
+			$this->db->where('meta_key', $key);
+		}
+
+		$this->db->where('user_id', (int)$user_id)
+				 ->delete('user_meta');
+	}
+
+	//--------------------------------------------------------------------
+
+	public function getMetaForUser($user_id)
+	{
+		$query = $this->db->where('user_id', (int)$user_id)
+						  ->select('meta_key, meta_value')
+						  ->get('user_meta');
+
+		$rows = $query->result();
+
+		$meta = [];
+
+		if (count($rows))
+		{
+			array_walk( $rows, function ( $row ) use ( &$meta )
+			{
+				$meta[ $row->meta_key ] = $row->meta_value;
+			} );
+		}
+
+		return $meta;
+	}
+
+	//--------------------------------------------------------------------
+
+	protected function grabMeta($data)
+	{
+		if (strpos($data['method'], 'find') === false)
+		{
+			return $data;
+		}
+
+		$meta = $this->getMetaForUser($data['fields']->id);
+
+		if (is_object($data['fields']))
+		{
+			$data['fields']->meta = (object)$meta;
+		}
+		else
+		{
+			$data['fields']['meta']= $meta;
+		}
+
+		return $data;
+	}
+
+	//--------------------------------------------------------------------
 
 
 }

application/third_party/HMVC/Loader.php

Indentation +499 added lines, -499 removed lines

@@ -30,506 +30,506 @@
  */
 
 if (!defined("BASEPATH"))
-    exit("No direct script access allowed");
+	exit("No direct script access allowed");
 
 class HMVC_Loader extends CI_Loader {
 
-    /**
-     * List of loaded modules
-     *
-     * @var array
-     * @access protected
-     */
-    protected $_ci_modules = array();
-
-    /**
-     * List of loaded controllers
-     *
-     * @var array
-     * @access protected
-     */
-    protected $_ci_controllers = array();
-
-    /**
-     * Constructor
-     *
-     * Add the current module to all paths permanently
-     */
-    public function __construct() {
-        parent::__construct();
-
-        // Get current module from the router
-        $router = & $this->_ci_get_component('router');
-        if ($router->module) {
-            $this->add_module($router->module);
-        }
-    }
-
-    /**
-     * Controller Loader
-     *
-     * This function lets users load and hierarchical controllers to enable HMVC support
-     *
-     * @param	string	the uri to the controller
-     * @param	array	parameters for the requested method
-     * @param	boolean return the result instead of showing it
-     * @return	void
-     */
-    public function controller($uri, $params = array(), $return = FALSE) {
-        // No valid module detected, add current module to uri
-        list($module) = $this->detect_module($uri);
-        if (!isset($module)) {
-            $router = & $this->_ci_get_component('router');
-            if ($router->module) {
-                $module = $router->module;
-                $uri = $module . '/' . $uri;
-            }
-        }
-
-        // Add module
-        $this->add_module($module);
-
-        // Execute the controller method and capture output
-        $void = $this->_load_controller($uri, $params, $return);
-
-        // Remove module
-        $this->remove_module();
-
-        return $void;
-    }
-
-    /**
-     * Class Loader
-     *
-     * This function lets users load and instantiate classes.
-     * It is designed to be called from a user's app controllers.
-     *
-     * @param	string	the name of the class
-     * @param	mixed	the optional parameters
-     * @param	string	an optional object name
-     * @return	void
-     */
-    public function library($library = '', $params = NULL, $object_name = NULL) {
-        if (is_array($library)) {
-            foreach ($library as $class) {
-                $this->library($class, $params);
-            }
-            return;
-        }
-
-        // Detect module
-        if (list($module, $class) = $this->detect_module($library)) {
-            // Module already loaded
-            if (in_array($module, $this->_ci_modules)) {
-                return parent::library($class, $params, $object_name);
-            }
-
-            // Add module
-            $this->add_module($module);
-
-            // Let parent do the heavy work
-            $void = parent::library($class, $params, $object_name);
-
-            // Remove module
-            $this->remove_module();
-
-            return $void;
-        } else {
-            return parent::library($library, $params, $object_name);
-        }
-    }
-
-    /**
-     * Model Loader
-     *
-     * This function lets users load and instantiate models.
-     *
-     * @param	string	the name of the class
-     * @param	string	name for the model
-     * @param	bool	database connection
-     * @return	void
-     */
-    public function model($model, $name = '', $db_conn = FALSE) {
-        if (is_array($model)) {
-            foreach ($model as $babe) {
-                $this->model($babe);
-            }
-            return;
-        }
-
-        // Detect module
-        if (list($module, $class) = $this->detect_module($model)) {
-            // Module already loaded
-            if (in_array($module, $this->_ci_modules)) {
-                return parent::model($class, $name, $db_conn);
-            }
-
-            // Add module
-            $this->add_module($module);
-
-            // Let parent do the heavy work
-            $void = parent::model($class, $name, $db_conn);
-
-            // Remove module
-            $this->remove_module();
-
-            return $void;
-        } else {
-            return parent::model($model, $name, $db_conn);
-        }
-    }
-
-    /**
-     * Load View
-     *
-     * This function is used to load a "view" file.  It has three parameters:
-     *
-     * 1. The name of the "view" file to be included.
-     * 2. An associative array of data to be extracted for use in the view.
-     * 3. TRUE/FALSE - whether to return the data or load it.  In
-     * some cases it's advantageous to be able to return data so that
-     * a developer can process it in some way.
-     *
-     * @param	string
-     * @param	array
-     * @param	bool
-     * @return	void
-     */
-    public function view($view, $vars = array(), $return = FALSE)
-    {
-        // Allow application/views/* to override any module
-        // views for easier app customization.
-        if (file_exists(APPPATH .'views/'. $view .'.php'))
-        {
-            return parent::view($view, $vars, $return);
-        }
-
-        // Detect module
-        if (list($module, $class) = $this->detect_module($view)) {
-            // Module already loaded
-            if (in_array($module, $this->_ci_modules)) {
-                return parent::view($class, $vars, $return);
-            }
-
-            // Add module
-            $this->add_module($module);
-
-            // Let parent do the heavy work
-            $void = parent::view($class, $vars, $return);
-
-            // Remove module
-            $this->remove_module();
-
-            return $void;
-        } else {
-            return parent::view($view, $vars, $return);
-        }
-    }
-
-    /**
-     * Loads a config file
-     *
-     * @param	string
-     * @param	bool
-     * @param 	bool
-     * @return	void
-     */
-    public function config($file = '', $use_sections = FALSE, $fail_gracefully = FALSE) {
-        // Detect module
-        if (list($module, $class) = $this->detect_module($file)) {
-            // Module already loaded
-            if (in_array($module, $this->_ci_modules)) {
-                return parent::config($class, $use_sections, $fail_gracefully);
-            }
-
-            // Add module
-            $this->add_module($module);
-
-            // Let parent do the heavy work
-            $void = parent::config($class, $use_sections, $fail_gracefully);
-
-            // Remove module
-            $this->remove_module();
-
-            return $void;
-        } else {
-            parent::config($file, $use_sections, $fail_gracefully);
-        }
-    }
-
-    /**
-     * Load Helper
-     *
-     * This function loads the specified helper file.
-     *
-     * @param	mixed
-     * @return	void
-     */
-    public function helper($helper = array()) {
-        if (is_array($helper)) {
-            foreach ($helper as $help) {
-                $this->helper($help);
-            }
-            return;
-        }
-
-        // Detect module
-        if (list($module, $class) = $this->detect_module($helper)) {
-            // Module already loaded
-            if (in_array($module, $this->_ci_modules)) {
-                return parent::helper($class);
-            }
-
-            // Add module
-            $this->add_module($module);
-
-            // Let parent do the heavy work
-            $void = parent::helper($class);
-
-            // Remove module
-            $this->remove_module();
-
-            return $void;
-        } else {
-            return parent::helper($helper);
-        }
-    }
-
-    /**
-     * Loads a language file
-     *
-     * @param	array
-     * @param	string
-     * @return	void
-     */
-    public function language($file = array(), $lang = '') {
-        if (is_array($file)) {
-            foreach ($file as $langfile) {
-                $this->language($langfile, $lang);
-            }
-            return;
-        }
-
-        // Detect module
-        if (list($module, $class) = $this->detect_module($file)) {
-            // Module already loaded
-            if (in_array($module, $this->_ci_modules)) {
-                return parent::language($class, $lang);
-            }
-
-            // Add module
-            $this->add_module($module);
-
-            // Let parent do the heavy work
-            $void = parent::language($class, $lang);
-
-            // Remove module
-            $this->remove_module();
-
-            return $void;
-        } else {
-            return parent::language($file, $lang);
-        }
-    }
-
-    /**
-     * Load Widget
-     *
-     * This function provides support to Jens Segers Template Library for loading
-     * widget controllers within modules (place in module/widgets folder).
-     * @author  hArpanet - 23-Jun-2014
-     *
-     * @param   string $widget  Must contain Module name if widget within a module
-     *                          (eg. test/nav  where module name is 'test')
-     * @return  array|false
-     */
-    public function widget($widget) {
-
-        // Detect module
-        if (list($module, $widget) = $this->detect_module($widget)) {
-            // Module already loaded
-            if (in_array($module, $this->_ci_modules)) {
-                return array($module, $widget);
-            }
-
-            // Add module
-            $this->add_module($module);
-
-            // Look again now we've added new module path
-            $void = $this->widget($module.'/'.$widget);
-
-            // Remove module if widget not found within it
-            if (!$void) {
-                $this->remove_module();
-            }
-
-            return $void;
-
-        } else {
-            // widget not found in module
-            return FALSE;
-        }
-    }
-
-    /**
-     * Add Module
-     *
-     * Allow resources to be loaded from this module path
-     *
-     * @param	string
-     * @param 	boolean
-     */
-    public function add_module($module, $view_cascade = TRUE) {
-        if ($path = $this->find_module($module)) {
-            // Mark module as loaded
-            array_unshift($this->_ci_modules, $module);
-
-            // Add package path
-            parent::add_package_path($path, $view_cascade);
-        }
-    }
-
-    /**
-     * Remove Module
-     *
-     * Remove a module from the allowed module paths
-     *
-     * @param	type
-     * @param 	bool
-     */
-    public function remove_module($module = '', $remove_config = TRUE) {
-        if ($module == '') {
-            // Mark module as not loaded
-            array_shift($this->_ci_modules);
-
-            // Remove package path
-            parent::remove_package_path('', $remove_config);
-        } else if (($key = array_search($module, $this->_ci_modules)) !== FALSE) {
-            if ($path = $this->find_module($module)) {
-                // Mark module as not loaded
-                unset($this->_ci_modules[$key]);
-
-                // Remove package path
-                parent::remove_package_path($path, $remove_config);
-            }
-        }
-    }
-
-    /**
-     * Controller loader
-     *
-     * This function is used to load and instantiate controllers
-     *
-     * @param	string
-     * @param	array
-     * @param	boolean
-     * @return	object
-     */
-    private function _load_controller($uri = '', $params = array(), $return = FALSE) {
-        $router = & $this->_ci_get_component('router');
-
-        // Back up current router values (before loading new controller)
-        $backup = array();
-        foreach (array('directory', 'class', 'method', 'module') as $prop) {
-            $backup[$prop] = $router->{$prop};
-        }
-
-        // Locate the controller
-        $segments = $router->locate(explode('/', $uri));
-        $class = isset($segments[0]) ? $segments[0] : FALSE;
-        $method = isset($segments[1]) ? $segments[1] : "index";
-
-        // Controller not found
-        if (!$class) {
-            return;
-        }
-
-        if (!array_key_exists(strtolower($class), $this->_ci_controllers)) {
-            // Determine filepath
-            $filepath = APPPATH . 'controllers/' . $router->fetch_directory() . $class . '.php';
-
-            // Load the controller file
-            if (file_exists($filepath)) {
-                include_once ($filepath);
-            }
-
-            // Controller class not found, show 404
-            if (!class_exists($class)) {
-                show_404("{$class}/{$method}");
-            }
-
-            // Create a controller object
-            $this->_ci_controllers[strtolower($class)] = new $class();
-        }
-
-        $controller = $this->_ci_controllers[strtolower($class)];
-
-        // Method does not exists
-        if (!method_exists($controller, $method)) {
-            show_404("{$class}/{$method}");
-        }
-
-        // Restore router state
-        foreach ($backup as $prop => $value) {
-            $router->{$prop} = $value;
-        }
-
-        // Capture output and return
-        ob_start();
-        $result = call_user_func_array(array($controller, $method), $params);
-
-        // Return the buffered output
-        if ($return === TRUE) {
-            $buffer = ob_get_contents();
-            @ob_end_clean();
-            return $buffer;
-        }
-
-        // Close buffer and flush output to screen
-        ob_end_flush();
-
-        // Return controller return value
-        return $result;
-    }
-
-    /**
-     * Detects the module from a string. Returns the module name and class if found.
-     *
-     * @param	string
-     * @return	array|boolean
-     */
-    private function detect_module($class) {
-        $class = str_replace('.php', '', trim($class, '/'));
-        if (($first_slash = strpos($class, '/')) !== FALSE) {
-            $module = substr($class, 0, $first_slash);
-            $class = substr($class, $first_slash + 1);
-
-            // Check if module exists
-            if ($this->find_module($module)) {
-                return array($module, $class);
-            }
-        }
-
-        return FALSE;
-    }
-
-    /**
-     * Searches a given module name. Returns the path if found, FALSE otherwise
-     *
-     * @param string $module
-     * @return string|boolean
-     */
-    private function find_module($module) {
-        $config = & $this->_ci_get_component('config');
-
-        // Check all locations for this module
-        foreach ($config->item('modules_locations') as $location) {
-            $path = $location . rtrim($module, '/') . '/';
-            if (is_dir($path)) {
-                return $path;
-            }
-        }
-
-        return FALSE;
-    }
+	/**
+	 * List of loaded modules
+	 *
+	 * @var array
+	 * @access protected
+	 */
+	protected $_ci_modules = array();
+
+	/**
+	 * List of loaded controllers
+	 *
+	 * @var array
+	 * @access protected
+	 */
+	protected $_ci_controllers = array();
+
+	/**
+	 * Constructor
+	 *
+	 * Add the current module to all paths permanently
+	 */
+	public function __construct() {
+		parent::__construct();
+
+		// Get current module from the router
+		$router = & $this->_ci_get_component('router');
+		if ($router->module) {
+			$this->add_module($router->module);
+		}
+	}
+
+	/**
+	 * Controller Loader
+	 *
+	 * This function lets users load and hierarchical controllers to enable HMVC support
+	 *
+	 * @param	string	the uri to the controller
+	 * @param	array	parameters for the requested method
+	 * @param	boolean return the result instead of showing it
+	 * @return	void
+	 */
+	public function controller($uri, $params = array(), $return = FALSE) {
+		// No valid module detected, add current module to uri
+		list($module) = $this->detect_module($uri);
+		if (!isset($module)) {
+			$router = & $this->_ci_get_component('router');
+			if ($router->module) {
+				$module = $router->module;
+				$uri = $module . '/' . $uri;
+			}
+		}
+
+		// Add module
+		$this->add_module($module);
+
+		// Execute the controller method and capture output
+		$void = $this->_load_controller($uri, $params, $return);
+
+		// Remove module
+		$this->remove_module();
+
+		return $void;
+	}
+
+	/**
+	 * Class Loader
+	 *
+	 * This function lets users load and instantiate classes.
+	 * It is designed to be called from a user's app controllers.
+	 *
+	 * @param	string	the name of the class
+	 * @param	mixed	the optional parameters
+	 * @param	string	an optional object name
+	 * @return	void
+	 */
+	public function library($library = '', $params = NULL, $object_name = NULL) {
+		if (is_array($library)) {
+			foreach ($library as $class) {
+				$this->library($class, $params);
+			}
+			return;
+		}
+
+		// Detect module
+		if (list($module, $class) = $this->detect_module($library)) {
+			// Module already loaded
+			if (in_array($module, $this->_ci_modules)) {
+				return parent::library($class, $params, $object_name);
+			}
+
+			// Add module
+			$this->add_module($module);
+
+			// Let parent do the heavy work
+			$void = parent::library($class, $params, $object_name);
+
+			// Remove module
+			$this->remove_module();
+
+			return $void;
+		} else {
+			return parent::library($library, $params, $object_name);
+		}
+	}
+
+	/**
+	 * Model Loader
+	 *
+	 * This function lets users load and instantiate models.
+	 *
+	 * @param	string	the name of the class
+	 * @param	string	name for the model
+	 * @param	bool	database connection
+	 * @return	void
+	 */
+	public function model($model, $name = '', $db_conn = FALSE) {
+		if (is_array($model)) {
+			foreach ($model as $babe) {
+				$this->model($babe);
+			}
+			return;
+		}
+
+		// Detect module
+		if (list($module, $class) = $this->detect_module($model)) {
+			// Module already loaded
+			if (in_array($module, $this->_ci_modules)) {
+				return parent::model($class, $name, $db_conn);
+			}
+
+			// Add module
+			$this->add_module($module);
+
+			// Let parent do the heavy work
+			$void = parent::model($class, $name, $db_conn);
+
+			// Remove module
+			$this->remove_module();
+
+			return $void;
+		} else {
+			return parent::model($model, $name, $db_conn);
+		}
+	}
+
+	/**
+	 * Load View
+	 *
+	 * This function is used to load a "view" file.  It has three parameters:
+	 *
+	 * 1. The name of the "view" file to be included.
+	 * 2. An associative array of data to be extracted for use in the view.
+	 * 3. TRUE/FALSE - whether to return the data or load it.  In
+	 * some cases it's advantageous to be able to return data so that
+	 * a developer can process it in some way.
+	 *
+	 * @param	string
+	 * @param	array
+	 * @param	bool
+	 * @return	void
+	 */
+	public function view($view, $vars = array(), $return = FALSE)
+	{
+		// Allow application/views/* to override any module
+		// views for easier app customization.
+		if (file_exists(APPPATH .'views/'. $view .'.php'))
+		{
+			return parent::view($view, $vars, $return);
+		}
+
+		// Detect module
+		if (list($module, $class) = $this->detect_module($view)) {
+			// Module already loaded
+			if (in_array($module, $this->_ci_modules)) {
+				return parent::view($class, $vars, $return);
+			}
+
+			// Add module
+			$this->add_module($module);
+
+			// Let parent do the heavy work
+			$void = parent::view($class, $vars, $return);
+
+			// Remove module
+			$this->remove_module();
+
+			return $void;
+		} else {
+			return parent::view($view, $vars, $return);
+		}
+	}
+
+	/**
+	 * Loads a config file
+	 *
+	 * @param	string
+	 * @param	bool
+	 * @param 	bool
+	 * @return	void
+	 */
+	public function config($file = '', $use_sections = FALSE, $fail_gracefully = FALSE) {
+		// Detect module
+		if (list($module, $class) = $this->detect_module($file)) {
+			// Module already loaded
+			if (in_array($module, $this->_ci_modules)) {
+				return parent::config($class, $use_sections, $fail_gracefully);
+			}
+
+			// Add module
+			$this->add_module($module);
+
+			// Let parent do the heavy work
+			$void = parent::config($class, $use_sections, $fail_gracefully);
+
+			// Remove module
+			$this->remove_module();
+
+			return $void;
+		} else {
+			parent::config($file, $use_sections, $fail_gracefully);
+		}
+	}
+
+	/**
+	 * Load Helper
+	 *
+	 * This function loads the specified helper file.
+	 *
+	 * @param	mixed
+	 * @return	void
+	 */
+	public function helper($helper = array()) {
+		if (is_array($helper)) {
+			foreach ($helper as $help) {
+				$this->helper($help);
+			}
+			return;
+		}
+
+		// Detect module
+		if (list($module, $class) = $this->detect_module($helper)) {
+			// Module already loaded
+			if (in_array($module, $this->_ci_modules)) {
+				return parent::helper($class);
+			}
+
+			// Add module
+			$this->add_module($module);
+
+			// Let parent do the heavy work
+			$void = parent::helper($class);
+
+			// Remove module
+			$this->remove_module();
+
+			return $void;
+		} else {
+			return parent::helper($helper);
+		}
+	}
+
+	/**
+	 * Loads a language file
+	 *
+	 * @param	array
+	 * @param	string
+	 * @return	void
+	 */
+	public function language($file = array(), $lang = '') {
+		if (is_array($file)) {
+			foreach ($file as $langfile) {
+				$this->language($langfile, $lang);
+			}
+			return;
+		}
+
+		// Detect module
+		if (list($module, $class) = $this->detect_module($file)) {
+			// Module already loaded
+			if (in_array($module, $this->_ci_modules)) {
+				return parent::language($class, $lang);
+			}
+
+			// Add module
+			$this->add_module($module);
+
+			// Let parent do the heavy work
+			$void = parent::language($class, $lang);
+
+			// Remove module
+			$this->remove_module();
+
+			return $void;
+		} else {
+			return parent::language($file, $lang);
+		}
+	}
+
+	/**
+	 * Load Widget
+	 *
+	 * This function provides support to Jens Segers Template Library for loading
+	 * widget controllers within modules (place in module/widgets folder).
+	 * @author  hArpanet - 23-Jun-2014
+	 *
+	 * @param   string $widget  Must contain Module name if widget within a module
+	 *                          (eg. test/nav  where module name is 'test')
+	 * @return  array|false
+	 */
+	public function widget($widget) {
+
+		// Detect module
+		if (list($module, $widget) = $this->detect_module($widget)) {
+			// Module already loaded
+			if (in_array($module, $this->_ci_modules)) {
+				return array($module, $widget);
+			}
+
+			// Add module
+			$this->add_module($module);
+
+			// Look again now we've added new module path
+			$void = $this->widget($module.'/'.$widget);
+
+			// Remove module if widget not found within it
+			if (!$void) {
+				$this->remove_module();
+			}
+
+			return $void;
+
+		} else {
+			// widget not found in module
+			return FALSE;
+		}
+	}
+
+	/**
+	 * Add Module
+	 *
+	 * Allow resources to be loaded from this module path
+	 *
+	 * @param	string
+	 * @param 	boolean
+	 */
+	public function add_module($module, $view_cascade = TRUE) {
+		if ($path = $this->find_module($module)) {
+			// Mark module as loaded
+			array_unshift($this->_ci_modules, $module);
+
+			// Add package path
+			parent::add_package_path($path, $view_cascade);
+		}
+	}
+
+	/**
+	 * Remove Module
+	 *
+	 * Remove a module from the allowed module paths
+	 *
+	 * @param	type
+	 * @param 	bool
+	 */
+	public function remove_module($module = '', $remove_config = TRUE) {
+		if ($module == '') {
+			// Mark module as not loaded
+			array_shift($this->_ci_modules);
+
+			// Remove package path
+			parent::remove_package_path('', $remove_config);
+		} else if (($key = array_search($module, $this->_ci_modules)) !== FALSE) {
+			if ($path = $this->find_module($module)) {
+				// Mark module as not loaded
+				unset($this->_ci_modules[$key]);
+
+				// Remove package path
+				parent::remove_package_path($path, $remove_config);
+			}
+		}
+	}
+
+	/**
+	 * Controller loader
+	 *
+	 * This function is used to load and instantiate controllers
+	 *
+	 * @param	string
+	 * @param	array
+	 * @param	boolean
+	 * @return	object
+	 */
+	private function _load_controller($uri = '', $params = array(), $return = FALSE) {
+		$router = & $this->_ci_get_component('router');
+
+		// Back up current router values (before loading new controller)
+		$backup = array();
+		foreach (array('directory', 'class', 'method', 'module') as $prop) {
+			$backup[$prop] = $router->{$prop};
+		}
+
+		// Locate the controller
+		$segments = $router->locate(explode('/', $uri));
+		$class = isset($segments[0]) ? $segments[0] : FALSE;
+		$method = isset($segments[1]) ? $segments[1] : "index";
+
+		// Controller not found
+		if (!$class) {
+			return;
+		}
+
+		if (!array_key_exists(strtolower($class), $this->_ci_controllers)) {
+			// Determine filepath
+			$filepath = APPPATH . 'controllers/' . $router->fetch_directory() . $class . '.php';
+
+			// Load the controller file
+			if (file_exists($filepath)) {
+				include_once ($filepath);
+			}
+
+			// Controller class not found, show 404
+			if (!class_exists($class)) {
+				show_404("{$class}/{$method}");
+			}
+
+			// Create a controller object
+			$this->_ci_controllers[strtolower($class)] = new $class();
+		}
+
+		$controller = $this->_ci_controllers[strtolower($class)];
+
+		// Method does not exists
+		if (!method_exists($controller, $method)) {
+			show_404("{$class}/{$method}");
+		}
+
+		// Restore router state
+		foreach ($backup as $prop => $value) {
+			$router->{$prop} = $value;
+		}
+
+		// Capture output and return
+		ob_start();
+		$result = call_user_func_array(array($controller, $method), $params);
+
+		// Return the buffered output
+		if ($return === TRUE) {
+			$buffer = ob_get_contents();
+			@ob_end_clean();
+			return $buffer;
+		}
+
+		// Close buffer and flush output to screen
+		ob_end_flush();
+
+		// Return controller return value
+		return $result;
+	}
+
+	/**
+	 * Detects the module from a string. Returns the module name and class if found.
+	 *
+	 * @param	string
+	 * @return	array|boolean
+	 */
+	private function detect_module($class) {
+		$class = str_replace('.php', '', trim($class, '/'));
+		if (($first_slash = strpos($class, '/')) !== FALSE) {
+			$module = substr($class, 0, $first_slash);
+			$class = substr($class, $first_slash + 1);
+
+			// Check if module exists
+			if ($this->find_module($module)) {
+				return array($module, $class);
+			}
+		}
+
+		return FALSE;
+	}
+
+	/**
+	 * Searches a given module name. Returns the path if found, FALSE otherwise
+	 *
+	 * @param string $module
+	 * @return string|boolean
+	 */
+	private function find_module($module) {
+		$config = & $this->_ci_get_component('config');
+
+		// Check all locations for this module
+		foreach ($config->item('modules_locations') as $location) {
+			$path = $location . rtrim($module, '/') . '/';
+			if (is_dir($path)) {
+				return $path;
+			}
+		}
+
+		return FALSE;
+	}
 }

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

application/views/errors/cli/error_php.php

Indentation +7 added lines, -7 removed lines

@@ -10,15 +10,15 @@
 <?php echo \Myth\CLI::write("\tLine Number: {$line}"); ?>
 
 <?php
-    if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE) {
+	if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE) {
 
-        echo \Myth\CLI::write("\n\tBacktrace");
+		echo \Myth\CLI::write("\n\tBacktrace");
 
-        foreach (debug_backtrace() as $error) {
-            if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0) {
-                echo \Myth\CLI::write("\t\t- {$error['function']}() - Line {$error['line']} in {$error['file']}");
-            }
-        }
+		foreach (debug_backtrace() as $error) {
+			if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0) {
+				echo \Myth\CLI::write("\t\t- {$error['function']}() - Line {$error['line']} in {$error['file']}");
+			}
+		}
 }
 
 echo \Myth\CLI::new_line();

application/views/home/index.php

Indentation +3 added lines, -3 removed lines

@@ -5,7 +5,7 @@ 
 
     <?= $uikit->row([], function() use($uikit) {
 
-        echo $uikit->column(['sizes' => ['l'=>6]], function() use($uikit) { ?>
+		echo $uikit->column(['sizes' => ['l'=>6]], function() use($uikit) { ?>
             <h3>What Is Sprint?</h3>
 
             <p>SprintPHP is a souped-up version of <a href="http://codeigniter.com">CodeIgniter <?= CI_VERSION ?></a>. And soon to be the heart and soul
@@ -25,7 +25,7 @@ 
 
 
 
-        echo $uikit->column(['sizes' => ['l'=>6]], function() use($uikit) { ?>
+		echo $uikit->column(['sizes' => ['l'=>6]], function() use($uikit) { ?>
             <h3>Get To Know Sprint</h3>
 
             <p>The following resources will help you as you explore the power and flexibility that SprintPHP provides. Feel free to dig into source code of the controllers and views
@@ -39,6 +39,6 @@ 
 
         <?php });
 
-    }); ?>
+	}); ?>
 
 </div>

build/build.php

Indentation +29 added lines, -29 removed lines

@@ -1,34 +1,34 @@
 <?php
 /**
- * Sprint
- *
- * A set of power tools to enhance the CodeIgniter framework and provide consistent workflow.
- *
- * 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.
- *
- * @package     Sprint
- * @author      Lonnie Ezell
- * @copyright   Copyright 2014-2015, New Myth Media, LLC (http://newmythmedia.com)
- * @license     http://opensource.org/licenses/MIT  (MIT)
- * @link        http://sprintphp.com
- * @since       Version 1.0
- */
+	 * Sprint
+	 *
+	 * A set of power tools to enhance the CodeIgniter framework and provide consistent workflow.
+	 *
+	 * 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.
+	 *
+	 * @package     Sprint
+	 * @author      Lonnie Ezell
+	 * @copyright   Copyright 2014-2015, New Myth Media, LLC (http://newmythmedia.com)
+	 * @license     http://opensource.org/licenses/MIT  (MIT)
+	 * @link        http://sprintphp.com
+	 * @since       Version 1.0
+	 */
 
 /**
  * BUILD TOOL

build/build_config.php

Indentation +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 	$config['builds'] = [
 		'release'           => 'SprintRelease',
 		'postCreateProject' => 'InitialCleanup',
-        'publishSubTrees'   => 'SubTreeSplit'
+		'publishSubTrees'   => 'SubTreeSplit'
 	];
 
 //--------------------------------------------------------------------