ci-bonfire / Sprint

myth/Forensics/Profiler.php

Indentation +5 added lines, -5 removed lines

@@ -531,16 +531,16 @@
 
 
 	public static function get_file_size($size, $retstring = null) {
-        // adapted from code at http://aidanlister.com/repos/v/function.size_readable.php
-	    $sizes = array('bytes', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
+		// adapted from code at http://aidanlister.com/repos/v/function.size_readable.php
+		$sizes = array('bytes', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
 
-	    if ($retstring === null) { $retstring = '%01.2f %s'; }
+		if ($retstring === null) { $retstring = '%01.2f %s'; }
 
 		$lastsizestring = end($sizes);
 
 		foreach ($sizes as $sizestring) {
-	       	if ($size < 1024) { break; }
-	           if ($sizestring != $lastsizestring) { $size /= 1024; }
+		   	if ($size < 1024) { break; }
+			   if ($sizestring != $lastsizestring) { $size /= 1024; }
 		}
 
 		if ($sizestring == $sizes[0]) { $retstring = '%01d %s'; } // Bytes aren't normally fractional

myth/Forge/BaseGenerator.php

Indentation +441 added lines, -441 removed lines

@@ -1,34 +1,34 @@ 
 <?php namespace Myth\Forge;
 /**
- * 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
+	 */
 
 use Myth\Controllers\CLIController;
 use Myth\CLI;
@@ -43,13 +43,13 @@ 
  */
 abstract class BaseGenerator extends CLIController {
 
-    /**
-     * Instance of the active themer.
-     * @var null
-     */
-    protected $themer = null;
+	/**
+	 * Instance of the active themer.
+	 * @var null
+	 */
+	protected $themer = null;
 
-    protected $gen_path = null;
+	protected $gen_path = null;
 
 	/**
 	 * The name of the module being used, if any.
@@ -62,254 +62,254 @@ 
 
 	protected $overwrite = false;
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    public function __construct()
-    {
-        parent::__construct();
+	public function __construct()
+	{
+		parent::__construct();
 
-        $this->load->config('forge');
+		$this->load->config('forge');
 
-	    // Detect if we're genning in a module
-	    if ($module = CLI::option('module'))
-	    {
-		    $this->module = $module;
+		// Detect if we're genning in a module
+		if ($module = CLI::option('module'))
+		{
+			$this->module = $module;
 
-		    $folders = config_item('modules_locations');
+			$folders = config_item('modules_locations');
 
-		    if (is_array($folders))
-		    {
-			    $this->module_path = $folders[0] . strtolower($module) .'/';
-		    }
+			if (is_array($folders))
+			{
+				$this->module_path = $folders[0] . strtolower($module) .'/';
+			}
 		}
 
-	    // Should we overwrite files?
-	    if (CLI::option('overwrite'))
-	    {
-		    $this->overwrite = true;
-	    }
-    }
+		// Should we overwrite files?
+		if (CLI::option('overwrite'))
+		{
+			$this->overwrite = true;
+		}
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 
-    /**
-     * The method called by the main generator script. This must be
-     * overridden by child classes to implement the actual logic used.
-     *
-     * @param array $segments
-     * @param bool  $quiet      If true, models should accept default values.
-     * @return mixed
-     */
-    abstract function run($segments=[], $quiet=false);
+	/**
+	 * The method called by the main generator script. This must be
+	 * overridden by child classes to implement the actual logic used.
+	 *
+	 * @param array $segments
+	 * @param bool  $quiet      If true, models should accept default values.
+	 * @return mixed
+	 */
+	abstract function run($segments=[], $quiet=false);
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 
-    /**
-     * Creates a file at the specified path with the given contents.
-     *
-     * @param $path
-     * @param null $contents
-     *
-     * @return bool
-     */
-    public function createFile($path, $contents=null, $overwrite=false, $perms=0644)
-    {
-	    $path = $this->sandbox($path);
+	/**
+	 * Creates a file at the specified path with the given contents.
+	 *
+	 * @param $path
+	 * @param null $contents
+	 *
+	 * @return bool
+	 */
+	public function createFile($path, $contents=null, $overwrite=false, $perms=0644)
+	{
+		$path = $this->sandbox($path);
 
-	    $file_exists = is_file($path);
+		$file_exists = is_file($path);
 
-        // Does file already exist?
-        if ($file_exists)
-        {
-	        if (! $overwrite) {
-		        CLI::write( CLI::color("\t". strtolower(lang('exists')) .": ", 'blue') . str_replace(APPPATH, '', $path ) );
-		        return true;
-	        }
+		// Does file already exist?
+		if ($file_exists)
+		{
+			if (! $overwrite) {
+				CLI::write( CLI::color("\t". strtolower(lang('exists')) .": ", 'blue') . str_replace(APPPATH, '', $path ) );
+				return true;
+			}
 
-	        unlink($path);
-        }
+			unlink($path);
+		}
 
-	    // Do we need to create the directory?
-	    $segments = explode('/', $path);
+		// Do we need to create the directory?
+		$segments = explode('/', $path);
 		array_pop($segments);
 		$folder = implode('/', $segments);
 
-	    if (! is_dir($folder))
-	    {
-		    $this->createDirectory($folder);
-	    }
+		if (! is_dir($folder))
+		{
+			$this->createDirectory($folder);
+		}
 
-        get_instance()->load->helper('file');
+		get_instance()->load->helper('file');
 
-        if (! write_file($path, $contents))
-        {
-            throw new \RuntimeException( sprintf( lang('errors.writing_file'),  $path) );
-        }
+		if (! write_file($path, $contents))
+		{
+			throw new \RuntimeException( sprintf( lang('errors.writing_file'),  $path) );
+		}
 
-        chmod($path, $perms);
+		chmod($path, $perms);
 
-	    if ($overwrite && $file_exists)
-	    {
-		    CLI::write( CLI::color("\t". strtolower( lang('overwrote') ) ." ", 'light_red') . str_replace(APPPATH, '', $path ) );
-	    }
-	    else
-	    {
-		    CLI::write( CLI::color("\t". strtolower( lang('created') ) ." ", 'yellow') . str_replace(APPPATH, '', $path ) );
-	    }
+		if ($overwrite && $file_exists)
+		{
+			CLI::write( CLI::color("\t". strtolower( lang('overwrote') ) ." ", 'light_red') . str_replace(APPPATH, '', $path ) );
+		}
+		else
+		{
+			CLI::write( CLI::color("\t". strtolower( lang('created') ) ." ", 'yellow') . str_replace(APPPATH, '', $path ) );
+		}
 
-        return $this;
-    }
+		return $this;
+	}
     
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a new directory at the specified path.
-     *
-     * @param $path
-     * @param int|string $perms
-     *
-     * @return bool
-     */
-    public function createDirectory($path, $perms=0755)
-    {
-	    $path = $this->sandbox($path);
-
-        if (is_dir($path))
-        {
-            return $this;
-        }
-
-        if (! mkdir($path, $perms, true) )
-        {
-            throw new \RuntimeException( sprintf( lang('errors.creating_dir'), $path) );
-        }
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Copies a file from the current template group to the destination.
-     *
-     * @param $source
-     * @param $destination
-     * @param bool $overwrite
-     *
-     * @return bool
-     */
-    public function copyFile($source, $destination, $overwrite=false)
-    {
-	    $source = $this->sandbox($source);
-
-	    if (! file_exists($source))
-	    {
-		    return null;
-	    }
-
-	    $content = file_get_contents($source);
-
-	    return $this->createFile($destination, $content, $overwrite);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Attempts to locate a template within the current template group,
-     * parses it with the passed in data, and writes to the new location.
-     *
-     * @param $template
-     * @param $destination
-     * @param array $data
-     * @param bool $overwrite
-     *
-     * @return $this
-     */
-    public function copyTemplate($template, $destination, $data=[], $overwrite=false)
-    {
-	    if (! is_array($data))
-	    {
-		    $data = array($data);
-	    }
-
-        $content = $this->render($template, $data);
-
-        return $this->createFile($destination, $content, $overwrite);
-    }
-
-    //--------------------------------------------------------------------
-
-
-    /**
-     * Injects a block of code into an existing file. Using options
-     * you can specify where the code should be inserted. Available options
-     * are:
-     *      prepend         - Place at beginning of file
-     *      append          - Place at end of file
-     *      before  => ''   - Insert just prior to this line of text (don't forget the line ending "\n")
-     *      after   => ''   - Insert just after this line of text (don't forget the line ending "\n")
-     *      replace => ''   - a simple string to be replaced. All locations will be replaced.
-     *      regex   => ''   - a pregex pattern to use to replace all locations.
-     *
-     * @param $path
-     * @param $content
-     * @param array $options
-     *
-     * @return $this
-     */
-    public function injectIntoFile($path, $content, $options='append')
-    {
-        $kit = new FileKit();
-
-        if (is_string($options))
-        {
-            $action = $options;
-        }
-        else if (is_array($options) && count($options))
-        {
-            $keys = array_keys($options);
-            $action = array_shift( $keys );
-            $param = $options[$action];
-        }
-
-        switch ( strtolower($action) )
-        {
-            case 'prepend':
-                $success = $kit->prepend($path, $content);
-                break;
-            case 'before':
-                $success = $kit->before($path, $param, $content);
-                break;
-            case 'after':
-                $success = $kit->after($path, $param, $content);
-                break;
-            case 'replace':
-                $success = $kit->replaceIn($path, $param, $content);
-                break;
-            case 'regex':
-                $success = $kit->replaceWithRegex($path, $param, $content);
-                break;
-            case 'append':
-            default:
-                $success = $kit->append($path, $content);
-                break;
-        }
-
-        if ($success)
-        {
-            CLI::write( CLI::color("\t". strtolower( lang('modified') ) ." ", 'cyan') . str_replace(APPPATH, '', $path ) );
-        }
-        else
-        {
-            CLI::write( CLI::color("\t". strtolower( lang('error') ) ." ", 'light_red') . str_replace(APPPATH, '', $path ) );
-        }
-
-        return $this;
-    }
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a new directory at the specified path.
+	 *
+	 * @param $path
+	 * @param int|string $perms
+	 *
+	 * @return bool
+	 */
+	public function createDirectory($path, $perms=0755)
+	{
+		$path = $this->sandbox($path);
+
+		if (is_dir($path))
+		{
+			return $this;
+		}
+
+		if (! mkdir($path, $perms, true) )
+		{
+			throw new \RuntimeException( sprintf( lang('errors.creating_dir'), $path) );
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Copies a file from the current template group to the destination.
+	 *
+	 * @param $source
+	 * @param $destination
+	 * @param bool $overwrite
+	 *
+	 * @return bool
+	 */
+	public function copyFile($source, $destination, $overwrite=false)
+	{
+		$source = $this->sandbox($source);
+
+		if (! file_exists($source))
+		{
+			return null;
+		}
+
+		$content = file_get_contents($source);
+
+		return $this->createFile($destination, $content, $overwrite);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Attempts to locate a template within the current template group,
+	 * parses it with the passed in data, and writes to the new location.
+	 *
+	 * @param $template
+	 * @param $destination
+	 * @param array $data
+	 * @param bool $overwrite
+	 *
+	 * @return $this
+	 */
+	public function copyTemplate($template, $destination, $data=[], $overwrite=false)
+	{
+		if (! is_array($data))
+		{
+			$data = array($data);
+		}
+
+		$content = $this->render($template, $data);
+
+		return $this->createFile($destination, $content, $overwrite);
+	}
+
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * Injects a block of code into an existing file. Using options
+	 * you can specify where the code should be inserted. Available options
+	 * are:
+	 *      prepend         - Place at beginning of file
+	 *      append          - Place at end of file
+	 *      before  => ''   - Insert just prior to this line of text (don't forget the line ending "\n")
+	 *      after   => ''   - Insert just after this line of text (don't forget the line ending "\n")
+	 *      replace => ''   - a simple string to be replaced. All locations will be replaced.
+	 *      regex   => ''   - a pregex pattern to use to replace all locations.
+	 *
+	 * @param $path
+	 * @param $content
+	 * @param array $options
+	 *
+	 * @return $this
+	 */
+	public function injectIntoFile($path, $content, $options='append')
+	{
+		$kit = new FileKit();
+
+		if (is_string($options))
+		{
+			$action = $options;
+		}
+		else if (is_array($options) && count($options))
+		{
+			$keys = array_keys($options);
+			$action = array_shift( $keys );
+			$param = $options[$action];
+		}
+
+		switch ( strtolower($action) )
+		{
+			case 'prepend':
+				$success = $kit->prepend($path, $content);
+				break;
+			case 'before':
+				$success = $kit->before($path, $param, $content);
+				break;
+			case 'after':
+				$success = $kit->after($path, $param, $content);
+				break;
+			case 'replace':
+				$success = $kit->replaceIn($path, $param, $content);
+				break;
+			case 'regex':
+				$success = $kit->replaceWithRegex($path, $param, $content);
+				break;
+			case 'append':
+			default:
+				$success = $kit->append($path, $content);
+				break;
+		}
+
+		if ($success)
+		{
+			CLI::write( CLI::color("\t". strtolower( lang('modified') ) ." ", 'cyan') . str_replace(APPPATH, '', $path ) );
+		}
+		else
+		{
+			CLI::write( CLI::color("\t". strtolower( lang('error') ) ." ", 'light_red') . str_replace(APPPATH, '', $path ) );
+		}
+
+		return $this;
+	}
     
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 	/**
 	 * Runs another generator. The first parameter is the name of the
@@ -320,130 +320,130 @@ 
 	 * @param $command
 	 * @param null $options
 	 */
-    public function generate($command, $options = '', $quiet=false)
-    {
+	public function generate($command, $options = '', $quiet=false)
+	{
 		$orig_options = CLI::optionString();
-	    $options = $orig_options .' '. $options;
-
-	    if ($quiet === true)
-	    {
-		    $options .= ' -quiet';
-	    }
-
-	    if ($this->overwrite === true)
-	    {
-		    $options .= ' -overwrite';
-	    }
-
-	    passthru( "php sprint forge {$command} {$options}" );
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Adds a new route to the application's route file.
-     *
-     * @param $left
-     * @param $right
-     *
-     * @return \Myth\Forge\BaseGenerator
-     */
-    public function route($left, $right, $options=[], $method='any')
-    {
-        $option_str = '[';
-
-        foreach ($options as $key => $value)
-        {
-            $option_str .= "";
-        }
-
-        $option_str .= ']';
-
-        $content = "\$routes->{$method}('{$left}', '{$right}', {$option_str});\n";
-
-        return $this->injectIntoFile(APPPATH .'config/routes.php', $content, ['after' => "// Auto-generated routes go here\n"]);
-    }
+		$options = $orig_options .' '. $options;
+
+		if ($quiet === true)
+		{
+			$options .= ' -quiet';
+		}
+
+		if ($this->overwrite === true)
+		{
+			$options .= ' -overwrite';
+		}
+
+		passthru( "php sprint forge {$command} {$options}" );
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Adds a new route to the application's route file.
+	 *
+	 * @param $left
+	 * @param $right
+	 *
+	 * @return \Myth\Forge\BaseGenerator
+	 */
+	public function route($left, $right, $options=[], $method='any')
+	{
+		$option_str = '[';
+
+		foreach ($options as $key => $value)
+		{
+			$option_str .= "";
+		}
+
+		$option_str .= ']';
+
+		$content = "\$routes->{$method}('{$left}', '{$right}', {$option_str});\n";
+
+		return $this->injectIntoFile(APPPATH .'config/routes.php', $content, ['after' => "// Auto-generated routes go here\n"]);
+	}
     
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Outputs the contents of the file in the template's source path.
-     */
-    public function readme($file='readme.txt')
-    {
-	    $name = str_replace('Generator', '', get_class($this));
+	/**
+	 * Outputs the contents of the file in the template's source path.
+	 */
+	public function readme($file='readme.txt')
+	{
+		$name = str_replace('Generator', '', get_class($this));
 
-	    $path = $this->locateGenerator($name);
+		$path = $this->locateGenerator($name);
 
-        if (! file_exists($path . $file))
-        {
-            CLI::error(sprintf( lang('forge.cant_find_readme'), $file) );
-        }
+		if (! file_exists($path . $file))
+		{
+			CLI::error(sprintf( lang('forge.cant_find_readme'), $file) );
+		}
 
-	    $contents = file_get_contents($path . $file);
+		$contents = file_get_contents($path . $file);
 
-        CLI::new_line(2);
-        CLI::write( CLI::wrap($contents), 'green' );
-        CLI::new_line();
-    }
+		CLI::new_line(2);
+		CLI::write( CLI::wrap($contents), 'green' );
+		CLI::new_line();
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Renders a single generator template. The file must be in a folder
-     * under the template group named the same as $this->generator_name.
-     * The file must have a '.tpl.php' file extension.
-     *
-     * @param $template_name
-     * @param array $data
-     *
-     * @return string The rendered template
-     */
-    public function render($template_name, $data=[], $folder=null)
-    {
-        if (empty($this->themer))
-        {
-            $this->setupThemer();
-        }
+	/**
+	 * Renders a single generator template. The file must be in a folder
+	 * under the template group named the same as $this->generator_name.
+	 * The file must have a '.tpl.php' file extension.
+	 *
+	 * @param $template_name
+	 * @param array $data
+	 *
+	 * @return string The rendered template
+	 */
+	public function render($template_name, $data=[], $folder=null)
+	{
+		if (empty($this->themer))
+		{
+			$this->setupThemer();
+		}
 
-	    $data['uikit'] = $this->loadUIKit();
+		$data['uikit'] = $this->loadUIKit();
 
-        $output = null;
+		$output = null;
 
-	    $view = $template_name .'.tpl';
+		$view = $template_name .'.tpl';
 
-        $groups = config_item('forge.collections');
+		$groups = config_item('forge.collections');
 
-	    $name = str_replace('Generator', '', get_class($this) );
+		$name = str_replace('Generator', '', get_class($this) );
 
-        foreach ($groups as $group => $path)
-        {
-	        $path = rtrim($path, '/ ') .'/';
-	        $folders = scandir($path);
+		foreach ($groups as $group => $path)
+		{
+			$path = rtrim($path, '/ ') .'/';
+			$folders = scandir($path);
 
-	        if (! $i = array_search(ucfirst($name), $folders))
-	        {
-		        continue;
-	        }
+			if (! $i = array_search(ucfirst($name), $folders))
+			{
+				continue;
+			}
 
-	        $view = $folders[$i] . '/'. $view;
+			$view = $folders[$i] . '/'. $view;
 
-            if (realpath($path . $view .'.php'))
-            {
-                $output = $this->themer->display($group .':'. $view, $data);
-                break;
-            }
-        }
+			if (realpath($path . $view .'.php'))
+			{
+				$output = $this->themer->display($group .':'. $view, $data);
+				break;
+			}
+		}
 
-	    // To allow for including any PHP code in the templates,
-	    // replace any '@php' and '@=' tags with their correct PHP syntax.
-	    $output = str_replace('@php', '<?php', $output);
-	    $output = str_replace('@=', '<?=', $output);
+		// To allow for including any PHP code in the templates,
+		// replace any '@php' and '@=' tags with their correct PHP syntax.
+		$output = str_replace('@php', '<?php', $output);
+		$output = str_replace('@=', '<?=', $output);
 
-        return $output;
-    }
+		return $output;
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 	/**
 	 * Forces a path to exist within the current application's folder.
@@ -458,7 +458,7 @@ 
 	 */
 	public function sandbox($path)
 	{
-        $path = $this->normalizePath($path);
+		$path = $this->normalizePath($path);
 
 		// If it's writing to BASEPATH - FIX IT
 		if (strpos($path, $this->normalizePath(BASEPATH) ) === 0)
@@ -478,37 +478,37 @@ 
 			return $path;
 		}
 
-	    return APPPATH . $path;
+		return APPPATH . $path;
 	}
 
 	//--------------------------------------------------------------------
 
 
 
-    //--------------------------------------------------------------------
-    // Private Methods
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+	// Private Methods
+	//--------------------------------------------------------------------
 
-    protected function setupThemer()
-    {
-        $themer_name = config_item('forge.themer');
+	protected function setupThemer()
+	{
+		$themer_name = config_item('forge.themer');
 
-        if (! $themer_name)
-        {
-            throw new \RuntimeException( lang('forge.no_themer') );
-        }
+		if (! $themer_name)
+		{
+			throw new \RuntimeException( lang('forge.no_themer') );
+		}
 
-        $this->themer = new $themer_name( get_instance() );
+		$this->themer = new $themer_name( get_instance() );
 
-        // Register our paths with the themer
-        $paths = config_item('forge.collections');
+		// Register our paths with the themer
+		$paths = config_item('forge.collections');
 
-        foreach ($paths as $key => $path) {
-            $this->themer->addThemePath($key, $path);
-        }
-    }
+		foreach ($paths as $key => $path) {
+			$this->themer->addThemePath($key, $path);
+		}
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 	public function loadUIKit()
 	{
@@ -521,7 +521,7 @@ 
 
 		$uikit = new $kit_name();
 
-	    return $uikit;
+		return $uikit;
 	}
 
 	//--------------------------------------------------------------------
@@ -639,66 +639,66 @@ 
 
 	//--------------------------------------------------------------------
 
-    /**
-     * Normalizes a path and cleans it up for healthy use within
-     * realpath() and helps to mitigate changes between Windows and *nix
-     * operating systems.
-     *
-     * Found at http://php.net/manual/en/function.realpath.php#112367
-     *
-     * @param $path
-     *
-     * @return string
-     */
-    protected function normalizePath($path)
-    {
-        // Array to build a new path from the good parts
-        $parts = array();
-
-        // Replace backslashes with forward slashes
-        $path = str_replace('\\', '/', $path);
-
-        // Combine multiple slashes into a single slash
-        $path = preg_replace('/\/+/', '/', $path);
-
-        // Collect path segments
-        $segments = explode('/', $path);
-
-        // Initialize testing variable
-        $test = '';
-
-        foreach($segments as $segment)
-        {
-            if($segment != '.')
-            {
-                $test = array_pop($parts);
-
-                if(is_null($test))
-                {
-                    $parts[] = $segment;
-                }
-                else if ($segment == '..')
-                {
-                    if ($test == '..')
-                    {
-                        $parts[] = $test;
-                    }
-
-                    if ($test == '..' || $test == '')
-                    {
-                        $parts[] = $segment;
-                    }
-                }
-                else
-                {
-                    $parts[] = $test;
-                    $parts[] = $segment;
-                }
-            }
-        }
-        return implode('/', $parts);
-    }
-
-    //--------------------------------------------------------------------
+	/**
+	 * Normalizes a path and cleans it up for healthy use within
+	 * realpath() and helps to mitigate changes between Windows and *nix
+	 * operating systems.
+	 *
+	 * Found at http://php.net/manual/en/function.realpath.php#112367
+	 *
+	 * @param $path
+	 *
+	 * @return string
+	 */
+	protected function normalizePath($path)
+	{
+		// Array to build a new path from the good parts
+		$parts = array();
+
+		// Replace backslashes with forward slashes
+		$path = str_replace('\\', '/', $path);
+
+		// Combine multiple slashes into a single slash
+		$path = preg_replace('/\/+/', '/', $path);
+
+		// Collect path segments
+		$segments = explode('/', $path);
+
+		// Initialize testing variable
+		$test = '';
+
+		foreach($segments as $segment)
+		{
+			if($segment != '.')
+			{
+				$test = array_pop($parts);
+
+				if(is_null($test))
+				{
+					$parts[] = $segment;
+				}
+				else if ($segment == '..')
+				{
+					if ($test == '..')
+					{
+						$parts[] = $test;
+					}
+
+					if ($test == '..' || $test == '')
+					{
+						$parts[] = $segment;
+					}
+				}
+				else
+				{
+					$parts[] = $test;
+					$parts[] = $segment;
+				}
+			}
+		}
+		return implode('/', $parts);
+	}
+
+	//--------------------------------------------------------------------
 
 }

myth/Forge/FileKit.php

Indentation +197 added lines, -197 removed lines

@@ -32,206 +32,206 @@
 
 class FileKit {
 
-    /**
-     * Appends data to the end of a file.
-     *
-     * @param $file
-     * @param $content
-     * @return bool|int
-     */
-    public function append($file, $content)
-    {
-        if (empty($content))
-        {
-            return true;
-        }
-
-        // Ensure that $content has a newline at the end
-        $content = rtrim($content) ."\n";
-
-        $fh = fopen($file, 'a');
-        $result = fwrite($fh, $content);
-        fclose($fh);
-
-        return $result;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Prepends string content to a file. For very large files
-     * this method could have memory issues, but the primary usage
-     * of source files shouldn't ever get large enough to cause issues.
-     *
-     * @param $file
-     * @param $content
-     * @return bool|int
-     */
-    public function prepend($file, $content)
-    {
-        if (empty($content))
-        {
-            return true;
-        }
-
-        // Ensure that $content has a newline at the end
-        $content = rtrim($content) ."\n";
-
-        $file_contents = file_get_contents($file);
-
-        if ($file_contents === false)
-        {
-            throw new \RuntimeException( sprintf(lang('errors.reading_file'), $file));
-        }
-
-        $result = file_put_contents($file, $content . $file_contents);
-
-        return (bool)$result;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Inserts $content before the line that matches $before. NOT case-
-     * sensitive.
-     *
-     * @param $file
-     * @param $before
-     * @param $content
-     * @return int
-     */
-    public function before($file, $before, $content)
-    {
-        if (empty($content))
-        {
-            return true;
-        }
-
-        // Ensure that $content has a newline at the end
-        $content = rtrim($content) ."\n";
-
-        $lines = file($file);
-
-        if ($lines === false)
-        {
-            throw new \RuntimeException( sprintf( lang('errors.file_not_found'), $file ));
-        }
-
-        // Where to insert the row.
-        $location = null;
-
-        foreach ($lines as $index => $line)
-        {
-            if (strtolower($line) == strtolower($before) )
-            {
-                $location = $index;
-                break;
-            }
-        }
-
-        array_splice($lines, $location, 0, $content);
-
-        $result = file_put_contents($file, $lines);
-
-        return (bool)$result;
-    }
-
-    //--------------------------------------------------------------------
-
-    public function after($file, $after, $content)
-    {
-        if (empty($content))
-        {
-            return true;
-        }
-
-        // Ensure that $content has a newline at the end
-        $content = rtrim($content) ."\n";
-
-        $lines = file($file);
-
-        if ($lines === false)
-        {
-            throw new \RuntimeException( sprintf( lang('errors.file_not_found'), $file ) );
-        }
-
-        // Where to insert the row.
-        $location = null;
-
-        foreach ($lines as $index => $line)
-        {
-            if (strtolower($line) == strtolower($after) )
-            {
-                $location = $index;
-                break;
-            }
-        }
-
-        array_splice($lines, $location +1, 0, $content);
-
-        $result = file_put_contents($file, $lines);
-
-        return (bool)$result;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Replaces all instances of $search in the file with $replace.
-     *
-     * @param $file
-     * @param $search
-     * @param $replace
-     * @return int
-     */
-    public function replaceIn($file, $search, $replace)
-    {
-        $file_contents = file_get_contents($file);
-
-        if ($file_contents === false)
-        {
-            throw new \RuntimeException( sprintf( lang('errors.reading_file'), $file ) );
-        }
-
-        $file_contents = str_replace($search, $replace, $file_contents);
-
-        $result = file_put_contents($file, $file_contents);
-
-        return (bool)$result;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Uses preg_replace to replace content within the file.
-     *
-     * @param $file
-     * @param $pattern
-     * @param $replace
-     * @return int
-     */
-    public function replaceWithRegex($file, $pattern, $replace)
-    {
-        $file_contents = file_get_contents($file);
-
-        if ($file_contents === false)
-        {
-            throw new \RuntimeException( sprintf( lang('errors.reading_file'), $file ) );
-        }
+	/**
+	 * Appends data to the end of a file.
+	 *
+	 * @param $file
+	 * @param $content
+	 * @return bool|int
+	 */
+	public function append($file, $content)
+	{
+		if (empty($content))
+		{
+			return true;
+		}
+
+		// Ensure that $content has a newline at the end
+		$content = rtrim($content) ."\n";
+
+		$fh = fopen($file, 'a');
+		$result = fwrite($fh, $content);
+		fclose($fh);
+
+		return $result;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Prepends string content to a file. For very large files
+	 * this method could have memory issues, but the primary usage
+	 * of source files shouldn't ever get large enough to cause issues.
+	 *
+	 * @param $file
+	 * @param $content
+	 * @return bool|int
+	 */
+	public function prepend($file, $content)
+	{
+		if (empty($content))
+		{
+			return true;
+		}
+
+		// Ensure that $content has a newline at the end
+		$content = rtrim($content) ."\n";
+
+		$file_contents = file_get_contents($file);
+
+		if ($file_contents === false)
+		{
+			throw new \RuntimeException( sprintf(lang('errors.reading_file'), $file));
+		}
+
+		$result = file_put_contents($file, $content . $file_contents);
+
+		return (bool)$result;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Inserts $content before the line that matches $before. NOT case-
+	 * sensitive.
+	 *
+	 * @param $file
+	 * @param $before
+	 * @param $content
+	 * @return int
+	 */
+	public function before($file, $before, $content)
+	{
+		if (empty($content))
+		{
+			return true;
+		}
+
+		// Ensure that $content has a newline at the end
+		$content = rtrim($content) ."\n";
+
+		$lines = file($file);
+
+		if ($lines === false)
+		{
+			throw new \RuntimeException( sprintf( lang('errors.file_not_found'), $file ));
+		}
+
+		// Where to insert the row.
+		$location = null;
+
+		foreach ($lines as $index => $line)
+		{
+			if (strtolower($line) == strtolower($before) )
+			{
+				$location = $index;
+				break;
+			}
+		}
+
+		array_splice($lines, $location, 0, $content);
+
+		$result = file_put_contents($file, $lines);
+
+		return (bool)$result;
+	}
+
+	//--------------------------------------------------------------------
+
+	public function after($file, $after, $content)
+	{
+		if (empty($content))
+		{
+			return true;
+		}
+
+		// Ensure that $content has a newline at the end
+		$content = rtrim($content) ."\n";
+
+		$lines = file($file);
+
+		if ($lines === false)
+		{
+			throw new \RuntimeException( sprintf( lang('errors.file_not_found'), $file ) );
+		}
+
+		// Where to insert the row.
+		$location = null;
+
+		foreach ($lines as $index => $line)
+		{
+			if (strtolower($line) == strtolower($after) )
+			{
+				$location = $index;
+				break;
+			}
+		}
+
+		array_splice($lines, $location +1, 0, $content);
+
+		$result = file_put_contents($file, $lines);
+
+		return (bool)$result;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Replaces all instances of $search in the file with $replace.
+	 *
+	 * @param $file
+	 * @param $search
+	 * @param $replace
+	 * @return int
+	 */
+	public function replaceIn($file, $search, $replace)
+	{
+		$file_contents = file_get_contents($file);
+
+		if ($file_contents === false)
+		{
+			throw new \RuntimeException( sprintf( lang('errors.reading_file'), $file ) );
+		}
+
+		$file_contents = str_replace($search, $replace, $file_contents);
+
+		$result = file_put_contents($file, $file_contents);
+
+		return (bool)$result;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Uses preg_replace to replace content within the file.
+	 *
+	 * @param $file
+	 * @param $pattern
+	 * @param $replace
+	 * @return int
+	 */
+	public function replaceWithRegex($file, $pattern, $replace)
+	{
+		$file_contents = file_get_contents($file);
+
+		if ($file_contents === false)
+		{
+			throw new \RuntimeException( sprintf( lang('errors.reading_file'), $file ) );
+		}
 
-        $file_contents = preg_replace($pattern, $replace, $file_contents);
-
-        $result = false;
+		$file_contents = preg_replace($pattern, $replace, $file_contents);
+
+		$result = false;
 
-        // Don't let us erase a file!
-        if (! empty($file_contents))
-        {
-            $result = file_put_contents( $file, $file_contents );
-        }
+		// Don't let us erase a file!
+		if (! empty($file_contents))
+		{
+			$result = file_put_contents( $file, $file_contents );
+		}
 
-        return (bool)$result;
-    }
+		return (bool)$result;
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 }

myth/Mail/BaseMailer.php

Indentation +283 added lines, -283 removed lines

@@ -40,290 +40,290 @@
  */
 class BaseMailer {
 
-    /**
-     * How the email is delivered.
-     * Either 'send' or 'queue'.
-     * @var string
-     */
-    protected $action = 'send';
-
-    protected $from     = null;
-    protected $to       = null;
-    protected $reply_to = null;
-    protected $cc       = null;
-    protected $bcc      = null;
-
-    protected $message  = null;
-
-    protected $theme    = 'email';
-    protected $layout   = 'index';
-    protected $view     = null;
-
-    /**
-     * The MailService to use. If NULL
-     * will use the system default.
-     * @var null
-     */
-    protected $service_name  = null;
-
-    protected $service = null;
-
-    /**
-     * Used for theming the email messages.
-     * @var null
-     */
-    protected $themer = null;
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Constructor
-     *
-     * Simply allows us to override the default settings for this mailer.
-     *
-     * @param null $options
-     */
-    public function __construct($options=null)
-    {
-        if (! empty($options))
-        {
-            $this->setOptions($options);
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the basic options available to the mailer, like 'from', 'to',
-     * 'cc', 'bcc', etc.
-     *
-     * @param $options
-     */
-    public function setOptions($options)
-    {
-        if (is_array($options))
-        {
-            foreach ($options as $key => $value)
-            {
-                if ($key == 'service')
-                {
-                    $this->service =& $value;
-                    continue;
-                }
-
-                if (property_exists($this, $key))
-                {
-                    $this->$key = $value;
-                }
-            }
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-
-
-    /**
-     * Sends an email immediately using the system-defined MailService.
-     *
-     * @param string $to // Who the email is being sent to.
-     * @param string $subject // The subject line for the email
-     * @param strign $data // the key/value pairs to send to the views.
-     * @param string $view // You can override the view used for the email here.
-     *                          // You can change themes by prepending theme name
-     *                          // like: 'newtheme:newview'
-     *
-     * @return bool
-     */
-    public function send($to, $subject, $data=[], $view=null)
-    {
-        // Are we pretending to send?
-        if (config_item('mail.pretend') === true)
-        {
-            return true;
-        }
-
-        $this->startMailService();
-
-        $this->service->to($to);
-        $this->service->subject($subject);
-
-        if (is_array($this->from)) {
-            $this->service->from($this->from[0], $this->from[1]);
-        }
-        else
-        {
-            $this->service->from($this->from);
-        }
-
-        if (! empty($this->cc))         $this->service->cc($this->cc);
-        if (! empty($this->bcc))        $this->service->bcc($this->bcc);
-
-        if (is_array($this->reply_to)) {
-            $this->service->reply_to($this->reply_to[0], $this->reply_to[1]);
-        }
-        else
-        {
-            $this->service->reply_to($this->reply_to);
-        }
-
-
-        // Determine the view to use. We have to hack this a bit with
-        // the debug_backtrace, though, to make it all function in the background.
-        list(, $method) = debug_backtrace(false);
-
-        $view = 'emails/'. strtolower( (new \ReflectionClass($this))->getShortName() ) .'/'. $method['function'];
-
-        // Get our message's text and html versions based on which files exist...
-        $basepath = APPPATH .'views/'. $view;
-
-        // Is a text version available?
-        if (file_exists($basepath .'.text.php'))
-        {
-            $text = $this->load->view($view .'.text.php', $data, true);
-            $this->service->text_message($text);
-        }
-
-        // If an html version is around, we need to theme it out
-        if (file_exists($basepath .'.html.php'))
-        {
-            $this->startThemer();
-
-            $this->themer->setTheme($this->theme);
-
-            // Determine the correct layout to use
-            $layout = ! empty($this->layout) ? $this->layout : NULL;
-            $this->themer->setLayout($layout);
-
-            $this->themer->set($data);
-
-            // Render the view into a var we can pass to the layout.
-            $content = $this->themer->display($view .'.html.php');
-
-            $this->themer->set('content', $content);
-
-            $this->service->html_message( $this->themer->display($this->theme .':'. $layout) );
-        }
-
-        if (! $this->service->send() )
-        {
-            // todo do something here
-            return false;
-        }
-
-        return true;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Allows you to customize the headers sent with the email. You can
-     * do them one at a time by passing $field and $value, or pass an array
-     * of $field => $value pairs as the first parameter.
-     *
-     * @param string|array  $field
-     * @param string        $value
-     */
-    public function header($field, $value=null)
-    {
-        $this->startMailService();
-
-        $this->service->setHeader($field, $value);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Adds an attachment to the current email that is being built.
-     *
-     * @param string    $filename
-     * @param string    $disposition    like 'inline'. Default is 'attachment'
-     * @param string    $newname        If you'd like to rename the file for delivery
-     * @param string    $mime           Custom defined mime type.
-     */
-    public function attach($filename, $disposition=null, $newname=null, $mime=null)
-    {
-        $this->startMailService();
-
-        $this->service->attach($filename, $disposition, $newname, $mime);
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Private Methods
-    //--------------------------------------------------------------------
-
-    /**
-     * Starts up the service name specified in $service_name.
-     *
-     * @param $service_name
-     */
-    protected function startMailService()
-    {
-        // Only once!
-        if (! empty($this->service) && is_object($this->service))
-        {
-            return;
-        }
-
-        $service_name = ! empty($this->service_name) ? $this->service_name : config_item('mail.default_service');
-
-        if (! class_exists($service_name))
-        {
-            throw new \RuntimeException( sprintf( lang('mail.invalid_service'), $service_name) );
-        }
-
-        $this->service = new $service_name();
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Fires up the default themer so we can use it to theme our HTML messages.
-     */
-    protected function startThemer()
-    {
-        /*
+	/**
+	 * How the email is delivered.
+	 * Either 'send' or 'queue'.
+	 * @var string
+	 */
+	protected $action = 'send';
+
+	protected $from     = null;
+	protected $to       = null;
+	protected $reply_to = null;
+	protected $cc       = null;
+	protected $bcc      = null;
+
+	protected $message  = null;
+
+	protected $theme    = 'email';
+	protected $layout   = 'index';
+	protected $view     = null;
+
+	/**
+	 * The MailService to use. If NULL
+	 * will use the system default.
+	 * @var null
+	 */
+	protected $service_name  = null;
+
+	protected $service = null;
+
+	/**
+	 * Used for theming the email messages.
+	 * @var null
+	 */
+	protected $themer = null;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor
+	 *
+	 * Simply allows us to override the default settings for this mailer.
+	 *
+	 * @param null $options
+	 */
+	public function __construct($options=null)
+	{
+		if (! empty($options))
+		{
+			$this->setOptions($options);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the basic options available to the mailer, like 'from', 'to',
+	 * 'cc', 'bcc', etc.
+	 *
+	 * @param $options
+	 */
+	public function setOptions($options)
+	{
+		if (is_array($options))
+		{
+			foreach ($options as $key => $value)
+			{
+				if ($key == 'service')
+				{
+					$this->service =& $value;
+					continue;
+				}
+
+				if (property_exists($this, $key))
+				{
+					$this->$key = $value;
+				}
+			}
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+
+
+	/**
+	 * Sends an email immediately using the system-defined MailService.
+	 *
+	 * @param string $to // Who the email is being sent to.
+	 * @param string $subject // The subject line for the email
+	 * @param strign $data // the key/value pairs to send to the views.
+	 * @param string $view // You can override the view used for the email here.
+	 *                          // You can change themes by prepending theme name
+	 *                          // like: 'newtheme:newview'
+	 *
+	 * @return bool
+	 */
+	public function send($to, $subject, $data=[], $view=null)
+	{
+		// Are we pretending to send?
+		if (config_item('mail.pretend') === true)
+		{
+			return true;
+		}
+
+		$this->startMailService();
+
+		$this->service->to($to);
+		$this->service->subject($subject);
+
+		if (is_array($this->from)) {
+			$this->service->from($this->from[0], $this->from[1]);
+		}
+		else
+		{
+			$this->service->from($this->from);
+		}
+
+		if (! empty($this->cc))         $this->service->cc($this->cc);
+		if (! empty($this->bcc))        $this->service->bcc($this->bcc);
+
+		if (is_array($this->reply_to)) {
+			$this->service->reply_to($this->reply_to[0], $this->reply_to[1]);
+		}
+		else
+		{
+			$this->service->reply_to($this->reply_to);
+		}
+
+
+		// Determine the view to use. We have to hack this a bit with
+		// the debug_backtrace, though, to make it all function in the background.
+		list(, $method) = debug_backtrace(false);
+
+		$view = 'emails/'. strtolower( (new \ReflectionClass($this))->getShortName() ) .'/'. $method['function'];
+
+		// Get our message's text and html versions based on which files exist...
+		$basepath = APPPATH .'views/'. $view;
+
+		// Is a text version available?
+		if (file_exists($basepath .'.text.php'))
+		{
+			$text = $this->load->view($view .'.text.php', $data, true);
+			$this->service->text_message($text);
+		}
+
+		// If an html version is around, we need to theme it out
+		if (file_exists($basepath .'.html.php'))
+		{
+			$this->startThemer();
+
+			$this->themer->setTheme($this->theme);
+
+			// Determine the correct layout to use
+			$layout = ! empty($this->layout) ? $this->layout : NULL;
+			$this->themer->setLayout($layout);
+
+			$this->themer->set($data);
+
+			// Render the view into a var we can pass to the layout.
+			$content = $this->themer->display($view .'.html.php');
+
+			$this->themer->set('content', $content);
+
+			$this->service->html_message( $this->themer->display($this->theme .':'. $layout) );
+		}
+
+		if (! $this->service->send() )
+		{
+			// todo do something here
+			return false;
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Allows you to customize the headers sent with the email. You can
+	 * do them one at a time by passing $field and $value, or pass an array
+	 * of $field => $value pairs as the first parameter.
+	 *
+	 * @param string|array  $field
+	 * @param string        $value
+	 */
+	public function header($field, $value=null)
+	{
+		$this->startMailService();
+
+		$this->service->setHeader($field, $value);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Adds an attachment to the current email that is being built.
+	 *
+	 * @param string    $filename
+	 * @param string    $disposition    like 'inline'. Default is 'attachment'
+	 * @param string    $newname        If you'd like to rename the file for delivery
+	 * @param string    $mime           Custom defined mime type.
+	 */
+	public function attach($filename, $disposition=null, $newname=null, $mime=null)
+	{
+		$this->startMailService();
+
+		$this->service->attach($filename, $disposition, $newname, $mime);
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Private Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Starts up the service name specified in $service_name.
+	 *
+	 * @param $service_name
+	 */
+	protected function startMailService()
+	{
+		// Only once!
+		if (! empty($this->service) && is_object($this->service))
+		{
+			return;
+		}
+
+		$service_name = ! empty($this->service_name) ? $this->service_name : config_item('mail.default_service');
+
+		if (! class_exists($service_name))
+		{
+			throw new \RuntimeException( sprintf( lang('mail.invalid_service'), $service_name) );
+		}
+
+		$this->service = new $service_name();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Fires up the default themer so we can use it to theme our HTML messages.
+	 */
+	protected function startThemer()
+	{
+		/*
          * Setup our Template Engine
          */
-        $themer = config_item('active_themer');
-
-        if (empty($themer)) {
-            throw new \RuntimeException( lang('no_themer') );
-        }
-
-        if (empty($this->themer))
-        {
-            $this->themer = new $themer( get_instance() );
-        }
-
-        // Register our paths with the themer
-        $paths = config_item('theme.paths');
-
-        foreach ($paths as $key => $path) {
-            $this->themer->addThemePath($key, $path);
-        }
-
-        // Set our default theme.
-        $this->themer->setDefaultTheme( 'email' );
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * __get magic
-     *
-     * Allows models to access CI's loaded classes using the same
-     * syntax as controllers.
-     *
-     * @param	string	$key
-     */
-    public function __get($key)
-    {
-        return get_instance()->$key;
-    }
-
-    //--------------------------------------------------------------------
+		$themer = config_item('active_themer');
+
+		if (empty($themer)) {
+			throw new \RuntimeException( lang('no_themer') );
+		}
+
+		if (empty($this->themer))
+		{
+			$this->themer = new $themer( get_instance() );
+		}
+
+		// Register our paths with the themer
+		$paths = config_item('theme.paths');
+
+		foreach ($paths as $key => $path) {
+			$this->themer->addThemePath($key, $path);
+		}
+
+		// Set our default theme.
+		$this->themer->setDefaultTheme( 'email' );
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * __get magic
+	 *
+	 * Allows models to access CI's loaded classes using the same
+	 * syntax as controllers.
+	 *
+	 * @param	string	$key
+	 */
+	public function __get($key)
+	{
+		return get_instance()->$key;
+	}
+
+	//--------------------------------------------------------------------
 
 }

myth/Mail/CIMailService.php

Indentation +222 added lines, -222 removed lines

@@ -40,226 +40,226 @@
  */
 class CIMailService implements MailServiceInterface {
 
-    protected $ci = null;
-
-    protected $format = 'html';
-
-    //--------------------------------------------------------------------
-
-    public function __construct()
-    {
-        $this->ci =& get_instance();
-
-        $this->ci->load->library('email');
-    }
-
-    //--------------------------------------------------------------------
-
-
-    /**
-     * Does the actual delivery of a message.
-     *
-     * @param bool  $clear_after    If TRUE, will reset the class after sending.
-     *
-     * @return mixed
-     */
-    public function send($clear_after=true)
-    {
-        $this->ci->email->mailtype = $this->format;
-
-        $result = $this->ci->email->send(false);
-
-        return $result;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Adds an attachment to the current email that is being built.
-     *
-     * @param string    $filename
-     * @param string    $disposition    like 'inline'. Default is 'attachment'
-     * @param string    $newname        If you'd like to rename the file for delivery
-     * @param string    $mime           Custom defined mime type.
-     */
-    public function attach($filename, $disposition=null, $newname=null, $mime=null)
-    {
-        $this->ci->email->attach($filename, $disposition, $newname, $mime);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets a header value for the email. Not every service will provide this.
-     *
-     * @param $field
-     * @param $value
-     * @return mixed
-     */
-    public function setHeader($field, $value)
-    {
-        $this->ci->email->set_header($field, $value);
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Options
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the email address to send the email to.
-     *
-     * @param $email
-     * @return mixed
-     */
-    public function to($email)
-    {
-        $this->ci->email->to($email);
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets who the email is coming from.
-     *
-     * @param $email
-     * @param null $name
-     * @return mixed
-     */
-    public function from($email, $name=null)
-    {
-        $this->ci->email->from($email, $name);
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets a single additional email address to 'cc'.
-     *
-     * @param $email
-     * @return mixed
-     */
-    public function cc($email)
-    {
-        $this->ci->email->cc($email);
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets a single email address to 'bcc' to.
-     *
-     * @param $email
-     * @return mixed
-     */
-    public function bcc($email)
-    {
-        $this->ci->email->bcc($email);
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the reply to address.
-     *
-     * @param $email
-     * @return mixed
-     */
-    public function reply_to($email, $name=null)
-    {
-        $this->ci->email->reply_to($email, $name);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the subject line of the email.
-     *
-     * @param $subject
-     * @return mixed
-     */
-    public function subject($subject)
-    {
-        $this->ci->email->subject($subject);
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the HTML portion of the email address. Optional.
-     *
-     * @param $message
-     * @return mixed
-     */
-    public function html_message($message)
-    {
-        $this->ci->email->message($message);
-
-        $this->format = 'html';
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the text portion of the email address. Optional.
-     *
-     * @param $message
-     * @return mixed
-     */
-    public function text_message($message)
-    {
-        $this->ci->email->set_alt_message($message);
-
-        $this->format = 'text';
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the format to send the email in. Either 'html' or 'text'.
-     *
-     * @param $format
-     * @return mixed
-     */
-    public function format($format)
-    {
-        $this->format = $format;
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-    /**
-     * Resets the state to blank, ready for a new email. Useful when
-     * sending emails in a loop and you need to make sure that the
-     * email is reset.
-     *
-     * @param bool $clear_attachments
-     * @return mixed
-     */
-    public function reset($clear_attachments=true)
-    {
-        $this->ci->email->clear($clear_attachments);
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
+	protected $ci = null;
+
+	protected $format = 'html';
+
+	//--------------------------------------------------------------------
+
+	public function __construct()
+	{
+		$this->ci =& get_instance();
+
+		$this->ci->load->library('email');
+	}
+
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * Does the actual delivery of a message.
+	 *
+	 * @param bool  $clear_after    If TRUE, will reset the class after sending.
+	 *
+	 * @return mixed
+	 */
+	public function send($clear_after=true)
+	{
+		$this->ci->email->mailtype = $this->format;
+
+		$result = $this->ci->email->send(false);
+
+		return $result;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Adds an attachment to the current email that is being built.
+	 *
+	 * @param string    $filename
+	 * @param string    $disposition    like 'inline'. Default is 'attachment'
+	 * @param string    $newname        If you'd like to rename the file for delivery
+	 * @param string    $mime           Custom defined mime type.
+	 */
+	public function attach($filename, $disposition=null, $newname=null, $mime=null)
+	{
+		$this->ci->email->attach($filename, $disposition, $newname, $mime);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets a header value for the email. Not every service will provide this.
+	 *
+	 * @param $field
+	 * @param $value
+	 * @return mixed
+	 */
+	public function setHeader($field, $value)
+	{
+		$this->ci->email->set_header($field, $value);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Options
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the email address to send the email to.
+	 *
+	 * @param $email
+	 * @return mixed
+	 */
+	public function to($email)
+	{
+		$this->ci->email->to($email);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets who the email is coming from.
+	 *
+	 * @param $email
+	 * @param null $name
+	 * @return mixed
+	 */
+	public function from($email, $name=null)
+	{
+		$this->ci->email->from($email, $name);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets a single additional email address to 'cc'.
+	 *
+	 * @param $email
+	 * @return mixed
+	 */
+	public function cc($email)
+	{
+		$this->ci->email->cc($email);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets a single email address to 'bcc' to.
+	 *
+	 * @param $email
+	 * @return mixed
+	 */
+	public function bcc($email)
+	{
+		$this->ci->email->bcc($email);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the reply to address.
+	 *
+	 * @param $email
+	 * @return mixed
+	 */
+	public function reply_to($email, $name=null)
+	{
+		$this->ci->email->reply_to($email, $name);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the subject line of the email.
+	 *
+	 * @param $subject
+	 * @return mixed
+	 */
+	public function subject($subject)
+	{
+		$this->ci->email->subject($subject);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the HTML portion of the email address. Optional.
+	 *
+	 * @param $message
+	 * @return mixed
+	 */
+	public function html_message($message)
+	{
+		$this->ci->email->message($message);
+
+		$this->format = 'html';
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the text portion of the email address. Optional.
+	 *
+	 * @param $message
+	 * @return mixed
+	 */
+	public function text_message($message)
+	{
+		$this->ci->email->set_alt_message($message);
+
+		$this->format = 'text';
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the format to send the email in. Either 'html' or 'text'.
+	 *
+	 * @param $format
+	 * @return mixed
+	 */
+	public function format($format)
+	{
+		$this->format = $format;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Resets the state to blank, ready for a new email. Useful when
+	 * sending emails in a loop and you need to make sure that the
+	 * email is reset.
+	 *
+	 * @param bool $clear_attachments
+	 * @return mixed
+	 */
+	public function reset($clear_attachments=true)
+	{
+		$this->ci->email->clear($clear_attachments);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
 }

myth/Mail/LogMailService.php

Indentation +314 added lines, -314 removed lines

@@ -1,34 +1,34 @@ 
 <?php namespace Myth\Mail;
 /**
- * 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
+	 */
 
 /**
  * Class LogMailService
@@ -40,289 +40,289 @@ 
  */
 class LogMailService implements MailServiceInterface {
 
-    protected $ci = null;
-
-    protected $format = 'html';
-    protected $headers = [];
-    protected $subject = null;
-
-    protected $html_message = null;
-    protected $text_message = null;
-
-    //--------------------------------------------------------------------
-
-    public function __construct()
-    {
-        $this->ci =& get_instance();
-
-        $this->ci->load->library('email');
-    }
-
-    //--------------------------------------------------------------------
-
-
-    /**
-     * Does the actual delivery of a message. In this case, though, we simply
-     * write the html and text files out to the log folder/emails.
-     *
-     * The filename format is: yyyymmddhhiiss_email.{format}
-     *
-     * @param bool  $clear_after    If TRUE, will reset the class after sending.
-     *
-     * @return mixed
-     */
-    public function send($clear_after=true)
-    {
-
-        // Ensure we have enough data
-        if (empty($this->to) || empty($this->subject) ||
-            (empty($this->html_message) && empty($this->text_message))
-        )
-        {
-            throw new \RuntimeException( lang('mail.invalid_log_data') );
-        }
-
-        $symbols = ['#', '%', '&', '{', '}', '\\', '/', '<', '>', '*', '?', ' ', '$', '!', '\'', '"', ':', '@', '+', '`', '='];
-
-        $email = str_replace($symbols, '.', strtolower($this->to) );
-
-        $filename = date('YmdHis_'). $email;
-
-        // Ensure the emails folder exists in the log folder.
-        $path = config_item('log_path');
-        $path = ! empty( $path ) ? $path : APPPATH .'logs/';
-        $path = rtrim($path, '/ ') .'/email/';
-
-        if (! is_dir($path))
-        {
-            mkdir($path, 0777, true);
-        }
-
-        get_instance()->load->helper('file');
-
-        // Write our HTML file out
-        if (! empty($this->html_message) && ! write_file( $path . $filename . '.html', $this->html_message ) )
-        {
-            throw new \RuntimeException( sprintf( lang('mail.error_html_log'), $path, $filename) );
-        }
-
-        // Write our TEXT file out
-        if (! empty($this->text_message) && ! write_file( $path . $filename . '.txt', $this->text_message ) )
-        {
-            throw new \RuntimeException( sprintf( lang('mail.error_text_log'), $path, $filename) );
-        }
-
-        return true;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Adds an attachment to the current email that is being built.
-     *
-     * @param string    $filename
-     * @param string    $disposition    like 'inline'. Default is 'attachment'
-     * @param string    $newname        If you'd like to rename the file for delivery
-     * @param string    $mime           Custom defined mime type.
-     */
-    public function attach($filename, $disposition=null, $newname=null, $mime=null)
-    {
-        return;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets a header value for the email. Not every service will provide this.
-     *
-     * @param $field
-     * @param $value
-     * @return mixed
-     */
-    public function setHeader($field, $value)
-    {
-        $this->headers[$field] = $value;
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Options
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the email address to send the email to.
-     *
-     * @param $email
-     * @return mixed
-     */
-    public function to($email)
-    {
-        $this->to = $email;
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets who the email is coming from.
-     *
-     * @param $email
-     * @param null $name
-     * @return mixed
-     */
-    public function from($email, $name=null)
-    {
-        if (! empty($name))
-        {
-            $this->from = [$email, $name];
-        }
-        else
-        {
-            $this->from = $email;
-        }
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets a single additional email address to 'cc'.
-     *
-     * @param $email
-     * @return mixed
-     */
-    public function cc($email)
-    {
-        $this->cc = $email;
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets a single email address to 'bcc' to.
-     *
-     * @param $email
-     * @return mixed
-     */
-    public function bcc($email)
-    {
-        $this->bcc = $email;
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the reply to address.
-     *
-     * @param $email
-     * @return mixed
-     */
-    public function reply_to($email, $name=null)
-    {
-        if (! empty($name))
-        {
-            $this->reply_to = [$email, $name];
-        }
-        else
-        {
-            $this->reply_to = $email;
-        }
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the subject line of the email.
-     *
-     * @param $subject
-     * @return mixed
-     */
-    public function subject($subject)
-    {
-        $this->subject = $subject;
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the HTML portion of the email address. Optional.
-     *
-     * @param $message
-     * @return mixed
-     */
-    public function html_message($message)
-    {
-        $this->html_message = $message;
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the text portion of the email address. Optional.
-     *
-     * @param $message
-     * @return mixed
-     */
-    public function text_message($message)
-    {
-        $this->text_message = $message;
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the format to send the email in. Either 'html' or 'text'.
-     *
-     * @param $format
-     * @return mixed
-     */
-    public function format($format)
-    {
-        $this->format = $format;
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-    /**
-     * Resets the state to blank, ready for a new email. Useful when
-     * sending emails in a loop and you need to make sure that the
-     * email is reset.
-     *
-     * @param bool $clear_attachments
-     * @return mixed
-     */
-    public function reset($clear_attachments=true)
-    {
-        $this->to = null;
-        $this->from = null;
-        $this->reply_to = null;
-        $this->cc = null;
-        $this->bcc = null;
-        $this->subject = null;
-        $this->html_message = null;
-        $this->text_message = null;
-        $this->headers = [];
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
+	protected $ci = null;
+
+	protected $format = 'html';
+	protected $headers = [];
+	protected $subject = null;
+
+	protected $html_message = null;
+	protected $text_message = null;
+
+	//--------------------------------------------------------------------
+
+	public function __construct()
+	{
+		$this->ci =& get_instance();
+
+		$this->ci->load->library('email');
+	}
+
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * Does the actual delivery of a message. In this case, though, we simply
+	 * write the html and text files out to the log folder/emails.
+	 *
+	 * The filename format is: yyyymmddhhiiss_email.{format}
+	 *
+	 * @param bool  $clear_after    If TRUE, will reset the class after sending.
+	 *
+	 * @return mixed
+	 */
+	public function send($clear_after=true)
+	{
+
+		// Ensure we have enough data
+		if (empty($this->to) || empty($this->subject) ||
+			(empty($this->html_message) && empty($this->text_message))
+		)
+		{
+			throw new \RuntimeException( lang('mail.invalid_log_data') );
+		}
+
+		$symbols = ['#', '%', '&', '{', '}', '\\', '/', '<', '>', '*', '?', ' ', '$', '!', '\'', '"', ':', '@', '+', '`', '='];
+
+		$email = str_replace($symbols, '.', strtolower($this->to) );
+
+		$filename = date('YmdHis_'). $email;
+
+		// Ensure the emails folder exists in the log folder.
+		$path = config_item('log_path');
+		$path = ! empty( $path ) ? $path : APPPATH .'logs/';
+		$path = rtrim($path, '/ ') .'/email/';
+
+		if (! is_dir($path))
+		{
+			mkdir($path, 0777, true);
+		}
+
+		get_instance()->load->helper('file');
+
+		// Write our HTML file out
+		if (! empty($this->html_message) && ! write_file( $path . $filename . '.html', $this->html_message ) )
+		{
+			throw new \RuntimeException( sprintf( lang('mail.error_html_log'), $path, $filename) );
+		}
+
+		// Write our TEXT file out
+		if (! empty($this->text_message) && ! write_file( $path . $filename . '.txt', $this->text_message ) )
+		{
+			throw new \RuntimeException( sprintf( lang('mail.error_text_log'), $path, $filename) );
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Adds an attachment to the current email that is being built.
+	 *
+	 * @param string    $filename
+	 * @param string    $disposition    like 'inline'. Default is 'attachment'
+	 * @param string    $newname        If you'd like to rename the file for delivery
+	 * @param string    $mime           Custom defined mime type.
+	 */
+	public function attach($filename, $disposition=null, $newname=null, $mime=null)
+	{
+		return;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets a header value for the email. Not every service will provide this.
+	 *
+	 * @param $field
+	 * @param $value
+	 * @return mixed
+	 */
+	public function setHeader($field, $value)
+	{
+		$this->headers[$field] = $value;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Options
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the email address to send the email to.
+	 *
+	 * @param $email
+	 * @return mixed
+	 */
+	public function to($email)
+	{
+		$this->to = $email;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets who the email is coming from.
+	 *
+	 * @param $email
+	 * @param null $name
+	 * @return mixed
+	 */
+	public function from($email, $name=null)
+	{
+		if (! empty($name))
+		{
+			$this->from = [$email, $name];
+		}
+		else
+		{
+			$this->from = $email;
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets a single additional email address to 'cc'.
+	 *
+	 * @param $email
+	 * @return mixed
+	 */
+	public function cc($email)
+	{
+		$this->cc = $email;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets a single email address to 'bcc' to.
+	 *
+	 * @param $email
+	 * @return mixed
+	 */
+	public function bcc($email)
+	{
+		$this->bcc = $email;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the reply to address.
+	 *
+	 * @param $email
+	 * @return mixed
+	 */
+	public function reply_to($email, $name=null)
+	{
+		if (! empty($name))
+		{
+			$this->reply_to = [$email, $name];
+		}
+		else
+		{
+			$this->reply_to = $email;
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the subject line of the email.
+	 *
+	 * @param $subject
+	 * @return mixed
+	 */
+	public function subject($subject)
+	{
+		$this->subject = $subject;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the HTML portion of the email address. Optional.
+	 *
+	 * @param $message
+	 * @return mixed
+	 */
+	public function html_message($message)
+	{
+		$this->html_message = $message;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the text portion of the email address. Optional.
+	 *
+	 * @param $message
+	 * @return mixed
+	 */
+	public function text_message($message)
+	{
+		$this->text_message = $message;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the format to send the email in. Either 'html' or 'text'.
+	 *
+	 * @param $format
+	 * @return mixed
+	 */
+	public function format($format)
+	{
+		$this->format = $format;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Resets the state to blank, ready for a new email. Useful when
+	 * sending emails in a loop and you need to make sure that the
+	 * email is reset.
+	 *
+	 * @param bool $clear_attachments
+	 * @return mixed
+	 */
+	public function reset($clear_attachments=true)
+	{
+		$this->to = null;
+		$this->from = null;
+		$this->reply_to = null;
+		$this->cc = null;
+		$this->bcc = null;
+		$this->subject = null;
+		$this->html_message = null;
+		$this->text_message = null;
+		$this->headers = [];
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
 }

myth/Mail/Mail.php

Indentation +165 added lines, -165 removed lines

@@ -1,172 +1,172 @@
 <?php namespace Myth\Mail;
 /**
- * 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
+	 */
 
 class Mail {
 
-    /**
-     * Sends an email, using an existing Mailer, which can
-     * be found in application/mailers/. The mailer is the one responsible
-     * for determining whether the email will be sent immediately or queued
-     * to be sent later.
-     *
-     * The $mailer_name must include both the mailer name as well as the
-     * task, separated by a single colon:
-     *      'UserMailer:newUser'
-     *
-     * @param $mailer_name
-     * @param array $params
-     * @param array $options
-     * @return mixed
-     */
-    public static function deliver($mailer_name, $params=[], $options=[])
-    {
-        // Protect users from themselves here.
-        str_replace('::', ':', $mailer_name);
-
-        // Try to load our mailer class.
-        list($class, $method) = explode(':', $mailer_name);
-
-        if (! is_file(APPPATH .'mailers/'. $class .'.php'))
-        {
-            throw new \RuntimeException( sprintf( lang('mail.cant_find_mailer'), $class) );
-        }
-
-        require_once APPPATH .'mailers/'. $class .'.php';
-
-        if (! class_exists($class, false))
-        {
-            throw new \RuntimeException( sprintf( lang('errors.cant_instantiate'), $class) );
-        }
-
-        $mailer = new $class( $options );
-
-        if (! method_exists($mailer, $method))
-        {
-            throw new \BadMethodCallException( sprintf( lang('mail.invalid_mailer_method'), $class, $method) );
-        }
-
-        // try to deliver the mail, but don't send back the contents
-        // since we don't want to force the mailers to return anything.
-        if (call_user_func_array([$mailer, $method], $params) )
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Adds an item to the email queue to be sent out next time.
-     *
-     * @param string $mailer_name
-     * @param array $params
-     * @param array $options
-     * @param \Myth\Mail\Queue $queue
-     *
-     * @return mixed
-     */
-    public static function queue($mailer_name, $params=[], $options=[], &$queue=null)
-    {
-        $data = [
-            'mailer'    => $mailer_name,
-            'params'    => serialize($params),
-            'options'   => serialize($options)
-        ];
-
-        if (empty($queue))
-        {
-            $queue = new \Myth\Mail\Queue();
-        }
-
-        return $queue->insert($data);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Processes the Email queue sending out emails in chunks.
-     * Typically used in a cronjob to send out all queued emails.
-     *
-     * @param int $chunk_size   // How many emails to send per batch.
-     * @return string           // The output of the cronjob...
-     */
-    public static function process($chunk_size=50, &$db=null)
-    {
-        if (empty($db))
-        {
-            $db = new \Myth\Mail\Queue();
-        }
-
-        // Grab our batch of emails to process
-        $queue = $db->find_many_by('sent', 0);
-
-        if (! $queue)
-        {
-            // We didn't have an error, we simply
-            // didn't have anything to do.
-            return true;
-        }
-
-        $output = 'Started processing email Queue at '. date('Y-m-d H:i:s') .".\n\n";
-
-        foreach ($queue as $item)
-        {
-            try {
-                if (! Mail::deliver($item->mailer, unserialize($item->params), unserialize($item->options))) {
-                    $output .= '[FAILED] ';
-                } else {
-                    $data = [
-                        'sent'    => 1,
-                        'sent_on' => date('Y-m-d H:i:s')
-                    ];
-
-                    $db->update($item->id, $data);
-                }
-
-                $output .= "ID: {$item->id}, Mailer: {$item->mailer}. \n";
-            }
-            catch (\Exception $e)
-            {
-                $output .= "[EXCEPTION] ". $e->getMessage() ."\n";
-            }
-        }
-
-        $output .= "Done processing email Queue at ". date('H:i:s') .".\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
+	/**
+	 * Sends an email, using an existing Mailer, which can
+	 * be found in application/mailers/. The mailer is the one responsible
+	 * for determining whether the email will be sent immediately or queued
+	 * to be sent later.
+	 *
+	 * The $mailer_name must include both the mailer name as well as the
+	 * task, separated by a single colon:
+	 *      'UserMailer:newUser'
+	 *
+	 * @param $mailer_name
+	 * @param array $params
+	 * @param array $options
+	 * @return mixed
+	 */
+	public static function deliver($mailer_name, $params=[], $options=[])
+	{
+		// Protect users from themselves here.
+		str_replace('::', ':', $mailer_name);
+
+		// Try to load our mailer class.
+		list($class, $method) = explode(':', $mailer_name);
+
+		if (! is_file(APPPATH .'mailers/'. $class .'.php'))
+		{
+			throw new \RuntimeException( sprintf( lang('mail.cant_find_mailer'), $class) );
+		}
+
+		require_once APPPATH .'mailers/'. $class .'.php';
+
+		if (! class_exists($class, false))
+		{
+			throw new \RuntimeException( sprintf( lang('errors.cant_instantiate'), $class) );
+		}
+
+		$mailer = new $class( $options );
+
+		if (! method_exists($mailer, $method))
+		{
+			throw new \BadMethodCallException( sprintf( lang('mail.invalid_mailer_method'), $class, $method) );
+		}
+
+		// try to deliver the mail, but don't send back the contents
+		// since we don't want to force the mailers to return anything.
+		if (call_user_func_array([$mailer, $method], $params) )
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Adds an item to the email queue to be sent out next time.
+	 *
+	 * @param string $mailer_name
+	 * @param array $params
+	 * @param array $options
+	 * @param \Myth\Mail\Queue $queue
+	 *
+	 * @return mixed
+	 */
+	public static function queue($mailer_name, $params=[], $options=[], &$queue=null)
+	{
+		$data = [
+			'mailer'    => $mailer_name,
+			'params'    => serialize($params),
+			'options'   => serialize($options)
+		];
+
+		if (empty($queue))
+		{
+			$queue = new \Myth\Mail\Queue();
+		}
+
+		return $queue->insert($data);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Processes the Email queue sending out emails in chunks.
+	 * Typically used in a cronjob to send out all queued emails.
+	 *
+	 * @param int $chunk_size   // How many emails to send per batch.
+	 * @return string           // The output of the cronjob...
+	 */
+	public static function process($chunk_size=50, &$db=null)
+	{
+		if (empty($db))
+		{
+			$db = new \Myth\Mail\Queue();
+		}
+
+		// Grab our batch of emails to process
+		$queue = $db->find_many_by('sent', 0);
+
+		if (! $queue)
+		{
+			// We didn't have an error, we simply
+			// didn't have anything to do.
+			return true;
+		}
+
+		$output = 'Started processing email Queue at '. date('Y-m-d H:i:s') .".\n\n";
+
+		foreach ($queue as $item)
+		{
+			try {
+				if (! Mail::deliver($item->mailer, unserialize($item->params), unserialize($item->options))) {
+					$output .= '[FAILED] ';
+				} else {
+					$data = [
+						'sent'    => 1,
+						'sent_on' => date('Y-m-d H:i:s')
+					];
+
+					$db->update($item->id, $data);
+				}
+
+				$output .= "ID: {$item->id}, Mailer: {$item->mailer}. \n";
+			}
+			catch (\Exception $e)
+			{
+				$output .= "[EXCEPTION] ". $e->getMessage() ."\n";
+			}
+		}
+
+		$output .= "Done processing email Queue at ". date('H:i:s') .".\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
 
 }

myth/Mail/MailServiceInterface.php

Indentation +140 added lines, -140 removed lines

@@ -42,145 +42,145 @@
  */
 interface MailServiceInterface {
 
-    /**
-     * Does the actual delivery of a message.
-     *
-     * @param bool  $clear_after    If TRUE, will reset the class after sending.
-     *
-     * @return mixed
-     */
-    public function send($clear_after=true);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Adds an attachment to the current email that is being built.
-     *
-     * @param string    $filename
-     * @param string    $disposition    like 'inline'. Default is 'attachment'
-     * @param string    $newname        If you'd like to rename the file for delivery
-     * @param string    $mime           Custom defined mime type.
-     */
-    public function attach($filename, $disposition=null, $newname=null, $mime=null);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets a header value for the email. Not every service will provide this.
-     *
-     * @param $field
-     * @param $value
-     * @return mixed
-     */
-    public function setHeader($field, $value);
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Options
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the email address to send the email to.
-     *
-     * @param $email
-     * @return mixed
-     */
-    public function to($email);
+	/**
+	 * Does the actual delivery of a message.
+	 *
+	 * @param bool  $clear_after    If TRUE, will reset the class after sending.
+	 *
+	 * @return mixed
+	 */
+	public function send($clear_after=true);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Adds an attachment to the current email that is being built.
+	 *
+	 * @param string    $filename
+	 * @param string    $disposition    like 'inline'. Default is 'attachment'
+	 * @param string    $newname        If you'd like to rename the file for delivery
+	 * @param string    $mime           Custom defined mime type.
+	 */
+	public function attach($filename, $disposition=null, $newname=null, $mime=null);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets a header value for the email. Not every service will provide this.
+	 *
+	 * @param $field
+	 * @param $value
+	 * @return mixed
+	 */
+	public function setHeader($field, $value);
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Options
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the email address to send the email to.
+	 *
+	 * @param $email
+	 * @return mixed
+	 */
+	public function to($email);
     
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets who the email is coming from.
-     *
-     * @param $email
-     * @param null $name
-     * @return mixed
-     */
-    public function from($email, $name=null);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets a single additional email address to 'cc'.
-     *
-     * @param $email
-     * @return mixed
-     */
-    public function cc($email);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets a single email address to 'bcc' to.
-     *
-     * @param $email
-     * @return mixed
-     */
-    public function bcc($email);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the reply to address.
-     *
-     * @param $email
-     * @param $name
-     * @return mixed
-     */
-    public function reply_to($email, $name=null);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the subject line of the email.
-     *
-     * @param $subject
-     * @return mixed
-     */
-    public function subject($subject);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the HTML portion of the email address. Optional.
-     *
-     * @param $message
-     * @return mixed
-     */
-    public function html_message($message);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the text portion of the email address. Optional.
-     *
-     * @param $message
-     * @return mixed
-     */
-    public function text_message($message);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the format to send the email in. Either 'html' or 'text'.
-     *
-     * @param $format
-     * @return mixed
-     */
-    public function format($format);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Resets the state to blank, ready for a new email. Useful when
-     * sending emails in a loop and you need to make sure that the
-     * email is reset.
-     *
-     * @param bool $clear_attachments
-     * @return mixed
-     */
-    public function reset($clear_attachments=true);
-
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets who the email is coming from.
+	 *
+	 * @param $email
+	 * @param null $name
+	 * @return mixed
+	 */
+	public function from($email, $name=null);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets a single additional email address to 'cc'.
+	 *
+	 * @param $email
+	 * @return mixed
+	 */
+	public function cc($email);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets a single email address to 'bcc' to.
+	 *
+	 * @param $email
+	 * @return mixed
+	 */
+	public function bcc($email);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the reply to address.
+	 *
+	 * @param $email
+	 * @param $name
+	 * @return mixed
+	 */
+	public function reply_to($email, $name=null);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the subject line of the email.
+	 *
+	 * @param $subject
+	 * @return mixed
+	 */
+	public function subject($subject);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the HTML portion of the email address. Optional.
+	 *
+	 * @param $message
+	 * @return mixed
+	 */
+	public function html_message($message);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the text portion of the email address. Optional.
+	 *
+	 * @param $message
+	 * @return mixed
+	 */
+	public function text_message($message);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the format to send the email in. Either 'html' or 'text'.
+	 *
+	 * @param $format
+	 * @return mixed
+	 */
+	public function format($format);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Resets the state to blank, ready for a new email. Useful when
+	 * sending emails in a loop and you need to make sure that the
+	 * email is reset.
+	 *
+	 * @param bool $clear_attachments
+	 * @return mixed
+	 */
+	public function reset($clear_attachments=true);
+
+	//--------------------------------------------------------------------
 }

myth/Mail/Queue.php

Indentation +32 added lines, -32 removed lines

@@ -1,41 +1,41 @@
 <?php namespace Myth\Mail;
 /**
- * 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
+	 */
 
 use Myth\Models\CIDbModel;
 
 class Queue extends CIDbModel {
 
-    protected $table_name = 'mail_queue';
+	protected $table_name = 'mail_queue';
 
-    protected $set_created = false;
-    protected $set_modified = false;
+	protected $set_created = false;
+	protected $set_modified = false;
 }