ci-bonfire / Sprint

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

Spacing +20 added lines, -20 removed lines

@@ -47,7 +47,7 @@ 
         }
 
         // Ensure that $content has a newline at the end
-        $content = rtrim($content) ."\n";
+        $content = rtrim($content)."\n";
 
         $fh = fopen($file, 'a');
         $result = fwrite($fh, $content);
@@ -75,18 +75,18 @@ 
         }
 
         // Ensure that $content has a newline at the end
-        $content = rtrim($content) ."\n";
+        $content = rtrim($content)."\n";
 
         $file_contents = file_get_contents($file);
 
         if ($file_contents === false)
         {
-            throw new \RuntimeException( sprintf(lang('errors.reading_file'), $file));
+            throw new \RuntimeException(sprintf(lang('errors.reading_file'), $file));
         }
 
-        $result = file_put_contents($file, $content . $file_contents);
+        $result = file_put_contents($file, $content.$file_contents);
 
-        return (bool)$result;
+        return (bool) $result;
     }
 
     //--------------------------------------------------------------------
@@ -108,13 +108,13 @@ 
         }
 
         // Ensure that $content has a newline at the end
-        $content = rtrim($content) ."\n";
+        $content = rtrim($content)."\n";
 
         $lines = file($file);
 
         if ($lines === false)
         {
-            throw new \RuntimeException( sprintf( lang('errors.file_not_found'), $file ));
+            throw new \RuntimeException(sprintf(lang('errors.file_not_found'), $file));
         }
 
         // Where to insert the row.
@@ -122,7 +122,7 @@ 
 
         foreach ($lines as $index => $line)
         {
-            if (strtolower($line) == strtolower($before) )
+            if (strtolower($line) == strtolower($before))
             {
                 $location = $index;
                 break;
@@ -133,7 +133,7 @@ 
 
         $result = file_put_contents($file, $lines);
 
-        return (bool)$result;
+        return (bool) $result;
     }
 
     //--------------------------------------------------------------------
@@ -146,13 +146,13 @@ 
         }
 
         // Ensure that $content has a newline at the end
-        $content = rtrim($content) ."\n";
+        $content = rtrim($content)."\n";
 
         $lines = file($file);
 
         if ($lines === false)
         {
-            throw new \RuntimeException( sprintf( lang('errors.file_not_found'), $file ) );
+            throw new \RuntimeException(sprintf(lang('errors.file_not_found'), $file));
         }
 
         // Where to insert the row.
@@ -160,18 +160,18 @@ 
 
         foreach ($lines as $index => $line)
         {
-            if (strtolower($line) == strtolower($after) )
+            if (strtolower($line) == strtolower($after))
             {
                 $location = $index;
                 break;
             }
         }
 
-        array_splice($lines, $location +1, 0, $content);
+        array_splice($lines, $location + 1, 0, $content);
 
         $result = file_put_contents($file, $lines);
 
-        return (bool)$result;
+        return (bool) $result;
     }
 
     //--------------------------------------------------------------------
@@ -190,14 +190,14 @@ 
 
         if ($file_contents === false)
         {
-            throw new \RuntimeException( sprintf( lang('errors.reading_file'), $file ) );
+            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;
+        return (bool) $result;
     }
 
     //--------------------------------------------------------------------
@@ -216,7 +216,7 @@ 
 
         if ($file_contents === false)
         {
-            throw new \RuntimeException( sprintf( lang('errors.reading_file'), $file ) );
+            throw new \RuntimeException(sprintf(lang('errors.reading_file'), $file));
         }
 
         $file_contents = preg_replace($pattern, $replace, $file_contents);
@@ -224,12 +224,12 @@ 
         $result = false;
 
         // Don't let us erase a file!
-        if (! empty($file_contents))
+        if ( ! empty($file_contents))
         {
-            $result = file_put_contents( $file, $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;
+	}
+
+	//--------------------------------------------------------------------
 
 }

Spacing +23 added lines, -23 removed lines

@@ -64,7 +64,7 @@ 
      * will use the system default.
      * @var null
      */
-    protected $service_name  = null;
+    protected $service_name = null;
 
     protected $service = null;
 
@@ -83,9 +83,9 @@ 
      *
      * @param null $options
      */
-    public function __construct($options=null)
+    public function __construct($options = null)
     {
-        if (! empty($options))
+        if ( ! empty($options))
         {
             $this->setOptions($options);
         }
@@ -107,7 +107,7 @@ 
             {
                 if ($key == 'service')
                 {
-                    $this->service =& $value;
+                    $this->service = & $value;
                     continue;
                 }
 
@@ -135,7 +135,7 @@ 
      *
      * @return bool
      */
-    public function send($to, $subject, $data=[], $view=null)
+    public function send($to, $subject, $data = [], $view = null)
     {
         // Are we pretending to send?
         if (config_item('mail.pretend') === true)
@@ -156,8 +156,8 @@ 
             $this->service->from($this->from);
         }
 
-        if (! empty($this->cc))         $this->service->cc($this->cc);
-        if (! empty($this->bcc))        $this->service->bcc($this->bcc);
+        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]);
@@ -172,20 +172,20 @@ 
         // 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'];
+        $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;
+        $basepath = APPPATH.'views/'.$view;
 
         // Is a text version available?
-        if (file_exists($basepath .'.text.php'))
+        if (file_exists($basepath.'.text.php'))
         {
-            $text = $this->load->view($view .'.text.php', $data, true);
+            $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'))
+        if (file_exists($basepath.'.html.php'))
         {
             $this->startThemer();
 
@@ -198,14 +198,14 @@ 
             $this->themer->set($data);
 
             // Render the view into a var we can pass to the layout.
-            $content = $this->themer->display($view .'.html.php');
+            $content = $this->themer->display($view.'.html.php');
 
             $this->themer->set('content', $content);
 
-            $this->service->html_message( $this->themer->display($this->theme .':'. $layout) );
+            $this->service->html_message($this->themer->display($this->theme.':'.$layout));
         }
 
-        if (! $this->service->send() )
+        if ( ! $this->service->send())
         {
             // todo do something here
             return false;
@@ -224,7 +224,7 @@ 
      * @param string|array  $field
      * @param string        $value
      */
-    public function header($field, $value=null)
+    public function header($field, $value = null)
     {
         $this->startMailService();
 
@@ -241,7 +241,7 @@ 
      * @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)
+    public function attach($filename, $disposition = null, $newname = null, $mime = null)
     {
         $this->startMailService();
 
@@ -262,16 +262,16 @@ 
     protected function startMailService()
     {
         // Only once!
-        if (! empty($this->service) && is_object($this->service))
+        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))
+        if ( ! class_exists($service_name))
         {
-            throw new \RuntimeException( sprintf( lang('mail.invalid_service'), $service_name) );
+            throw new \RuntimeException(sprintf(lang('mail.invalid_service'), $service_name));
         }
 
         $this->service = new $service_name();
@@ -290,12 +290,12 @@ 
         $themer = config_item('active_themer');
 
         if (empty($themer)) {
-            throw new \RuntimeException( lang('no_themer') );
+            throw new \RuntimeException(lang('no_themer'));
         }
 
         if (empty($this->themer))
         {
-            $this->themer = new $themer( get_instance() );
+            $this->themer = new $themer(get_instance());
         }
 
         // Register our paths with the themer
@@ -306,7 +306,7 @@ 
         }
 
         // Set our default theme.
-        $this->themer->setDefaultTheme( 'email' );
+        $this->themer->setDefaultTheme('email');
     }
 
     //--------------------------------------------------------------------

Braces +8 added lines, -6 removed lines

@@ -150,19 +150,21 @@
 
         if (is_array($this->from)) {
             $this->service->from($this->from[0], $this->from[1]);
-        }
-        else
+        } 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 (! 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
+        } else
         {
             $this->service->reply_to($this->reply_to);
         }

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

Spacing +6 added lines, -6 removed lines

@@ -48,7 +48,7 @@ 
 
     public function __construct()
     {
-        $this->ci =& get_instance();
+        $this->ci = & get_instance();
 
         $this->ci->load->library('email');
     }
@@ -63,7 +63,7 @@ 
      *
      * @return mixed
      */
-    public function send($clear_after=true)
+    public function send($clear_after = true)
     {
         $this->ci->email->mailtype = $this->format;
 
@@ -82,7 +82,7 @@ 
      * @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)
+    public function attach($filename, $disposition = null, $newname = null, $mime = null)
     {
         $this->ci->email->attach($filename, $disposition, $newname, $mime);
     }
@@ -131,7 +131,7 @@ 
      * @param null $name
      * @return mixed
      */
-    public function from($email, $name=null)
+    public function from($email, $name = null)
     {
         $this->ci->email->from($email, $name);
 
@@ -176,7 +176,7 @@ 
      * @param $email
      * @return mixed
      */
-    public function reply_to($email, $name=null)
+    public function reply_to($email, $name = null)
     {
         $this->ci->email->reply_to($email, $name);
     }
@@ -254,7 +254,7 @@ 
      * @param bool $clear_attachments
      * @return mixed
      */
-    public function reset($clear_attachments=true)
+    public function reset($clear_attachments = true)
     {
         $this->ci->email->clear($clear_attachments);
 

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

Spacing +5 added lines, -5 removed lines

@@ -49,7 +49,7 @@ 
      *
      * @return mixed
      */
-    public function send($clear_after=true);
+    public function send($clear_after = true);
 
     //--------------------------------------------------------------------
 
@@ -61,7 +61,7 @@ 
      * @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);
+    public function attach($filename, $disposition = null, $newname = null, $mime = null);
 
     //--------------------------------------------------------------------
 
@@ -97,7 +97,7 @@ 
      * @param null $name
      * @return mixed
      */
-    public function from($email, $name=null);
+    public function from($email, $name = null);
 
     //--------------------------------------------------------------------
 
@@ -128,7 +128,7 @@ 
      * @param $name
      * @return mixed
      */
-    public function reply_to($email, $name=null);
+    public function reply_to($email, $name = null);
 
     //--------------------------------------------------------------------
 
@@ -180,7 +180,7 @@ 
      * @param bool $clear_attachments
      * @return mixed
      */
-    public function reset($clear_attachments=true);
+    public function reset($clear_attachments = true);
 
     //--------------------------------------------------------------------
 }

myth/Settings/ConfigStore.php

Indentation +138 added lines, -138 removed lines

@@ -49,143 +49,143 @@
  */
 class ConfigStore implements SettingsStoreInterface {
 
-    protected $ci;
-
-    //--------------------------------------------------------------------
-
-    public function __construct( $ci=null )
-    {
-        if (is_object($ci))
-        {
-            $this->ci =& $ci;
-        }
-        else {
-            $this->ci =& get_instance();
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Inserts/Replaces a single setting item.
-     *
-     * @param $key
-     * @param null $value
-     * @param string $group
-     */
-    public function save($key, $value=null, $group='app')
-    {
-        // Treat the 'app' group as our primary, un-sectioned
-        // config files.
-        if ($group != 'app')
-        {
-            return $this->ci->config->set_item($key, $value);
-        }
-
-        // Otherwise, we'll need to ensure a section exists
-        if (! isset($this->ci->config->config[$group]))
-        {
-            $this->ci->config->config[$group] = [];
-        }
-
-        $this->ci->config->config[$group][$key] = $value;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Retrieves a single item. If the config system doesn't have the
-     * value loaded, yet, it will attempt to load a config file matching
-     * the 'group' name and grab the value from that.
-     *
-     * @param $key
-     * @param string $group
-     * @return mixed
-     */
-    public function get($key, $group='application')
-    {
-        // First, see if CI already has this key loaded.
-        $result = $this->ci->config->item($key);
-
-        // This bit will fail when the actual value is NULL
-        // but should result in false hits infrequently.
-        if ($result !== null)
-        {
-            return $result;
-        }
-
-        // Try to load the 'group' file, then try to load a
-        // config file that matches the group name
-        $this->ci->load->config($group, false, true);
+	protected $ci;
+
+	//--------------------------------------------------------------------
+
+	public function __construct( $ci=null )
+	{
+		if (is_object($ci))
+		{
+			$this->ci =& $ci;
+		}
+		else {
+			$this->ci =& get_instance();
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Inserts/Replaces a single setting item.
+	 *
+	 * @param $key
+	 * @param null $value
+	 * @param string $group
+	 */
+	public function save($key, $value=null, $group='app')
+	{
+		// Treat the 'app' group as our primary, un-sectioned
+		// config files.
+		if ($group != 'app')
+		{
+			return $this->ci->config->set_item($key, $value);
+		}
+
+		// Otherwise, we'll need to ensure a section exists
+		if (! isset($this->ci->config->config[$group]))
+		{
+			$this->ci->config->config[$group] = [];
+		}
+
+		$this->ci->config->config[$group][$key] = $value;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieves a single item. If the config system doesn't have the
+	 * value loaded, yet, it will attempt to load a config file matching
+	 * the 'group' name and grab the value from that.
+	 *
+	 * @param $key
+	 * @param string $group
+	 * @return mixed
+	 */
+	public function get($key, $group='application')
+	{
+		// First, see if CI already has this key loaded.
+		$result = $this->ci->config->item($key);
+
+		// This bit will fail when the actual value is NULL
+		// but should result in false hits infrequently.
+		if ($result !== null)
+		{
+			return $result;
+		}
+
+		// Try to load the 'group' file, then try to load a
+		// config file that matches the group name
+		$this->ci->load->config($group, false, true);
         
-        $result = $this->ci->config->item($key);
-
-        return $result;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Deletes a single item.
-     *
-     * NOT supported by this store.
-     *
-     * @param $key
-     * @param $group
-     * @return mixed
-     */
-    public function delete($key, $group='app')
-    {
-        return false;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Searches the store for any items with $field = $value.
-     *
-     * Does not work.
-     *
-     * @param $field
-     * @param $value
-     * @return mixed
-     */
-    public function findBy($field, $value)
-    {
-        return false;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Retrieves all items in the store either globally or for a single group.
-     *
-     * @param string $group
-     * @return mixed
-     */
-    public function all($group=null)
-    {
-        if (empty($group))
-        {
-            return $this->ci->config->config;
-        }
-
-        // If we're a group, does the group already exists
-        // as a 'section' in the config array?
-        if (isset($this->ci->config->config[$group]))
-        {
-            return $this->ci->config->config[$group];
-        }
-
-        // Still here? Attempt to load the file into a section
-        // and try one last time.
-        if ($this->ci->load->config($group))
-        {
-            return $this->ci->config->config($group);
-        }
-
-        return null;
-    }
-
-    //--------------------------------------------------------------------
+		$result = $this->ci->config->item($key);
+
+		return $result;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Deletes a single item.
+	 *
+	 * NOT supported by this store.
+	 *
+	 * @param $key
+	 * @param $group
+	 * @return mixed
+	 */
+	public function delete($key, $group='app')
+	{
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Searches the store for any items with $field = $value.
+	 *
+	 * Does not work.
+	 *
+	 * @param $field
+	 * @param $value
+	 * @return mixed
+	 */
+	public function findBy($field, $value)
+	{
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieves all items in the store either globally or for a single group.
+	 *
+	 * @param string $group
+	 * @return mixed
+	 */
+	public function all($group=null)
+	{
+		if (empty($group))
+		{
+			return $this->ci->config->config;
+		}
+
+		// If we're a group, does the group already exists
+		// as a 'section' in the config array?
+		if (isset($this->ci->config->config[$group]))
+		{
+			return $this->ci->config->config[$group];
+		}
+
+		// Still here? Attempt to load the file into a section
+		// and try one last time.
+		if ($this->ci->load->config($group))
+		{
+			return $this->ci->config->config($group);
+		}
+
+		return null;
+	}
+
+	//--------------------------------------------------------------------
 }

Spacing +8 added lines, -8 removed lines

@@ -53,14 +53,14 @@ 
 
     //--------------------------------------------------------------------
 
-    public function __construct( $ci=null )
+    public function __construct($ci = null)
     {
         if (is_object($ci))
         {
-            $this->ci =& $ci;
+            $this->ci = & $ci;
         }
         else {
-            $this->ci =& get_instance();
+            $this->ci = & get_instance();
         }
     }
 
@@ -73,7 +73,7 @@ 
      * @param null $value
      * @param string $group
      */
-    public function save($key, $value=null, $group='app')
+    public function save($key, $value = null, $group = 'app')
     {
         // Treat the 'app' group as our primary, un-sectioned
         // config files.
@@ -83,7 +83,7 @@ 
         }
 
         // Otherwise, we'll need to ensure a section exists
-        if (! isset($this->ci->config->config[$group]))
+        if ( ! isset($this->ci->config->config[$group]))
         {
             $this->ci->config->config[$group] = [];
         }
@@ -102,7 +102,7 @@ 
      * @param string $group
      * @return mixed
      */
-    public function get($key, $group='application')
+    public function get($key, $group = 'application')
     {
         // First, see if CI already has this key loaded.
         $result = $this->ci->config->item($key);
@@ -134,7 +134,7 @@ 
      * @param $group
      * @return mixed
      */
-    public function delete($key, $group='app')
+    public function delete($key, $group = 'app')
     {
         return false;
     }
@@ -163,7 +163,7 @@ 
      * @param string $group
      * @return mixed
      */
-    public function all($group=null)
+    public function all($group = null)
     {
         if (empty($group))
         {

Braces +1 added lines, -2 removed lines

@@ -43,8 +43,7 @@
         if (is_object($ci))
         {
             $this->ci =& $ci;
-        }
-        else {
+        } else {
             $this->ci =& get_instance();
         }
 

myth/Settings/DatabaseStore.php

Spacing +11 added lines, -11 removed lines

@@ -38,14 +38,14 @@ 
 
     //--------------------------------------------------------------------
 
-    public function __construct( $ci=null )
+    public function __construct($ci = null)
     {
         if (is_object($ci))
         {
-            $this->ci =& $ci;
+            $this->ci = & $ci;
         }
         else {
-            $this->ci =& get_instance();
+            $this->ci = & get_instance();
         }
 
         // Ensure that the database is loaded.
@@ -65,7 +65,7 @@ 
      * @param string $group
      * @return bool
      */
-    public function save($key, $value=null, $group='app')
+    public function save($key, $value = null, $group = 'app')
     {
         if (empty($this->ci->db) || ! is_object($this->ci->db))
         {
@@ -100,7 +100,7 @@ 
      * @param string $group
      * @return mixed
      */
-    public function get($key, $group='app')
+    public function get($key, $group = 'app')
     {
         if (empty($this->ci->db) || ! is_object($this->ci->db))
         {
@@ -115,7 +115,7 @@ 
         $query = $this->ci->db->where($where)
                               ->get('settings');
 
-        if (! $query->num_rows())
+        if ( ! $query->num_rows())
         {
             return false;
         }
@@ -123,7 +123,7 @@ 
         $value = $query->row()->value;
 
         // Check to see if it needs to be unserialized
-        $data = @unserialize($value);   // We don't need to issue an E_NOTICE here...
+        $data = @unserialize($value); // We don't need to issue an E_NOTICE here...
 
         // Check for a value of false or
         if ($value === 'b:0;' || $data !== false)
@@ -143,7 +143,7 @@ 
      * @param $group
      * @return mixed
      */
-    public function delete($key, $group='app')
+    public function delete($key, $group = 'app')
     {
         if (empty($this->ci->db) || ! is_object($this->ci->db))
         {
@@ -177,7 +177,7 @@ 
         $query = $this->ci->db->where($field, $value)
                               ->get('settings');
 
-        if (! $query->num_rows())
+        if ( ! $query->num_rows())
         {
             return false;
         }
@@ -193,7 +193,7 @@ 
      * @param string $group
      * @return mixed
      */
-    public function all($group=null)
+    public function all($group = null)
     {
         if (empty($this->ci->db) || ! is_object($this->ci->db))
         {
@@ -202,7 +202,7 @@ 
 
         $query = $this->ci->db->get('settings');
 
-        if (! $query->num_rows())
+        if ( ! $query->num_rows())
         {
             return false;
         }

Braces +1 added lines, -2 removed lines

@@ -43,8 +43,7 @@
         if (is_object($ci))
         {
             $this->ci =& $ci;
-        }
-        else {
+        } else {
             $this->ci =& get_instance();
         }
 

Indentation +179 added lines, -179 removed lines

@@ -32,183 +32,183 @@
 
 class DatabaseStore implements SettingsStoreInterface {
 
-    protected $ci;
-
-    protected $db;
-
-    //--------------------------------------------------------------------
-
-    public function __construct( $ci=null )
-    {
-        if (is_object($ci))
-        {
-            $this->ci =& $ci;
-        }
-        else {
-            $this->ci =& get_instance();
-        }
-
-        // Ensure that the database is loaded.
-        if (empty($this->ci->db))
-        {
-            $this->ci->load->database();
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Inserts or Replaces an setting value.
-     *
-     * @param $key
-     * @param null $value
-     * @param string $group
-     * @return bool
-     */
-    public function save($key, $value=null, $group='app')
-    {
-        if (empty($this->ci->db) || ! is_object($this->ci->db))
-        {
-            return false;
-        }
-
-        $where = [
-            'name'  => $key,
-            'group' => $group
-        ];
-        $this->ci->db->delete('settings', $where);
-
-        if (is_array($value) || is_object($value))
-        {
-            $value = serialize($value);
-        }
-
-        $data = [
-            'name'  => $key,
-            'value' => $value,
-            'group' => $group
-        ];
-        return $this->ci->db->insert('settings', $data);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Retrieves a single item.
-     *
-     * @param $key
-     * @param string $group
-     * @return mixed
-     */
-    public function get($key, $group='app')
-    {
-        if (empty($this->ci->db) || ! is_object($this->ci->db))
-        {
-            return false;
-        }
-
-        $where = [
-            'name'  => $key,
-            'group' => $group
-        ];
-
-        $query = $this->ci->db->where($where)
-                              ->get('settings');
-
-        if (! $query->num_rows())
-        {
-            return false;
-        }
-
-        $value = $query->row()->value;
-
-        // Check to see if it needs to be unserialized
-        $data = @unserialize($value);   // We don't need to issue an E_NOTICE here...
-
-        // Check for a value of false or
-        if ($value === 'b:0;' || $data !== false)
-        {
-            $value = $data;
-        }
-
-        return $value;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Deletes a single item.
-     *
-     * @param $key
-     * @param $group
-     * @return mixed
-     */
-    public function delete($key, $group='app')
-    {
-        if (empty($this->ci->db) || ! is_object($this->ci->db))
-        {
-            return false;
-        }
-
-        $where = [
-            'name'  => $key,
-            'group' => $group
-        ];
-
-        return $this->ci->db->delete('settings', $where);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Searches the store for any items with $field = $value.
-     *
-     * @param $field
-     * @param $value
-     * @return mixed
-     */
-    public function findBy($field, $value)
-    {
-        if (empty($this->ci->db) || ! is_object($this->ci->db))
-        {
-            return false;
-        }
-
-        $query = $this->ci->db->where($field, $value)
-                              ->get('settings');
-
-        if (! $query->num_rows())
-        {
-            return false;
-        }
-
-        return $query->result_array();
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Retrieves all items in the store either globally or for a single group.
-     *
-     * @param string $group
-     * @return mixed
-     */
-    public function all($group=null)
-    {
-        if (empty($this->ci->db) || ! is_object($this->ci->db))
-        {
-            return false;
-        }
-
-        $query = $this->ci->db->get('settings');
-
-        if (! $query->num_rows())
-        {
-            return false;
-        }
-
-        return $query->result_array();
-    }
-
-    //--------------------------------------------------------------------
+	protected $ci;
+
+	protected $db;
+
+	//--------------------------------------------------------------------
+
+	public function __construct( $ci=null )
+	{
+		if (is_object($ci))
+		{
+			$this->ci =& $ci;
+		}
+		else {
+			$this->ci =& get_instance();
+		}
+
+		// Ensure that the database is loaded.
+		if (empty($this->ci->db))
+		{
+			$this->ci->load->database();
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Inserts or Replaces an setting value.
+	 *
+	 * @param $key
+	 * @param null $value
+	 * @param string $group
+	 * @return bool
+	 */
+	public function save($key, $value=null, $group='app')
+	{
+		if (empty($this->ci->db) || ! is_object($this->ci->db))
+		{
+			return false;
+		}
+
+		$where = [
+			'name'  => $key,
+			'group' => $group
+		];
+		$this->ci->db->delete('settings', $where);
+
+		if (is_array($value) || is_object($value))
+		{
+			$value = serialize($value);
+		}
+
+		$data = [
+			'name'  => $key,
+			'value' => $value,
+			'group' => $group
+		];
+		return $this->ci->db->insert('settings', $data);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieves a single item.
+	 *
+	 * @param $key
+	 * @param string $group
+	 * @return mixed
+	 */
+	public function get($key, $group='app')
+	{
+		if (empty($this->ci->db) || ! is_object($this->ci->db))
+		{
+			return false;
+		}
+
+		$where = [
+			'name'  => $key,
+			'group' => $group
+		];
+
+		$query = $this->ci->db->where($where)
+							  ->get('settings');
+
+		if (! $query->num_rows())
+		{
+			return false;
+		}
+
+		$value = $query->row()->value;
+
+		// Check to see if it needs to be unserialized
+		$data = @unserialize($value);   // We don't need to issue an E_NOTICE here...
+
+		// Check for a value of false or
+		if ($value === 'b:0;' || $data !== false)
+		{
+			$value = $data;
+		}
+
+		return $value;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Deletes a single item.
+	 *
+	 * @param $key
+	 * @param $group
+	 * @return mixed
+	 */
+	public function delete($key, $group='app')
+	{
+		if (empty($this->ci->db) || ! is_object($this->ci->db))
+		{
+			return false;
+		}
+
+		$where = [
+			'name'  => $key,
+			'group' => $group
+		];
+
+		return $this->ci->db->delete('settings', $where);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Searches the store for any items with $field = $value.
+	 *
+	 * @param $field
+	 * @param $value
+	 * @return mixed
+	 */
+	public function findBy($field, $value)
+	{
+		if (empty($this->ci->db) || ! is_object($this->ci->db))
+		{
+			return false;
+		}
+
+		$query = $this->ci->db->where($field, $value)
+							  ->get('settings');
+
+		if (! $query->num_rows())
+		{
+			return false;
+		}
+
+		return $query->result_array();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieves all items in the store either globally or for a single group.
+	 *
+	 * @param string $group
+	 * @return mixed
+	 */
+	public function all($group=null)
+	{
+		if (empty($this->ci->db) || ! is_object($this->ci->db))
+		{
+			return false;
+		}
+
+		$query = $this->ci->db->get('settings');
+
+		if (! $query->num_rows())
+		{
+			return false;
+		}
+
+		return $query->result_array();
+	}
+
+	//--------------------------------------------------------------------
 }

myth/Settings/Settings.php

Spacing +19 added lines, -19 removed lines

@@ -70,15 +70,15 @@ 
         {
             foreach ($user_stores as $alias => $class)
             {
-                self::$stores[ strtolower($alias) ] = new $class();
+                self::$stores[strtolower($alias)] = new $class();
             }
         }
 
         self::$default_store = config_item('settings.default_store');
 
-        if (empty(self::$stores[ self::$default_store ]))
+        if (empty(self::$stores[self::$default_store]))
         {
-            show_error( lang('settings.bad_default') );
+            show_error(lang('settings.bad_default'));
         }
     }
 
@@ -92,7 +92,7 @@ 
      * @param string $group
      * @param string $store
      */
-    public static function save($key, $value=null, $group='app', $store=null)
+    public static function save($key, $value = null, $group = 'app', $store = null)
     {
         self::init();
 
@@ -103,7 +103,7 @@ 
             $store = self::$default_store;
         }
 
-        return self::$stores[ $store ]->save($key, $value, $group);
+        return self::$stores[$store]->save($key, $value, $group);
     }
 
     //--------------------------------------------------------------------
@@ -118,7 +118,7 @@ 
      * @param string $store
      * @return mixed
      */
-    public static function get($key, $group='app', $store=null)
+    public static function get($key, $group = 'app', $store = null)
     {
         self::init();
 
@@ -126,13 +126,13 @@ 
 
         // If the store is specified but doesn't exist, crap out
         // so that they developer has a chance to fix it.
-        if (! is_null($store) && empty(self::$stores[$store]))
+        if ( ! is_null($store) && empty(self::$stores[$store]))
         {
-            show_error( sprintf( lang('settings.cant_retrieve'), $store ) );
+            show_error(sprintf(lang('settings.cant_retrieve'), $store));
         }
 
         // If $store is set, get the value from that store only.
-        if (! empty($store))
+        if ( ! empty($store))
         {
             return self::$stores[$store]->get($key, $group);
         }
@@ -160,7 +160,7 @@ 
      * @param $store
      * @return mixed
      */
-    public static function delete($key, $group='app', $store=null)
+    public static function delete($key, $group = 'app', $store = null)
     {
         self::init();
 
@@ -168,19 +168,19 @@ 
 
         // If the store is specified but doesn't exist, crap out
         // so that they developer has a chance to fix it.
-        if (! is_null($store) && empty(self::$stores[$store]))
+        if ( ! is_null($store) && empty(self::$stores[$store]))
         {
-            show_error( sprintf( lang('settings.cant_retrieve'), $store ) );
+            show_error(sprintf(lang('settings.cant_retrieve'), $store));
         }
 
         // If $store is set, get the value from that store only.
-        if (! empty($store))
+        if ( ! empty($store))
         {
             return self::$stores[$store]->delete($key, $group);
         }
 
         // Otherwise delete from the default store
-        return self::$stores[ self::$default_store ]->delete($key, $group);
+        return self::$stores[self::$default_store]->delete($key, $group);
     }
 
     //--------------------------------------------------------------------
@@ -215,15 +215,15 @@ 
      * @param string $group
      * @return mixed
      */
-    public static function all($group=null, $store=null)
+    public static function all($group = null, $store = null)
     {
         self::init();
 
         $group = strtolower($group);
 
-        if (! empty($store))
+        if ( ! empty($store))
         {
-            return self::$stores[ $store ]->all($group);
+            return self::$stores[$store]->all($group);
         }
 
         // Otherwise combine the results from all stores
@@ -234,7 +234,7 @@ 
             $found = $s->all($group);
             if ($found)
             {
-                $results = array_merge($results, (array)$found);
+                $results = array_merge($results, (array) $found);
             }
         }
 
@@ -256,7 +256,7 @@ 
 
         if (class_exists($class))
         {
-            self::$stores[ strtolower($alias) ] = new $class();
+            self::$stores[strtolower($alias)] = new $class();
             return true;
         }
 

Indentation +248 added lines, -248 removed lines

@@ -40,253 +40,253 @@
  */
 class Settings {
 
-    /**
-     * Holds instantiated data stores.
-     *
-     * @var array
-     */
-    protected static $stores = [];
-
-    protected static $default_store = '';
-
-    protected static $initialized = false;
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Fires up instances of the datastores and gets us ready to roll.
-     */
-    public static function init()
-    {
-        if (self::$initialized === true)
-        {
-            return;
-        }
-
-        // Load up and instantiate our setting stores.
-        $user_stores = config_item('settings.stores');
-
-        if (is_array($user_stores))
-        {
-            foreach ($user_stores as $alias => $class)
-            {
-                self::$stores[ strtolower($alias) ] = new $class();
-            }
-        }
-
-        self::$default_store = config_item('settings.default_store');
-
-        if (empty(self::$stores[ self::$default_store ]))
-        {
-            show_error( lang('settings.bad_default') );
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Inserts/Replaces a single setting item.
-     *
-     * @param $key
-     * @param null $value
-     * @param string $group
-     * @param string $store
-     */
-    public static function save($key, $value=null, $group='app', $store=null)
-    {
-        self::init();
-
-        if (empty($store) || empty(self::$stores[$store]))
-        {
-            // we've already determined that the default store exists
-            // in the init() method.
-            $store = self::$default_store;
-        }
-
-        return self::$stores[ $store ]->save($key, $value, $group);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Retrieves a single item. If not $store is specified, will loop
-     * through the stores in order until it finds it. If $store is
-     * specified, will only look within that store for it.
-     *
-     * @param $key
-     * @param string $group
-     * @param string $store
-     * @return mixed
-     */
-    public static function get($key, $group='app', $store=null)
-    {
-        self::init();
-
-        $group = strtolower($group);
-
-        // If the store is specified but doesn't exist, crap out
-        // so that they developer has a chance to fix it.
-        if (! is_null($store) && empty(self::$stores[$store]))
-        {
-            show_error( sprintf( lang('settings.cant_retrieve'), $store ) );
-        }
-
-        // If $store is set, get the value from that store only.
-        if (! empty($store))
-        {
-            return self::$stores[$store]->get($key, $group);
-        }
-
-        // Otherwise loop through each store until we find it
-        foreach (self::$stores as $s)
-        {
-            if ($found = $s->get($key, $group))
-            {
-                return $found;
-            }
-        }
-
-        // Still here... guess we didn't find anything, then...
-        return false;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Deletes a single item.
-     *
-     * @param $key
-     * @param $group
-     * @param $store
-     * @return mixed
-     */
-    public static function delete($key, $group='app', $store=null)
-    {
-        self::init();
-
-        $group = strtolower($group);
-
-        // If the store is specified but doesn't exist, crap out
-        // so that they developer has a chance to fix it.
-        if (! is_null($store) && empty(self::$stores[$store]))
-        {
-            show_error( sprintf( lang('settings.cant_retrieve'), $store ) );
-        }
-
-        // If $store is set, get the value from that store only.
-        if (! empty($store))
-        {
-            return self::$stores[$store]->delete($key, $group);
-        }
-
-        // Otherwise delete from the default store
-        return self::$stores[ self::$default_store ]->delete($key, $group);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Searches the store for any items with $field = $value.
-     *
-     * @param $field
-     * @param $value
-     * @return mixed
-     */
-    public static function findBy($field, $value)
-    {
-        self::init();
-
-        foreach (self::$stores as $s)
-        {
-            if ($found = $s->findBy($field, $value))
-            {
-                return $found;
-            }
-        }
-
-        return false;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Retrieves all items in the store either globally or for a single group.
-     *
-     * @param string $group
-     * @return mixed
-     */
-    public static function all($group=null, $store=null)
-    {
-        self::init();
-
-        $group = strtolower($group);
-
-        if (! empty($store))
-        {
-            return self::$stores[ $store ]->all($group);
-        }
-
-        // Otherwise combine the results from all stores
-        $results = [];
-
-        foreach (self::$stores as $s)
-        {
-            $found = $s->all($group);
-            if ($found)
-            {
-                $results = array_merge($results, (array)$found);
-            }
-        }
-
-        return $results;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Appends a new datastore the end of the curent stores.
-     *
-     * @param $alias
-     * @param $class
-     * @return bool
-     */
-    public static function addStore($alias, $class)
-    {
-        self::init();
-
-        if (class_exists($class))
-        {
-            self::$stores[ strtolower($alias) ] = new $class();
-            return true;
-        }
-
-        return false;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Removes a datastore from the list of stores currently available.
-     *
-     * @param $alias
-     * @return bool
-     */
-    public static function removeStore($alias)
-    {
-        self::init();
-
-        $alias = strtolower($alias);
-
-        if (empty(self::$stores[$alias]))
-        {
-            return false;
-        }
-
-        unset(self::$stores[$alias]);
-
-        return true;
-    }
-
-    //--------------------------------------------------------------------
+	/**
+	 * Holds instantiated data stores.
+	 *
+	 * @var array
+	 */
+	protected static $stores = [];
+
+	protected static $default_store = '';
+
+	protected static $initialized = false;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Fires up instances of the datastores and gets us ready to roll.
+	 */
+	public static function init()
+	{
+		if (self::$initialized === true)
+		{
+			return;
+		}
+
+		// Load up and instantiate our setting stores.
+		$user_stores = config_item('settings.stores');
+
+		if (is_array($user_stores))
+		{
+			foreach ($user_stores as $alias => $class)
+			{
+				self::$stores[ strtolower($alias) ] = new $class();
+			}
+		}
+
+		self::$default_store = config_item('settings.default_store');
+
+		if (empty(self::$stores[ self::$default_store ]))
+		{
+			show_error( lang('settings.bad_default') );
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Inserts/Replaces a single setting item.
+	 *
+	 * @param $key
+	 * @param null $value
+	 * @param string $group
+	 * @param string $store
+	 */
+	public static function save($key, $value=null, $group='app', $store=null)
+	{
+		self::init();
+
+		if (empty($store) || empty(self::$stores[$store]))
+		{
+			// we've already determined that the default store exists
+			// in the init() method.
+			$store = self::$default_store;
+		}
+
+		return self::$stores[ $store ]->save($key, $value, $group);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieves a single item. If not $store is specified, will loop
+	 * through the stores in order until it finds it. If $store is
+	 * specified, will only look within that store for it.
+	 *
+	 * @param $key
+	 * @param string $group
+	 * @param string $store
+	 * @return mixed
+	 */
+	public static function get($key, $group='app', $store=null)
+	{
+		self::init();
+
+		$group = strtolower($group);
+
+		// If the store is specified but doesn't exist, crap out
+		// so that they developer has a chance to fix it.
+		if (! is_null($store) && empty(self::$stores[$store]))
+		{
+			show_error( sprintf( lang('settings.cant_retrieve'), $store ) );
+		}
+
+		// If $store is set, get the value from that store only.
+		if (! empty($store))
+		{
+			return self::$stores[$store]->get($key, $group);
+		}
+
+		// Otherwise loop through each store until we find it
+		foreach (self::$stores as $s)
+		{
+			if ($found = $s->get($key, $group))
+			{
+				return $found;
+			}
+		}
+
+		// Still here... guess we didn't find anything, then...
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Deletes a single item.
+	 *
+	 * @param $key
+	 * @param $group
+	 * @param $store
+	 * @return mixed
+	 */
+	public static function delete($key, $group='app', $store=null)
+	{
+		self::init();
+
+		$group = strtolower($group);
+
+		// If the store is specified but doesn't exist, crap out
+		// so that they developer has a chance to fix it.
+		if (! is_null($store) && empty(self::$stores[$store]))
+		{
+			show_error( sprintf( lang('settings.cant_retrieve'), $store ) );
+		}
+
+		// If $store is set, get the value from that store only.
+		if (! empty($store))
+		{
+			return self::$stores[$store]->delete($key, $group);
+		}
+
+		// Otherwise delete from the default store
+		return self::$stores[ self::$default_store ]->delete($key, $group);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Searches the store for any items with $field = $value.
+	 *
+	 * @param $field
+	 * @param $value
+	 * @return mixed
+	 */
+	public static function findBy($field, $value)
+	{
+		self::init();
+
+		foreach (self::$stores as $s)
+		{
+			if ($found = $s->findBy($field, $value))
+			{
+				return $found;
+			}
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieves all items in the store either globally or for a single group.
+	 *
+	 * @param string $group
+	 * @return mixed
+	 */
+	public static function all($group=null, $store=null)
+	{
+		self::init();
+
+		$group = strtolower($group);
+
+		if (! empty($store))
+		{
+			return self::$stores[ $store ]->all($group);
+		}
+
+		// Otherwise combine the results from all stores
+		$results = [];
+
+		foreach (self::$stores as $s)
+		{
+			$found = $s->all($group);
+			if ($found)
+			{
+				$results = array_merge($results, (array)$found);
+			}
+		}
+
+		return $results;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Appends a new datastore the end of the curent stores.
+	 *
+	 * @param $alias
+	 * @param $class
+	 * @return bool
+	 */
+	public static function addStore($alias, $class)
+	{
+		self::init();
+
+		if (class_exists($class))
+		{
+			self::$stores[ strtolower($alias) ] = new $class();
+			return true;
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Removes a datastore from the list of stores currently available.
+	 *
+	 * @param $alias
+	 * @return bool
+	 */
+	public static function removeStore($alias)
+	{
+		self::init();
+
+		$alias = strtolower($alias);
+
+		if (empty(self::$stores[$alias]))
+		{
+			return false;
+		}
+
+		unset(self::$stores[$alias]);
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
 
 }

myth/Settings/SettingsStoreInterface.php

Indentation +44 added lines, -44 removed lines

@@ -40,58 +40,58 @@
  */
 interface SettingsStoreInterface {
 
-    /**
-     * Inserts/Replaces a single setting item.
-     *
-     * @param $key
-     * @param null $value
-     * @param string $group
-     */
-    public function save($key, $value=null, $group='app');
+	/**
+	 * Inserts/Replaces a single setting item.
+	 *
+	 * @param $key
+	 * @param null $value
+	 * @param string $group
+	 */
+	public function save($key, $value=null, $group='app');
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Retrieves a single item.
-     *
-     * @param $key
-     * @param string $group
-     * @return mixed
-     */
-    public function get($key, $group='app');
+	/**
+	 * Retrieves a single item.
+	 *
+	 * @param $key
+	 * @param string $group
+	 * @return mixed
+	 */
+	public function get($key, $group='app');
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Deletes a single item.
-     *
-     * @param $key
-     * @param $group
-     * @return mixed
-     */
-    public function delete($key, $group='app');
+	/**
+	 * Deletes a single item.
+	 *
+	 * @param $key
+	 * @param $group
+	 * @return mixed
+	 */
+	public function delete($key, $group='app');
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Searches the store for any items with $field = $value.
-     *
-     * @param $field
-     * @param $value
-     * @return mixed
-     */
-    public function findBy($field, $value);
+	/**
+	 * Searches the store for any items with $field = $value.
+	 *
+	 * @param $field
+	 * @param $value
+	 * @return mixed
+	 */
+	public function findBy($field, $value);
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Retrieves all items in the store either globally or for a single group.
-     *
-     * @param string $group
-     * @return mixed
-     */
-    public function all($group=null);
+	/**
+	 * Retrieves all items in the store either globally or for a single group.
+	 *
+	 * @param string $group
+	 * @return mixed
+	 */
+	public function all($group=null);
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 }

Spacing +4 added lines, -4 removed lines

@@ -47,7 +47,7 @@ 
      * @param null $value
      * @param string $group
      */
-    public function save($key, $value=null, $group='app');
+    public function save($key, $value = null, $group = 'app');
 
     //--------------------------------------------------------------------
 
@@ -58,7 +58,7 @@ 
      * @param string $group
      * @return mixed
      */
-    public function get($key, $group='app');
+    public function get($key, $group = 'app');
 
     //--------------------------------------------------------------------
 
@@ -69,7 +69,7 @@ 
      * @param $group
      * @return mixed
      */
-    public function delete($key, $group='app');
+    public function delete($key, $group = 'app');
 
     //--------------------------------------------------------------------
 
@@ -90,7 +90,7 @@ 
      * @param string $group
      * @return mixed
      */
-    public function all($group=null);
+    public function all($group = null);
 
     //--------------------------------------------------------------------
 

myth/Themers/MetaCollection.php

Indentation +213 added lines, -213 removed lines

@@ -35,219 +35,219 @@
 
 class MetaCollection implements MetaInterface {
 
-    /**
-     * Stores the meta values the user has set.
-     *
-     * @var array
-     */
-    protected $meta = [];
-
-    /**
-     * Stores the standard meta-value names
-     * Mostly here for reference, I guess.
-     *
-     * @var array
-     */
-    protected $std_meta = [
-        'application-name',
-        'author',
-        'copyright',
-        'description',
-        'generator',
-        'keywords',
-        'robots',
-        'googlebot'
-    ];
-
-    /**
-     * Stores the HTTP-Equiv meta tags
-     * since they need to be rendered differently.
-     *
-     * @var array
-     */
-    protected $http_equiv_meta = [
-        'cache-control',
-        'content-language',
-        'content-type',
-        'default-style',
-        'expires',
-        'pragma',
-        'refresh',
-        'set-cookie'
-    ];
-
-    /**
-     * Stores the document's character encoding.
-     *
-     * @var string
-     */
-    public $charset = 'utf-8';
-
-    //--------------------------------------------------------------------
-
-    public function __construct($ci)
-    {
-        $ci->config->load('html_meta', true);
-
-        $config = $ci->config->item('html_meta');
-
-        $this->meta = $config['meta'];
-
-        $this->http_equiv_meta = array_merge($this->http_equiv_meta, $config['http-equiv']);
-    }
-
-    //--------------------------------------------------------------------
-
-
-    /**
-     * Sets a single meta item.
-     * $alias can also be an array of key/value pairs to set.
-     *
-     * @param string|array $alias
-     * @param null $value
-     *
-     * @return mixed
-     */
-    public function set($alias, $value=null, $escape=true)
-    {
-        if (is_array($alias))
-        {
-            foreach ($alias as $key => $val)
-            {
-                $this->set($key, $val);
-            }
-
-            return $this;
-        }
-
-        // Charset
-        if (strtolower($alias) == 'charset')
-        {
-            $this->charset = $value;
-
-            return $this;
-        }
-
-        $this->meta[ strtolower($alias) ] = $escape ? esc($value, 'htmlAttr') : $value;
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns a single meta item.
-     *
-     * @param $alias
-     *
-     * @return mixed
-     */
-    public function get($alias)
-    {
-        $alias = strtolower($alias);
-
-        return isset($this->meta[ $alias ]) ? $this->meta[$alias] : null;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Renders out all defined meta tags.
-     *
-     * @return mixed
-     */
-    public function renderTags()
-    {
-        if (! count($this->meta))
-        {
-            return null;
-        }
-
-        $output = '';
-
-        // Character Encoding
-        $output .= "\t<meta charset=\"{$this->charset}\" >";
-
-        // Everything else
-        foreach ($this->meta as $name => $content)
-        {
-            if (is_array($content))
-            {
-                $content = implode(',', $content);
-            }
-
-            if (empty($content))
-            {
-                continue;
-            }
-
-            // Http Equivalent meta tags.
-            if (in_array($name, $this->http_equiv_meta))
-            {
-                $output .= "\t<meta http-equiv=\"{$name}\" content=\"{$content}\">\n";
-            }
-            // Standard Meta Tag
-            else {
-                $output .= "\t<meta name=\"{$name}\" content=\"{$content}\">\n";
-            }
-        }
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Registers a new HTTP Equivalent meta tag so it can be
-     * rendered out properly.
-     *
-     * @param $name
-     *
-     * @return $this
-     */
-    public function registerHTTPEquivTag($name)
-    {
-        if (is_null($name))
-        {
-            return $this;
-        }
-
-        $this->http_equiv_meta[] = strtolower($name);
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-
-    /**
-     * Convenience implementation to set a value
-     * as if it was a property of the class.
-     *
-     * @param $alias
-     * @param null $value
-     */
-    public function __set($alias, $value=null)
-    {
-        $this->set($alias, $value);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Convenience method to access a value
-     * as if it was a property of the class.
-     *
-     * @param $alias
-     *
-     * @return mixed
-     */
-    public function __get($alias)
-    {
-        return $this->get($alias);
-    }
-
-    //--------------------------------------------------------------------
+	/**
+	 * Stores the meta values the user has set.
+	 *
+	 * @var array
+	 */
+	protected $meta = [];
+
+	/**
+	 * Stores the standard meta-value names
+	 * Mostly here for reference, I guess.
+	 *
+	 * @var array
+	 */
+	protected $std_meta = [
+		'application-name',
+		'author',
+		'copyright',
+		'description',
+		'generator',
+		'keywords',
+		'robots',
+		'googlebot'
+	];
+
+	/**
+	 * Stores the HTTP-Equiv meta tags
+	 * since they need to be rendered differently.
+	 *
+	 * @var array
+	 */
+	protected $http_equiv_meta = [
+		'cache-control',
+		'content-language',
+		'content-type',
+		'default-style',
+		'expires',
+		'pragma',
+		'refresh',
+		'set-cookie'
+	];
+
+	/**
+	 * Stores the document's character encoding.
+	 *
+	 * @var string
+	 */
+	public $charset = 'utf-8';
+
+	//--------------------------------------------------------------------
+
+	public function __construct($ci)
+	{
+		$ci->config->load('html_meta', true);
+
+		$config = $ci->config->item('html_meta');
+
+		$this->meta = $config['meta'];
+
+		$this->http_equiv_meta = array_merge($this->http_equiv_meta, $config['http-equiv']);
+	}
+
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * Sets a single meta item.
+	 * $alias can also be an array of key/value pairs to set.
+	 *
+	 * @param string|array $alias
+	 * @param null $value
+	 *
+	 * @return mixed
+	 */
+	public function set($alias, $value=null, $escape=true)
+	{
+		if (is_array($alias))
+		{
+			foreach ($alias as $key => $val)
+			{
+				$this->set($key, $val);
+			}
+
+			return $this;
+		}
+
+		// Charset
+		if (strtolower($alias) == 'charset')
+		{
+			$this->charset = $value;
+
+			return $this;
+		}
+
+		$this->meta[ strtolower($alias) ] = $escape ? esc($value, 'htmlAttr') : $value;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a single meta item.
+	 *
+	 * @param $alias
+	 *
+	 * @return mixed
+	 */
+	public function get($alias)
+	{
+		$alias = strtolower($alias);
+
+		return isset($this->meta[ $alias ]) ? $this->meta[$alias] : null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Renders out all defined meta tags.
+	 *
+	 * @return mixed
+	 */
+	public function renderTags()
+	{
+		if (! count($this->meta))
+		{
+			return null;
+		}
+
+		$output = '';
+
+		// Character Encoding
+		$output .= "\t<meta charset=\"{$this->charset}\" >";
+
+		// Everything else
+		foreach ($this->meta as $name => $content)
+		{
+			if (is_array($content))
+			{
+				$content = implode(',', $content);
+			}
+
+			if (empty($content))
+			{
+				continue;
+			}
+
+			// Http Equivalent meta tags.
+			if (in_array($name, $this->http_equiv_meta))
+			{
+				$output .= "\t<meta http-equiv=\"{$name}\" content=\"{$content}\">\n";
+			}
+			// Standard Meta Tag
+			else {
+				$output .= "\t<meta name=\"{$name}\" content=\"{$content}\">\n";
+			}
+		}
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Registers a new HTTP Equivalent meta tag so it can be
+	 * rendered out properly.
+	 *
+	 * @param $name
+	 *
+	 * @return $this
+	 */
+	public function registerHTTPEquivTag($name)
+	{
+		if (is_null($name))
+		{
+			return $this;
+		}
+
+		$this->http_equiv_meta[] = strtolower($name);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * Convenience implementation to set a value
+	 * as if it was a property of the class.
+	 *
+	 * @param $alias
+	 * @param null $value
+	 */
+	public function __set($alias, $value=null)
+	{
+		$this->set($alias, $value);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Convenience method to access a value
+	 * as if it was a property of the class.
+	 *
+	 * @param $alias
+	 *
+	 * @return mixed
+	 */
+	public function __get($alias)
+	{
+		return $this->get($alias);
+	}
+
+	//--------------------------------------------------------------------
 
 
 

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php namespace Myth\Themers;
 
-require_once dirname(__FILE__) .'/escape.php';
+require_once dirname(__FILE__).'/escape.php';
 
 /**
  * Sprint
@@ -108,7 +108,7 @@ 
      *
      * @return mixed
      */
-    public function set($alias, $value=null, $escape=true)
+    public function set($alias, $value = null, $escape = true)
     {
         if (is_array($alias))
         {
@@ -128,7 +128,7 @@ 
             return $this;
         }
 
-        $this->meta[ strtolower($alias) ] = $escape ? esc($value, 'htmlAttr') : $value;
+        $this->meta[strtolower($alias)] = $escape ? esc($value, 'htmlAttr') : $value;
 
         return $this;
     }
@@ -146,7 +146,7 @@ 
     {
         $alias = strtolower($alias);
 
-        return isset($this->meta[ $alias ]) ? $this->meta[$alias] : null;
+        return isset($this->meta[$alias]) ? $this->meta[$alias] : null;
     }
 
     //--------------------------------------------------------------------
@@ -158,7 +158,7 @@ 
      */
     public function renderTags()
     {
-        if (! count($this->meta))
+        if ( ! count($this->meta))
         {
             return null;
         }
@@ -227,7 +227,7 @@ 
      * @param $alias
      * @param null $value
      */
-    public function __set($alias, $value=null)
+    public function __set($alias, $value = null)
     {
         $this->set($alias, $value);
     }