ci-bonfire / Sprint

myth/Api/Auth/APIAuthentication.php

Indentation +3 added lines, -3 removed lines

@@ -74,7 +74,7 @@ 
 	 */
 	public function setRealm($realm)
 	{
-	    $this->realm = $realm;
+		$this->realm = $realm;
 		return $this;
 	}
 
@@ -116,7 +116,7 @@ 
 			'password'  => $password
 		];
 
-	    $user = $this->validate($data, true);
+		$user = $this->validate($data, true);
 
 		$this->user = $user;
 
@@ -272,7 +272,7 @@ 
 	 */
 	public function checkIPBlacklist()
 	{
-	    $blacklist = explode(',', config_item('api.ip_blacklist'));
+		$blacklist = explode(',', config_item('api.ip_blacklist'));
 
 		array_walk($blacklist, function (&$item, $key) {
 			$item = trim($item);

myth/Docs/Builder.php

Indentation +718 added lines, -718 removed lines

@@ -60,725 +60,725 @@
 class Builder implements DocBuilderInterface
 {
 
-    protected $docs_ext = '.md';
-
-    protected $ignore_files = ['_404.md'];
-
-    protected $doc_folders = [];
-
-    /**
-     * Stores the current folder alias,
-     * once the file has been found.
-     *
-     * @var null
-     */
-    protected $current_folder = null;
-
-    protected $table_classes = 'table table-hover';
-
-    protected $apppath = '';
-
-    protected $formatters = [];
-
-    protected $page_title = null;
-
-    //--------------------------------------------------------------------
-
-    public function __construct($config = array())
-    {
-        $this->apppath = ! empty($config['apppath']) ? rtrim($config['apppath'], '/') . '/' : '';
-    }
-
-    //--------------------------------------------------------------------
-
-    public function pageTitle()
-    {
-        return $this->page_title;
-    }
-
-    //--------------------------------------------------------------------
-
-
-
-    /**
-     * Does the actual work of reading in and parsing the help file.
-     * If a folder Nickname (see addDocFolder() ) is passed as the second parameter,
-     * it will limit it's search to that single folder. If nothing is passed, it will
-     * search through all of the folders in the order they were given to the library,
-     * until it finds the first one.
-     *
-     * @param string $path The 'path' of the file (relative to the docs
-     *                                 folder. Usually from the URI)
-     * @param string $restrictToFolder (Optional) The folder nickname
-     *
-     * @return string
-     */
-    public function readPage($path, $restrictToFolder = null)
-    {
-        // Clean up our path
-        $path = trim($path, '/ ');
-
-        $content = $this->locateAndReadFile($path, $restrictToFolder);
-
-        $content = $this->parse($content);
-
-        return $content;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Parses the contents. Currently runs through the Markdown Extended
-     * parser to convert to HTML.
-     *
-     * @param $str
-     * @return mixed
-     */
-    public function parse($str)
-    {
-        return $this->format($str);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Perform a few housekeeping tasks on a page, like rewriting URLs to full
-     * URLs, not relative, ensuring they link correctly, etc.
-     *
-     * @param      $content
-     * @param null $site_url
-     * @param null $current_url
-     * @return string   The post-processed HTML.
-     */
-    public function postProcess($content, $site_url = null, $current_url = null)
-    {
-        if (empty($content)) {
-            return $content;
-        }
-
-        try {
-            $xml = new \SimpleXMLElement('<?xml version="1.0" standalone="yes"?><div>' . $content . '</div>');
-        } catch (\Exception $e) {
-            // SimpleXML barfed on us, so send back the un-modified content
-            return $content;
-        }
-
-        // Prepare some things and cleanup others
-        $groups = array_keys($this->doc_folders);
-        $site_url = rtrim($site_url, '/') . '/';
-        $current_url = rtrim($current_url, '#/');
-
-        // Try to determine the current_url if one isn't set.
-        if (empty($this->current_folder)) {
-            $this->current_folder = $this->detectCurrentFolder($current_url, $groups);
-        }
-
-        /*
+	protected $docs_ext = '.md';
+
+	protected $ignore_files = ['_404.md'];
+
+	protected $doc_folders = [];
+
+	/**
+	 * Stores the current folder alias,
+	 * once the file has been found.
+	 *
+	 * @var null
+	 */
+	protected $current_folder = null;
+
+	protected $table_classes = 'table table-hover';
+
+	protected $apppath = '';
+
+	protected $formatters = [];
+
+	protected $page_title = null;
+
+	//--------------------------------------------------------------------
+
+	public function __construct($config = array())
+	{
+		$this->apppath = ! empty($config['apppath']) ? rtrim($config['apppath'], '/') . '/' : '';
+	}
+
+	//--------------------------------------------------------------------
+
+	public function pageTitle()
+	{
+		return $this->page_title;
+	}
+
+	//--------------------------------------------------------------------
+
+
+
+	/**
+	 * Does the actual work of reading in and parsing the help file.
+	 * If a folder Nickname (see addDocFolder() ) is passed as the second parameter,
+	 * it will limit it's search to that single folder. If nothing is passed, it will
+	 * search through all of the folders in the order they were given to the library,
+	 * until it finds the first one.
+	 *
+	 * @param string $path The 'path' of the file (relative to the docs
+	 *                                 folder. Usually from the URI)
+	 * @param string $restrictToFolder (Optional) The folder nickname
+	 *
+	 * @return string
+	 */
+	public function readPage($path, $restrictToFolder = null)
+	{
+		// Clean up our path
+		$path = trim($path, '/ ');
+
+		$content = $this->locateAndReadFile($path, $restrictToFolder);
+
+		$content = $this->parse($content);
+
+		return $content;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Parses the contents. Currently runs through the Markdown Extended
+	 * parser to convert to HTML.
+	 *
+	 * @param $str
+	 * @return mixed
+	 */
+	public function parse($str)
+	{
+		return $this->format($str);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Perform a few housekeeping tasks on a page, like rewriting URLs to full
+	 * URLs, not relative, ensuring they link correctly, etc.
+	 *
+	 * @param      $content
+	 * @param null $site_url
+	 * @param null $current_url
+	 * @return string   The post-processed HTML.
+	 */
+	public function postProcess($content, $site_url = null, $current_url = null)
+	{
+		if (empty($content)) {
+			return $content;
+		}
+
+		try {
+			$xml = new \SimpleXMLElement('<?xml version="1.0" standalone="yes"?><div>' . $content . '</div>');
+		} catch (\Exception $e) {
+			// SimpleXML barfed on us, so send back the un-modified content
+			return $content;
+		}
+
+		// Prepare some things and cleanup others
+		$groups = array_keys($this->doc_folders);
+		$site_url = rtrim($site_url, '/') . '/';
+		$current_url = rtrim($current_url, '#/');
+
+		// Try to determine the current_url if one isn't set.
+		if (empty($this->current_folder)) {
+			$this->current_folder = $this->detectCurrentFolder($current_url, $groups);
+		}
+
+		/*
          * Rewrite the URLs
          */
-        foreach ($xml->xpath('//a') as $link) {
-            $link = $this->reformatAnchor($link, $groups, $current_url, $site_url);
-        }
-
-        $content = $xml->asXML();
-        $content = trim(str_replace('<?xml version="1.0" standalone="yes"?>', '', $content));
-
-        // Clean up and style the tables
-        $content = str_replace('<table>', '<table class="' . $this->table_classes . '">', $content);
-
-        return $content;
-    }
-    //--------------------------------------------------------------------
-
-    /**
-     * Allows users to define the classes that are attached to
-     * generated tables.
-     *
-     * @param null $classes
-     * @return $this
-     */
-    public function setTableClasses($classes = null)
-    {
-        $this->table_classes = $classes;
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Given the contents to render, will build a list of links for the sidebar
-     * out of the headings in the file.
-     *
-     * Note: Will ONLY use h2 and h3 to build the links from.
-     *
-     * Note: The $content passed in WILL be modified by adding named anchors
-     * that match up with the locations.
-     *
-     * @param string $content The HTML to analyse for headings.
-     * @return string
-     */
-    public function buildDocumentMap(&$content)
-    {
-        if (empty($content)) {
-            return $content;
-        }
-
-        // If $content already has a wrapping <div> and </div> tags, remove them,
-        // since we'll replace them just below.
-        if (strpos($content, '<div>') === 0) {
-            $content = substr($content, 5);
-
-            // Trailing div also?
-            if (substr($content, -6) == '</div>') {
-                $content = substr($content, 0, -6);
-            }
-        }
-
-        try {
-            $xml = new \SimpleXMLElement('<?xml version="1.0" standalone="yes"?><div>' . $content . '</div>');
-        } catch (\Exception $e) {
-            // SimpleXML barfed on us, so send back the un-modified content
-            return [];
-        }
-
-        $map = [];
-        list($map, $content) = $this->extractDocMapAndAddAnchors($content, $xml, $map);
-
-        return $map;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Stores the name of the callback method to run to convert the source
-     * files to viewable files. By default, this should be used to register
-     * a Mardown Extended formatter with the system, but could be used to
-     * extend the
-     *
-     * @param string $callback
-     * @param bool $cascade // If FALSE the formatting of a component ends here. If TRUE, will be passed to next formatter.
-     * @return $this
-     */
-    public function registerFormatter($callback = null, $cascade = false)
-    {
-        if (empty($callback)) return;
-
-        $this->formatters[] = [
-            'callable' => $callback,
-            'cascade'  => (bool)$cascade
-        ];
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Runs the text through the registered formatters.
-     *
-     * @param $str
-     * @return mixed
-     */
-    public function format($str)
-    {
-        if (! is_array($this->formatters)) return $str;
-
-        foreach ($this->formatters as $formatter) {
-            $method = $formatter['callable'];
-            $cascade = $formatter['cascade'];
-
-            $str = call_user_func($method, $str);
-
-            if (! $cascade) return $str;
-        }
-
-        return $str;
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Table of Contents methods
-    //--------------------------------------------------------------------
-
-    /**
-     * Retrieves the list of files in a folder and preps the name and filename
-     * so it's ready for creating the HTML.
-     *
-     * @param  String $folder The path to the folder to retrieve.
-     *
-     * @return Array  An associative array @see parse_ini_file for format
-     * details.
-     */
-    public function buildTOC($folder)
-    {
-        // If the toc file exists in the folder, use it to build the links.
-        if (is_file("{$folder}/_toc.ini")) {
-            $toc = parse_ini_file("{$folder}/_toc.ini", true);
-            return $this->columnizeTOC($toc);
-        }
-
-        // If the toc file does not exist, build the links by listing the files
-        // in the directory (and any sub-directories)
-        $map = $this->directory_map($folder);
-
-        // If directory_map can not open the directory or find any files inside
-        // the directory, return an empty array.
-        if (empty($map)) {
-            return [];
-        }
-
-        // If these docs are located in the /application/docs or /bonfire/docs
-        // directory, just use $this->current_group for the root.
-        // Module docs need $this->current_group and $type.
-        $tocRoot = $this->current_folder;
-        if ($this->current_folder != strtolower($folder)) {
-            $tocRoot .= '/' . strtolower($folder);
-        }
-
-        $toc = [];
-        foreach ($map as $files) {
-            // If $files isn't an array, then make it one so that all situations
-            // may be dealt with cleanly.
-            if (! is_array($files)) {
-                $files = [$files];
-            }
-
-            foreach ($files as $file) {
-                if (in_array($file, $this->ignore_files)) {
-                    continue;
-                }
-
-                // The title for the index is the passed $type. Otherwise,
-                // build the title from the file's name.
-                if (strpos($file, 'index') === false) {
-                    $title = str_replace($this->docs_ext, '', $file);
-                    $title = str_replace('_', ' ', $title);
-                    $title = ucwords($title);
-
-                    $toc["{$tocRoot}/{$file}"] = $title;
-                } else {
-                    $toc[$tocRoot] = $type;
-                }
-            }
-        }
-
-        $toc = $this->columnizeTOC($toc);
-
-        return $toc;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sorts the passed TOC array into columns of as close to equal length
-     * as we can get it.
-     *
-     * @param $toc
-     * @return array
-     */
-    protected function columnizeTOC($toc)
-    {
-        $section_count = count($toc);
-
-        // First - determine the size of each 'section'.
-        $sizes = [];
-
-        foreach ($toc as $section => $chapters) {
-            $sizes[] = count($chapters);
-        }
-
-        $column_avg = (int)round(array_sum($sizes) / $section_count);
-
-        // Split things into 4 columns of approximately equal size.
-        // If we only have 4 columns (or less), then make sure to
-        // deal with that also.
-        $columns = [];
-
-        $current_column = 0;
-        $current_column_count = 0;
-        $keys = array_keys($toc);
-
-        for ($i = 0; $i <= $section_count; $i++) {
-            if (! isset($keys[$i])) {
-                continue;
-            }
-
-            $section = array_shift($toc);
-
-            // Can we stay in this column?
-            if ($current_column_count <= $column_avg && $section_count > 4) {
-                // Don't forget to account for the heading also.
-                $current_column_count += count($section) + 1;
-            } else {
-                $current_column_count = 0;
-                $current_column++;
-            }
-
-            $columns[$current_column][$keys[$i]] = $section;
-        }
-
-        return $columns;
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Folder Methods
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns the current docFolders array.
-     *
-     * @return array
-     */
-    public function docFolders()
-    {
-        return $this->doc_folders;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Registers a path to be used when searching for documentation files.
-     *
-     * @param $name     A nickname to reference it by later.
-     * @param $path     The server path to the folder.
-     * @return $this
-     */
-    public function addDocFolder($name, $path)
-    {
-        // Standardize the path
-        $path = realpath($path) . '/';
-
-        // realpath will return FALSE if the path doesn't exist
-        // or the script doesn't have access to it.
-        if (! $path || $path == '/') {
-            return $this;
-        }
-
-        $name = strtolower($name);
-
-        $this->doc_folders[$name] = $path;
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Removes a folder from the folders we scan for documentation files
-     * within.
-     *
-     * @param $name
-     * @return $this
-     */
-    public function removeDocFolder($name)
-    {
-        $name = strtolower($name);
-
-        if (isset($this->doc_folders[$name])) {
-            unset($this->doc_folders[$name]);
-        }
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Private Methods
-    //--------------------------------------------------------------------
-
-    /**
-     * Analyzes the passed in current url string and checks against
-     * a list of groups to determine what the current group is.
-     *
-     * @param $current_url
-     * @param $groups
-     * @return string
-     */
-    protected function detectCurrentFolder($current_url, $groups = [])
-    {
-        if (! is_array($groups)) {
-            return null;
-        }
-
-        $segments = explode('/', $current_url);
-
-        // We start from the back of the array since
-        // that's most likely to be close to the end.
-        $segments = array_reverse($segments);
-
-        foreach ($segments as $segment) {
-            foreach ($groups as $group) {
-                if (strtolower($group) == strtolower($segment)) {
-                    return $group;
-                }
-            }
-        }
-
-        // Nothing found?
-        return null;
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Private Methods
-    //--------------------------------------------------------------------
-
-    /**
-     * Locates the file on disk and reads the contents into a single string.
-     *
-     * If a folder Nickname (see addDocFolder() ) is passed as the second parameter,
-     * it will limit it's search to that single folder. If nothing is passed, it will
-     * search through all of the folders in the order they were given to the library,
-     * until it finds the first one.
-     *
-     * @param string $path The 'path' of the file (relative to the docs
-     *                                 folder. Usually from the URI)
-     * @param string $restrictToFolder (Optional) The nickname of one of the
-     *                                 folders to restrict the search to.
-     *
-     * @throws RuntimeException
-     * @return null|string
-     */
-    private function locateAndReadFile($path, $restrictToFolder = null)
-    {
-        $folders = $this->doc_folders;
-
-        if (! is_null($restrictToFolder)) {
-            // Make sure the folder exists
-            if (! is_null($restrictToFolder) && ! isset($this->doc_folders[$restrictToFolder])) {
-                throw new \RuntimeException('You must add the docs folder that you wish to find docs from.');
-            }
-
-            $folders = [$this->doc_folders[$restrictToFolder]];
-        }
-
-        foreach ($folders as $alias => $folder) {
-            if (file_exists($folder . $path . $this->docs_ext)) {
-                // Store the alias so we know which folder we're in.
-                $this->current_folder = $alias;
-
-                return file_get_contents($folder . $path . $this->docs_ext);
-            }
-        }
-
-        return null;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Re-formats the passed in link.
-     *
-     * @param $link
-     * @param $current_url
-     * @param $site_url
-     * @return mixed
-     */
-    private function reformatAnchor($link, $groups, $current_url, $site_url)
-    {
-        // Grab the href value.
-        $href = $link->attributes()->href;
-
-        // If the href is null, it's probably a named anchor with no content.
-        if (! $href) {
-            // Make sure it has an href, else the XML will not close this
-            // tag correctly.
-            $link['href'] = ' ';
-
-            return $link;
-        }
-
-        // Remove any trailing # signs
-        $href = rtrim($href, '# ');
-
-        // If the href starts with #, then attach the current_url to it
-        if ($href != '' && substr_compare($href, '#', 0, 1) === 0) {
-            $link['href'] = $current_url . $href;
-
-            return $link;
-        }
-
-        // If it's a full external path, go on...
-        if ((strpos($href, 'http://') !== false || strpos($href, 'https://') !== false) &&
-            strpos($href, $site_url) === false
-        ) {
-            $link['target'] = "_blank";
-            return $link;
-        }
-
-        // If it's a full local path, get rid of it.
-        if (strpos($href, $site_url) !== false) {
-            $href = str_replace($site_url, '', $href);
-        }
-
-        // Strip out some unnecessary items, just in case they're there.
-        if (substr($href, 0, strlen('docs/')) == 'docs/') {
-            $href = substr($href, strlen('docs/'));
-        }
-
-        // This includes 'bonfire/' if it was missed during the conversion.
-        if (substr($href, 0, strlen('bonfire/')) == 'bonfire/') {
-            $href = substr($href, strlen('bonfire/'));
-        }
-
-        // If another 'group' is not already defined at the head of the link
-        // then add the current group to it.
-        $group_found = false;
-
-        foreach ($groups as $group) {
-            if (strpos($href, $group) === 0) {
-                $group_found = true;
-            }
-        }
-
-        if (! $group_found) {
-            $href = $this->current_folder . '/' . $href;
-        }
-
-        // Convert to full site_url
-        if (strpos($href, 'http') !== 0) {
-            $href = $site_url . 'docs/' . ltrim($href, '/ ');
-        }
-
-        // Save the corrected href
-        $link['href'] = $href;
-
-        return $link;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a Document Map based on <h2> and <h3> tags.
-     * Also adds named anchors into the $content so the map
-     * can link to the content properly.
-     *
-     * @param $content
-     * @param $xml
-     * @param $map
-     * @return array
-     */
-    protected function extractDocMapAndAddAnchors(&$content, $xml, $map)
-    {
-        // Holds the current h2 we're processing
-        $current_obj = [];
-
-        $currentChild = 0;
-
-        foreach ($xml->children() as $childType => $line) {
-            $currentChild++;
-
-            // If it's an h1 - take the first and make it
-            // our page title.
-            if ($childType == 'h1' && empty($this->page_title))
-            {
-                $this->page_title = (string)$line;
-            }
-
-            // Make sure that our current object is
-            // stored and reset.
-            if ($childType == 'h1' || $childType == 'h2') {
-                if (count($current_obj)) {
-                    $map[] = $current_obj;
-                    $current_obj = [];
-                }
-            }
-
-            if ($childType == 'h2') {
-                $name = (string)$line;
-                $link = strtolower(str_replace(' ', '_', (string)$line));
-
-                $current_obj['name'] = $name;
-                $current_obj['link'] = '#' . $link;
-                $current_obj['items'] = [];
-
-                // Insert a named anchor into the $content
-                $anchor = '<a name="' . $link . '" id="' . $link . '" ></a>';
-
-                $search = "<h2>{$name}</h2>";
-
-                $content = str_replace($search, $anchor . $search, $content);
-            } elseif ($childType == 'h3') {
-                // Make sure we have some place to store the items.
-                if (! isset($current_obj['items'])) {
-                    $current_obj['items'] = [];
-                }
-
-                $link = strtolower(str_replace(' ', '_', (string)$line));
-                $name = (string)$line;
-
-                $current_obj['items'][] = [
-                    'name' => $name,
-                    'link' => '#' . $link
-                ];
-
-                // Insert a named anchor into the $content
-                $anchor = '<a name="' . $link . '" id="' . $link . '" ></a>';
-
-                $search = "<h3>{$name}</h3>";
-
-                $content = str_replace($search, $anchor . $search, $content);
-            }
-
-            // Is this the last element? Then close out our current object.
-            if (count($xml) == $currentChild) {
-                if (count($current_obj)) {
-                    $map[] = $current_obj;
-                }
-            }
-        }
-        return [$map, $content];
-    }
-    //--------------------------------------------------------------------
-
-    /**
-     * Create a Directory Map
-     *
-     * Reads the specified directory and builds an array
-     * representation of it. Sub-folders contained with the
-     * directory will be mapped as well.
-     *
-     * @param    string $source_dir Path to source
-     * @param    int $directory_depth Depth of directories to traverse
-     *                        (0 = fully recursive, 1 = current dir, etc)
-     * @param    bool $hidden Whether to show hidden files
-     * @return    array
-     */
-    protected function directory_map($source_dir, $directory_depth = 0, $hidden = FALSE)
-    {
-        if ($fp = @opendir($source_dir)) {
-            $filedata = array();
-            $new_depth = $directory_depth - 1;
-            $source_dir = rtrim($source_dir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
-
-            while (FALSE !== ($file = readdir($fp))) {
-                // Remove '.', '..', and hidden files [optional]
-                if ($file === '.' OR $file === '..' OR ($hidden === FALSE && $file[0] === '.')) {
-                    continue;
-                }
-
-                is_dir($source_dir . $file) && $file .= DIRECTORY_SEPARATOR;
-
-                if (($directory_depth < 1 OR $new_depth > 0) && is_dir($source_dir . $file)) {
-                    $filedata[$file] = directory_map($source_dir . $file, $new_depth, $hidden);
-                } else {
-                    $filedata[] = $file;
-                }
-            }
-
-            closedir($fp);
-            return $filedata;
-        }
-
-        return FALSE;
-    }
-
-    //--------------------------------------------------------------------
+		foreach ($xml->xpath('//a') as $link) {
+			$link = $this->reformatAnchor($link, $groups, $current_url, $site_url);
+		}
+
+		$content = $xml->asXML();
+		$content = trim(str_replace('<?xml version="1.0" standalone="yes"?>', '', $content));
+
+		// Clean up and style the tables
+		$content = str_replace('<table>', '<table class="' . $this->table_classes . '">', $content);
+
+		return $content;
+	}
+	//--------------------------------------------------------------------
+
+	/**
+	 * Allows users to define the classes that are attached to
+	 * generated tables.
+	 *
+	 * @param null $classes
+	 * @return $this
+	 */
+	public function setTableClasses($classes = null)
+	{
+		$this->table_classes = $classes;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Given the contents to render, will build a list of links for the sidebar
+	 * out of the headings in the file.
+	 *
+	 * Note: Will ONLY use h2 and h3 to build the links from.
+	 *
+	 * Note: The $content passed in WILL be modified by adding named anchors
+	 * that match up with the locations.
+	 *
+	 * @param string $content The HTML to analyse for headings.
+	 * @return string
+	 */
+	public function buildDocumentMap(&$content)
+	{
+		if (empty($content)) {
+			return $content;
+		}
+
+		// If $content already has a wrapping <div> and </div> tags, remove them,
+		// since we'll replace them just below.
+		if (strpos($content, '<div>') === 0) {
+			$content = substr($content, 5);
+
+			// Trailing div also?
+			if (substr($content, -6) == '</div>') {
+				$content = substr($content, 0, -6);
+			}
+		}
+
+		try {
+			$xml = new \SimpleXMLElement('<?xml version="1.0" standalone="yes"?><div>' . $content . '</div>');
+		} catch (\Exception $e) {
+			// SimpleXML barfed on us, so send back the un-modified content
+			return [];
+		}
+
+		$map = [];
+		list($map, $content) = $this->extractDocMapAndAddAnchors($content, $xml, $map);
+
+		return $map;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Stores the name of the callback method to run to convert the source
+	 * files to viewable files. By default, this should be used to register
+	 * a Mardown Extended formatter with the system, but could be used to
+	 * extend the
+	 *
+	 * @param string $callback
+	 * @param bool $cascade // If FALSE the formatting of a component ends here. If TRUE, will be passed to next formatter.
+	 * @return $this
+	 */
+	public function registerFormatter($callback = null, $cascade = false)
+	{
+		if (empty($callback)) return;
+
+		$this->formatters[] = [
+			'callable' => $callback,
+			'cascade'  => (bool)$cascade
+		];
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Runs the text through the registered formatters.
+	 *
+	 * @param $str
+	 * @return mixed
+	 */
+	public function format($str)
+	{
+		if (! is_array($this->formatters)) return $str;
+
+		foreach ($this->formatters as $formatter) {
+			$method = $formatter['callable'];
+			$cascade = $formatter['cascade'];
+
+			$str = call_user_func($method, $str);
+
+			if (! $cascade) return $str;
+		}
+
+		return $str;
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Table of Contents methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieves the list of files in a folder and preps the name and filename
+	 * so it's ready for creating the HTML.
+	 *
+	 * @param  String $folder The path to the folder to retrieve.
+	 *
+	 * @return Array  An associative array @see parse_ini_file for format
+	 * details.
+	 */
+	public function buildTOC($folder)
+	{
+		// If the toc file exists in the folder, use it to build the links.
+		if (is_file("{$folder}/_toc.ini")) {
+			$toc = parse_ini_file("{$folder}/_toc.ini", true);
+			return $this->columnizeTOC($toc);
+		}
+
+		// If the toc file does not exist, build the links by listing the files
+		// in the directory (and any sub-directories)
+		$map = $this->directory_map($folder);
+
+		// If directory_map can not open the directory or find any files inside
+		// the directory, return an empty array.
+		if (empty($map)) {
+			return [];
+		}
+
+		// If these docs are located in the /application/docs or /bonfire/docs
+		// directory, just use $this->current_group for the root.
+		// Module docs need $this->current_group and $type.
+		$tocRoot = $this->current_folder;
+		if ($this->current_folder != strtolower($folder)) {
+			$tocRoot .= '/' . strtolower($folder);
+		}
+
+		$toc = [];
+		foreach ($map as $files) {
+			// If $files isn't an array, then make it one so that all situations
+			// may be dealt with cleanly.
+			if (! is_array($files)) {
+				$files = [$files];
+			}
+
+			foreach ($files as $file) {
+				if (in_array($file, $this->ignore_files)) {
+					continue;
+				}
+
+				// The title for the index is the passed $type. Otherwise,
+				// build the title from the file's name.
+				if (strpos($file, 'index') === false) {
+					$title = str_replace($this->docs_ext, '', $file);
+					$title = str_replace('_', ' ', $title);
+					$title = ucwords($title);
+
+					$toc["{$tocRoot}/{$file}"] = $title;
+				} else {
+					$toc[$tocRoot] = $type;
+				}
+			}
+		}
+
+		$toc = $this->columnizeTOC($toc);
+
+		return $toc;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sorts the passed TOC array into columns of as close to equal length
+	 * as we can get it.
+	 *
+	 * @param $toc
+	 * @return array
+	 */
+	protected function columnizeTOC($toc)
+	{
+		$section_count = count($toc);
+
+		// First - determine the size of each 'section'.
+		$sizes = [];
+
+		foreach ($toc as $section => $chapters) {
+			$sizes[] = count($chapters);
+		}
+
+		$column_avg = (int)round(array_sum($sizes) / $section_count);
+
+		// Split things into 4 columns of approximately equal size.
+		// If we only have 4 columns (or less), then make sure to
+		// deal with that also.
+		$columns = [];
+
+		$current_column = 0;
+		$current_column_count = 0;
+		$keys = array_keys($toc);
+
+		for ($i = 0; $i <= $section_count; $i++) {
+			if (! isset($keys[$i])) {
+				continue;
+			}
+
+			$section = array_shift($toc);
+
+			// Can we stay in this column?
+			if ($current_column_count <= $column_avg && $section_count > 4) {
+				// Don't forget to account for the heading also.
+				$current_column_count += count($section) + 1;
+			} else {
+				$current_column_count = 0;
+				$current_column++;
+			}
+
+			$columns[$current_column][$keys[$i]] = $section;
+		}
+
+		return $columns;
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Folder Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the current docFolders array.
+	 *
+	 * @return array
+	 */
+	public function docFolders()
+	{
+		return $this->doc_folders;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Registers a path to be used when searching for documentation files.
+	 *
+	 * @param $name     A nickname to reference it by later.
+	 * @param $path     The server path to the folder.
+	 * @return $this
+	 */
+	public function addDocFolder($name, $path)
+	{
+		// Standardize the path
+		$path = realpath($path) . '/';
+
+		// realpath will return FALSE if the path doesn't exist
+		// or the script doesn't have access to it.
+		if (! $path || $path == '/') {
+			return $this;
+		}
+
+		$name = strtolower($name);
+
+		$this->doc_folders[$name] = $path;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Removes a folder from the folders we scan for documentation files
+	 * within.
+	 *
+	 * @param $name
+	 * @return $this
+	 */
+	public function removeDocFolder($name)
+	{
+		$name = strtolower($name);
+
+		if (isset($this->doc_folders[$name])) {
+			unset($this->doc_folders[$name]);
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Private Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Analyzes the passed in current url string and checks against
+	 * a list of groups to determine what the current group is.
+	 *
+	 * @param $current_url
+	 * @param $groups
+	 * @return string
+	 */
+	protected function detectCurrentFolder($current_url, $groups = [])
+	{
+		if (! is_array($groups)) {
+			return null;
+		}
+
+		$segments = explode('/', $current_url);
+
+		// We start from the back of the array since
+		// that's most likely to be close to the end.
+		$segments = array_reverse($segments);
+
+		foreach ($segments as $segment) {
+			foreach ($groups as $group) {
+				if (strtolower($group) == strtolower($segment)) {
+					return $group;
+				}
+			}
+		}
+
+		// Nothing found?
+		return null;
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Private Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Locates the file on disk and reads the contents into a single string.
+	 *
+	 * If a folder Nickname (see addDocFolder() ) is passed as the second parameter,
+	 * it will limit it's search to that single folder. If nothing is passed, it will
+	 * search through all of the folders in the order they were given to the library,
+	 * until it finds the first one.
+	 *
+	 * @param string $path The 'path' of the file (relative to the docs
+	 *                                 folder. Usually from the URI)
+	 * @param string $restrictToFolder (Optional) The nickname of one of the
+	 *                                 folders to restrict the search to.
+	 *
+	 * @throws RuntimeException
+	 * @return null|string
+	 */
+	private function locateAndReadFile($path, $restrictToFolder = null)
+	{
+		$folders = $this->doc_folders;
+
+		if (! is_null($restrictToFolder)) {
+			// Make sure the folder exists
+			if (! is_null($restrictToFolder) && ! isset($this->doc_folders[$restrictToFolder])) {
+				throw new \RuntimeException('You must add the docs folder that you wish to find docs from.');
+			}
+
+			$folders = [$this->doc_folders[$restrictToFolder]];
+		}
+
+		foreach ($folders as $alias => $folder) {
+			if (file_exists($folder . $path . $this->docs_ext)) {
+				// Store the alias so we know which folder we're in.
+				$this->current_folder = $alias;
+
+				return file_get_contents($folder . $path . $this->docs_ext);
+			}
+		}
+
+		return null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Re-formats the passed in link.
+	 *
+	 * @param $link
+	 * @param $current_url
+	 * @param $site_url
+	 * @return mixed
+	 */
+	private function reformatAnchor($link, $groups, $current_url, $site_url)
+	{
+		// Grab the href value.
+		$href = $link->attributes()->href;
+
+		// If the href is null, it's probably a named anchor with no content.
+		if (! $href) {
+			// Make sure it has an href, else the XML will not close this
+			// tag correctly.
+			$link['href'] = ' ';
+
+			return $link;
+		}
+
+		// Remove any trailing # signs
+		$href = rtrim($href, '# ');
+
+		// If the href starts with #, then attach the current_url to it
+		if ($href != '' && substr_compare($href, '#', 0, 1) === 0) {
+			$link['href'] = $current_url . $href;
+
+			return $link;
+		}
+
+		// If it's a full external path, go on...
+		if ((strpos($href, 'http://') !== false || strpos($href, 'https://') !== false) &&
+			strpos($href, $site_url) === false
+		) {
+			$link['target'] = "_blank";
+			return $link;
+		}
+
+		// If it's a full local path, get rid of it.
+		if (strpos($href, $site_url) !== false) {
+			$href = str_replace($site_url, '', $href);
+		}
+
+		// Strip out some unnecessary items, just in case they're there.
+		if (substr($href, 0, strlen('docs/')) == 'docs/') {
+			$href = substr($href, strlen('docs/'));
+		}
+
+		// This includes 'bonfire/' if it was missed during the conversion.
+		if (substr($href, 0, strlen('bonfire/')) == 'bonfire/') {
+			$href = substr($href, strlen('bonfire/'));
+		}
+
+		// If another 'group' is not already defined at the head of the link
+		// then add the current group to it.
+		$group_found = false;
+
+		foreach ($groups as $group) {
+			if (strpos($href, $group) === 0) {
+				$group_found = true;
+			}
+		}
+
+		if (! $group_found) {
+			$href = $this->current_folder . '/' . $href;
+		}
+
+		// Convert to full site_url
+		if (strpos($href, 'http') !== 0) {
+			$href = $site_url . 'docs/' . ltrim($href, '/ ');
+		}
+
+		// Save the corrected href
+		$link['href'] = $href;
+
+		return $link;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a Document Map based on <h2> and <h3> tags.
+	 * Also adds named anchors into the $content so the map
+	 * can link to the content properly.
+	 *
+	 * @param $content
+	 * @param $xml
+	 * @param $map
+	 * @return array
+	 */
+	protected function extractDocMapAndAddAnchors(&$content, $xml, $map)
+	{
+		// Holds the current h2 we're processing
+		$current_obj = [];
+
+		$currentChild = 0;
+
+		foreach ($xml->children() as $childType => $line) {
+			$currentChild++;
+
+			// If it's an h1 - take the first and make it
+			// our page title.
+			if ($childType == 'h1' && empty($this->page_title))
+			{
+				$this->page_title = (string)$line;
+			}
+
+			// Make sure that our current object is
+			// stored and reset.
+			if ($childType == 'h1' || $childType == 'h2') {
+				if (count($current_obj)) {
+					$map[] = $current_obj;
+					$current_obj = [];
+				}
+			}
+
+			if ($childType == 'h2') {
+				$name = (string)$line;
+				$link = strtolower(str_replace(' ', '_', (string)$line));
+
+				$current_obj['name'] = $name;
+				$current_obj['link'] = '#' . $link;
+				$current_obj['items'] = [];
+
+				// Insert a named anchor into the $content
+				$anchor = '<a name="' . $link . '" id="' . $link . '" ></a>';
+
+				$search = "<h2>{$name}</h2>";
+
+				$content = str_replace($search, $anchor . $search, $content);
+			} elseif ($childType == 'h3') {
+				// Make sure we have some place to store the items.
+				if (! isset($current_obj['items'])) {
+					$current_obj['items'] = [];
+				}
+
+				$link = strtolower(str_replace(' ', '_', (string)$line));
+				$name = (string)$line;
+
+				$current_obj['items'][] = [
+					'name' => $name,
+					'link' => '#' . $link
+				];
+
+				// Insert a named anchor into the $content
+				$anchor = '<a name="' . $link . '" id="' . $link . '" ></a>';
+
+				$search = "<h3>{$name}</h3>";
+
+				$content = str_replace($search, $anchor . $search, $content);
+			}
+
+			// Is this the last element? Then close out our current object.
+			if (count($xml) == $currentChild) {
+				if (count($current_obj)) {
+					$map[] = $current_obj;
+				}
+			}
+		}
+		return [$map, $content];
+	}
+	//--------------------------------------------------------------------
+
+	/**
+	 * Create a Directory Map
+	 *
+	 * Reads the specified directory and builds an array
+	 * representation of it. Sub-folders contained with the
+	 * directory will be mapped as well.
+	 *
+	 * @param    string $source_dir Path to source
+	 * @param    int $directory_depth Depth of directories to traverse
+	 *                        (0 = fully recursive, 1 = current dir, etc)
+	 * @param    bool $hidden Whether to show hidden files
+	 * @return    array
+	 */
+	protected function directory_map($source_dir, $directory_depth = 0, $hidden = FALSE)
+	{
+		if ($fp = @opendir($source_dir)) {
+			$filedata = array();
+			$new_depth = $directory_depth - 1;
+			$source_dir = rtrim($source_dir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+
+			while (FALSE !== ($file = readdir($fp))) {
+				// Remove '.', '..', and hidden files [optional]
+				if ($file === '.' OR $file === '..' OR ($hidden === FALSE && $file[0] === '.')) {
+					continue;
+				}
+
+				is_dir($source_dir . $file) && $file .= DIRECTORY_SEPARATOR;
+
+				if (($directory_depth < 1 OR $new_depth > 0) && is_dir($source_dir . $file)) {
+					$filedata[$file] = directory_map($source_dir . $file, $new_depth, $hidden);
+				} else {
+					$filedata[] = $file;
+				}
+			}
+
+			closedir($fp);
+			return $filedata;
+		}
+
+		return FALSE;
+	}
+
+	//--------------------------------------------------------------------
 
 }

myth/Docs/DocSearchInterface.php

Indentation +59 added lines, -59 removed lines

@@ -1,71 +1,71 @@
 <?php namespace Myth\Docs;
 /**
- * Sprint
- *
- * A set of power tools to enhance the CodeIgniter framework and provide consistent workflow.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package     Sprint
- * @author      Lonnie Ezell
- * @copyright   Copyright 2014-2015, New Myth Media, LLC (http://newmythmedia.com)
- * @license     http://opensource.org/licenses/MIT  (MIT)
- * @link        http://sprintphp.com
- * @since       Version 1.0
- */
+	 * Sprint
+	 *
+	 * A set of power tools to enhance the CodeIgniter framework and provide consistent workflow.
+	 *
+	 * Permission is hereby granted, free of charge, to any person obtaining a copy
+	 * of this software and associated documentation files (the "Software"), to deal
+	 * in the Software without restriction, including without limitation the rights
+	 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+	 * copies of the Software, and to permit persons to whom the Software is
+	 * furnished to do so, subject to the following conditions:
+	 *
+	 * The above copyright notice and this permission notice shall be included in
+	 * all copies or substantial portions of the Software.
+	 *
+	 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+	 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+	 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+	 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+	 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+	 * THE SOFTWARE.
+	 *
+	 * @package     Sprint
+	 * @author      Lonnie Ezell
+	 * @copyright   Copyright 2014-2015, New Myth Media, LLC (http://newmythmedia.com)
+	 * @license     http://opensource.org/licenses/MIT  (MIT)
+	 * @link        http://sprintphp.com
+	 * @since       Version 1.0
+	 */
 
 interface DocSearchInterface {
 
-    /**
-     * The entry point for performing a search of the documentation.
-     *
-     * @param null  $terms
-     * @param array $folders
-     *
-     * @return array|null
-     */
-    public function search($terms = null, $folders = []);
+	/**
+	 * The entry point for performing a search of the documentation.
+	 *
+	 * @param null  $terms
+	 * @param array $folders
+	 *
+	 * @return array|null
+	 */
+	public function search($terms = null, $folders = []);
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Stores the name of the callback method to run to convert the source
-     * files to viewable files. By default, this should be used to register
-     * a Mardown Extended formatter with the system, but could be used to
-     * extend the
-     *
-     * @param string $callback_name
-     * @param bool   $cascade       // If FALSE the formatting of a component ends here. If TRUE, will be passed to next formatter.
-     * @return $this
-     */
-    public function registerFormatter($callback_name='', $cascade=false);
+	/**
+	 * Stores the name of the callback method to run to convert the source
+	 * files to viewable files. By default, this should be used to register
+	 * a Mardown Extended formatter with the system, but could be used to
+	 * extend the
+	 *
+	 * @param string $callback_name
+	 * @param bool   $cascade       // If FALSE the formatting of a component ends here. If TRUE, will be passed to next formatter.
+	 * @return $this
+	 */
+	public function registerFormatter($callback_name='', $cascade=false);
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Runs the text through the registered formatters.
-     *
-     * @param $str
-     * @return mixed
-     */
-    public function format($str);
+	/**
+	 * Runs the text through the registered formatters.
+	 *
+	 * @param $str
+	 * @return mixed
+	 */
+	public function format($str);
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 }

myth/Settings/DatabaseStore.php

Indentation +208 added lines, -208 removed lines

@@ -1,214 +1,214 @@
 <?php namespace Myth\Settings;
 /**
- * Sprint
- *
- * A set of power tools to enhance the CodeIgniter framework and provide consistent workflow.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package     Sprint
- * @author      Lonnie Ezell
- * @copyright   Copyright 2014-2015, New Myth Media, LLC (http://newmythmedia.com)
- * @license     http://opensource.org/licenses/MIT  (MIT)
- * @link        http://sprintphp.com
- * @since       Version 1.0
- */
+	 * Sprint
+	 *
+	 * A set of power tools to enhance the CodeIgniter framework and provide consistent workflow.
+	 *
+	 * Permission is hereby granted, free of charge, to any person obtaining a copy
+	 * of this software and associated documentation files (the "Software"), to deal
+	 * in the Software without restriction, including without limitation the rights
+	 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+	 * copies of the Software, and to permit persons to whom the Software is
+	 * furnished to do so, subject to the following conditions:
+	 *
+	 * The above copyright notice and this permission notice shall be included in
+	 * all copies or substantial portions of the Software.
+	 *
+	 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+	 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+	 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+	 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+	 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+	 * THE SOFTWARE.
+	 *
+	 * @package     Sprint
+	 * @author      Lonnie Ezell
+	 * @copyright   Copyright 2014-2015, New Myth Media, LLC (http://newmythmedia.com)
+	 * @license     http://opensource.org/licenses/MIT  (MIT)
+	 * @link        http://sprintphp.com
+	 * @since       Version 1.0
+	 */
 
 class 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/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);
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 }

myth/UIKits/BaseUIKit.php

Indentation +384 added lines, -384 removed lines

@@ -1,34 +1,34 @@ 
 <?php namespace Myth\UIKits;
 /**
- * Sprint
- *
- * A set of power tools to enhance the CodeIgniter framework and provide consistent workflow.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package     Sprint
- * @author      Lonnie Ezell
- * @copyright   Copyright 2014-2015, New Myth Media, LLC (http://newmythmedia.com)
- * @license     http://opensource.org/licenses/MIT  (MIT)
- * @link        http://sprintphp.com
- * @since       Version 1.0
- */
+	 * Sprint
+	 *
+	 * A set of power tools to enhance the CodeIgniter framework and provide consistent workflow.
+	 *
+	 * Permission is hereby granted, free of charge, to any person obtaining a copy
+	 * of this software and associated documentation files (the "Software"), to deal
+	 * in the Software without restriction, including without limitation the rights
+	 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+	 * copies of the Software, and to permit persons to whom the Software is
+	 * furnished to do so, subject to the following conditions:
+	 *
+	 * The above copyright notice and this permission notice shall be included in
+	 * all copies or substantial portions of the Software.
+	 *
+	 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+	 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+	 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+	 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+	 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+	 * THE SOFTWARE.
+	 *
+	 * @package     Sprint
+	 * @author      Lonnie Ezell
+	 * @copyright   Copyright 2014-2015, New Myth Media, LLC (http://newmythmedia.com)
+	 * @license     http://opensource.org/licenses/MIT  (MIT)
+	 * @link        http://sprintphp.com
+	 * @since       Version 1.0
+	 */
 
 /**
  * Class BaseUIKit
@@ -38,228 +38,228 @@ 
  */
 abstract class BaseUIKit {
 
-    /**
-     * Bucket for methods to control their current state between method calls.
-     * @var array
-     */
-    protected $states = [];
-
-    protected $name = '';
-
-    /**
-     * Attached to nav items that are considered active.
-     * @var string
-     */
-    protected $active_class = 'active';
-
-    //--------------------------------------------------------------------
-
-    public function name()
-    {
-        return $this->name;
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Grids
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a row wrapper of HTML. We would have simple returned the
-     * the class for it, but some frameworks use a completely different
-     * approach to rows and columns than the reference Bootstrap and Foundation.
-     *
-     * @param array $options
-     * @return mixed
-     */
-    abstract public function row($options=[], \Closure $c);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates the CSS for a column in a grid.
-     *
-     * The attribute array is made up of key/value pairs with the
-     * key being the size, and the value being the number of columns/offset
-     * in a 12-column grid.
-     *
-     * Note that we currently DO NOT support offset columns.
-     *
-     * Valid sizes - 's', 'm', 'l', 'xl', 's-offset', 'm-offset', 'l-offset', 'xl-offset'
-     *
-     * Please note that that sizes are different than in Bootstrap. For example, for a 'xs'
-     * column size in Bootstrap, you would use 's' here. 'sm' = 'm', etc.
-     *
-     * @param array $attributes
-     * @return mixed
-     */
-    abstract public function column($options=[], \Closure $c);
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Navigation
-    //--------------------------------------------------------------------
-
-    /**
-     * Generates the container code for a navbar, typically used along the
-     * top of a page.
-     *
-     * @param array    $options
-     * @param callable $c
-     * @return string
-     */
-    abstract public function navbar($options=[], \Closure $c);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Builds the HTML for the Title portion of the navbar. This typically
-     * includes the code for the hamburger menu on small resolutions.
-     *
-     * @param        $title
-     * @param string $url
-     * @return string
-     */
-    abstract public function navbarTitle($title, $url='#');
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a UL meant to pull to the right within the navbar.
-     *
-     * Available options:
-     *      'class'     - An additional class to add
-     *
-     * @param array    $options
-     * @param callable $c
-     * @return string
-     */
-    abstract public function navbarRight($options=[], \Closure $c);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a single list item for use within a nav section.
-     *
-     * @param       $title
-     * @param       $url
-     * @param array $options
-     * @return string
-     */
-    abstract public function navItem($title, $url, $options=[], $isActive=false);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Builds the shell of a Dropdown button for use within a nav area.
-     *
-     * @param          $title
-     * @param array    $options
-     * @param callable $c
-     */
-    abstract public function navDropdown($title,$options=[], \Closure $c);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a divider for use within a nav list.
-     *
-     * @return string
-     */
-    abstract public function navDivider();
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a list of nav items to function as breadcrumbs for a site.
-     *
-     * @param array    $options
-     * @param callable $c
-     * @return mixed
-     */
-    abstract public function breadcrumb($options=[], \Closure $c);
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Buttons
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a simple button.
-     *
-     * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
-     * $size can be 'default', 'small', 'xsmall', 'large'
-     *
-     * @param       $title
-     * @param string $style
-     * @param array $options
-     * @return mixed
-     */
-    abstract public function button($title, $style='default', $size='default', $options=[]);
-
-    /**
-     * Creates a simple link styled as a button.
-     *
-     * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
-     * $size can be 'default', 'small', 'xsmall', 'large'
-     *
-     * @param       $title
-     * @param string $url
-     * @param string $style
-     * @param array $options
-     * @return mixed
-     */
-    abstract public function buttonLink($title, $url='#', $style='default', $size='default', $options=[]);
-
-    /**
-     * Creates button groups wrapping HTML.
-     *
-     * @param          $options
-     * @param callable $c
-     * @return mixed
-     */
-    abstract public function buttonGroup($options, \Closure $c);
-
-    /**
-     * Creates the button bar wrapping HTML.
-     *
-     * @param          $options
-     * @param callable $c
-     * @return mixed
-     */
-    abstract public function buttonBar($options, \Closure $c);
-
-    /**
-     * Creates a button that also has a dropdown menu. Also called Split Buttons
-     * by some frameworks.
-     *
-     * @param        $title
-     * @param string $style
-     * @param string $size
-     * @param array  $options
-     * @param callable $c
-     * @return mixed
-     */
-    abstract public function buttonDropdown($title, $style='default', $size='default', $options=[], \Closure $c);
-
-    //--------------------------------------------------------------------
-    // Notices
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates an 'alert-box' style of notice grid.
-     *
-     * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
-     *
-     * @param $content
-     * @param string $style
-     * @param bool $closable
-     * @return mixed
-     */
-    abstract public function notice($content, $style='success', $closable=true);
+	/**
+	 * Bucket for methods to control their current state between method calls.
+	 * @var array
+	 */
+	protected $states = [];
+
+	protected $name = '';
+
+	/**
+	 * Attached to nav items that are considered active.
+	 * @var string
+	 */
+	protected $active_class = 'active';
+
+	//--------------------------------------------------------------------
+
+	public function name()
+	{
+		return $this->name;
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Grids
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a row wrapper of HTML. We would have simple returned the
+	 * the class for it, but some frameworks use a completely different
+	 * approach to rows and columns than the reference Bootstrap and Foundation.
+	 *
+	 * @param array $options
+	 * @return mixed
+	 */
+	abstract public function row($options=[], \Closure $c);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates the CSS for a column in a grid.
+	 *
+	 * The attribute array is made up of key/value pairs with the
+	 * key being the size, and the value being the number of columns/offset
+	 * in a 12-column grid.
+	 *
+	 * Note that we currently DO NOT support offset columns.
+	 *
+	 * Valid sizes - 's', 'm', 'l', 'xl', 's-offset', 'm-offset', 'l-offset', 'xl-offset'
+	 *
+	 * Please note that that sizes are different than in Bootstrap. For example, for a 'xs'
+	 * column size in Bootstrap, you would use 's' here. 'sm' = 'm', etc.
+	 *
+	 * @param array $attributes
+	 * @return mixed
+	 */
+	abstract public function column($options=[], \Closure $c);
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Navigation
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates the container code for a navbar, typically used along the
+	 * top of a page.
+	 *
+	 * @param array    $options
+	 * @param callable $c
+	 * @return string
+	 */
+	abstract public function navbar($options=[], \Closure $c);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Builds the HTML for the Title portion of the navbar. This typically
+	 * includes the code for the hamburger menu on small resolutions.
+	 *
+	 * @param        $title
+	 * @param string $url
+	 * @return string
+	 */
+	abstract public function navbarTitle($title, $url='#');
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a UL meant to pull to the right within the navbar.
+	 *
+	 * Available options:
+	 *      'class'     - An additional class to add
+	 *
+	 * @param array    $options
+	 * @param callable $c
+	 * @return string
+	 */
+	abstract public function navbarRight($options=[], \Closure $c);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a single list item for use within a nav section.
+	 *
+	 * @param       $title
+	 * @param       $url
+	 * @param array $options
+	 * @return string
+	 */
+	abstract public function navItem($title, $url, $options=[], $isActive=false);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Builds the shell of a Dropdown button for use within a nav area.
+	 *
+	 * @param          $title
+	 * @param array    $options
+	 * @param callable $c
+	 */
+	abstract public function navDropdown($title,$options=[], \Closure $c);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a divider for use within a nav list.
+	 *
+	 * @return string
+	 */
+	abstract public function navDivider();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a list of nav items to function as breadcrumbs for a site.
+	 *
+	 * @param array    $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	abstract public function breadcrumb($options=[], \Closure $c);
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Buttons
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a simple button.
+	 *
+	 * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
+	 * $size can be 'default', 'small', 'xsmall', 'large'
+	 *
+	 * @param       $title
+	 * @param string $style
+	 * @param array $options
+	 * @return mixed
+	 */
+	abstract public function button($title, $style='default', $size='default', $options=[]);
+
+	/**
+	 * Creates a simple link styled as a button.
+	 *
+	 * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
+	 * $size can be 'default', 'small', 'xsmall', 'large'
+	 *
+	 * @param       $title
+	 * @param string $url
+	 * @param string $style
+	 * @param array $options
+	 * @return mixed
+	 */
+	abstract public function buttonLink($title, $url='#', $style='default', $size='default', $options=[]);
+
+	/**
+	 * Creates button groups wrapping HTML.
+	 *
+	 * @param          $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	abstract public function buttonGroup($options, \Closure $c);
+
+	/**
+	 * Creates the button bar wrapping HTML.
+	 *
+	 * @param          $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	abstract public function buttonBar($options, \Closure $c);
+
+	/**
+	 * Creates a button that also has a dropdown menu. Also called Split Buttons
+	 * by some frameworks.
+	 *
+	 * @param        $title
+	 * @param string $style
+	 * @param string $size
+	 * @param array  $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	abstract public function buttonDropdown($title, $style='default', $size='default', $options=[], \Closure $c);
+
+	//--------------------------------------------------------------------
+	// Notices
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates an 'alert-box' style of notice grid.
+	 *
+	 * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
+	 *
+	 * @param $content
+	 * @param string $style
+	 * @param bool $closable
+	 * @return mixed
+	 */
+	abstract public function notice($content, $style='success', $closable=true);
 
 	//--------------------------------------------------------------------
 	// Forms
@@ -278,137 +278,137 @@ 
 	 */
 	abstract public function inputWrap($label_text, $options=[], \Closure $c);
 
-    //--------------------------------------------------------------------
-    // Utility Methods
-    //--------------------------------------------------------------------
-
-    /**
-     * Helper method to run a Closure and collect the output of it.
-     *
-     * @param callable $c
-     * @return string
-     */
-    protected function runClosure(\Closure $c)
-    {
-        if (! is_callable($c)) return '';
-
-        ob_start();
-        $c();
-        $output = ob_get_contents();
-        ob_end_clean();
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Provides a single method call to get the $classes, $id, and $attributes
-     * from the options array.
-     *
-     * @param        $options
-     * @param string $initial_classes
-     * @param bool   $fullClassString
-     * @return array
-     */
-    protected function parseStandardOptions($options, $initial_classes='', $fullClassString=false)
-    {
-        return [
-            $this->buildClassString($initial_classes, $options, $fullClassString),
-            $this->buildIdFromOptions($options),
-            $this->buildAttributesFromOptions($options)
-        ];
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the element that is to be considered the active item. This is
-     * based on the navItem's $title so it must match, though it is NOT
-     * case sensitive.
-     *
-     * @param $title
-     * @return mixed
-     */
-    public function setActiveNavItem($title)
-    {
-        $this->states['activeNavItem'] = strtolower($title);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Combines an initial classes string with a 'class' item that
-     * might be available within the options array.
-     *
-     * If 'buildEntireString' is TRUE will return the string with the 'class=""' portion.
-     * Otherwise, just returns the raw classes.
-     *
-     * @param string $initial
-     * @param array $options
-     * @return array
-     */
-    protected function buildClassString($initial, $options, $buildEntireString=false)
-    {
-        $classes = explode(' ', $initial);
-
-        if (isset($options['class']))
-        {
-            $classes = array_merge($classes, explode(' ', $options['class']));
-        }
-
-        if (isset($this->states['activeNavItem']) && isset($this->states['activeNavTitle']) &&
-            $this->states['activeNavItem'] == strtolower($this->states['activeNavTitle']))
-        {
-            $classes[] = $this->active_class;
-        }
-
-        $classes = implode(' ', $classes);
-
-        // Substitute the active class for a placeholder.
-        $classes = str_replace('{active}', $this->active_class, $classes);
-
-        return $buildEntireString ? "class='{$classes}'" : $classes;
-    }
-    //--------------------------------------------------------------------
-
-    /**
-     * Checks the options array for an ID and returns the entire string.
-     *
-     * Example Return:
-     *      id='MyID'
-     *
-     * @param $options
-     * @return string
-     */
-    protected function buildIdFromOptions($options)
-    {
-        return isset($options['id']) ? "id='{$options['id']}'" : ' ';
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Parses out attributes from the options array. The attributes array
-     * should all contain no key names, only values, so:
-     *
-     * 'attributes' => [
-     *      'style="width:100%",
-     *      'required'
-     * ]
-     *
-     * @param $options
-     * @return string
-     */
-    protected function buildAttributesFromOptions($options)
-    {
-        if (isset($options['attributes']) && ! is_array($options['attributes']))
-        {
-            $options['attributes'] = [ $options['attributes'] ];
-        }
-
-        return isset($options['attributes']) ? implode($options['attributes']) : '';
-    }
-
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+	// Utility Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Helper method to run a Closure and collect the output of it.
+	 *
+	 * @param callable $c
+	 * @return string
+	 */
+	protected function runClosure(\Closure $c)
+	{
+		if (! is_callable($c)) return '';
+
+		ob_start();
+		$c();
+		$output = ob_get_contents();
+		ob_end_clean();
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Provides a single method call to get the $classes, $id, and $attributes
+	 * from the options array.
+	 *
+	 * @param        $options
+	 * @param string $initial_classes
+	 * @param bool   $fullClassString
+	 * @return array
+	 */
+	protected function parseStandardOptions($options, $initial_classes='', $fullClassString=false)
+	{
+		return [
+			$this->buildClassString($initial_classes, $options, $fullClassString),
+			$this->buildIdFromOptions($options),
+			$this->buildAttributesFromOptions($options)
+		];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the element that is to be considered the active item. This is
+	 * based on the navItem's $title so it must match, though it is NOT
+	 * case sensitive.
+	 *
+	 * @param $title
+	 * @return mixed
+	 */
+	public function setActiveNavItem($title)
+	{
+		$this->states['activeNavItem'] = strtolower($title);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Combines an initial classes string with a 'class' item that
+	 * might be available within the options array.
+	 *
+	 * If 'buildEntireString' is TRUE will return the string with the 'class=""' portion.
+	 * Otherwise, just returns the raw classes.
+	 *
+	 * @param string $initial
+	 * @param array $options
+	 * @return array
+	 */
+	protected function buildClassString($initial, $options, $buildEntireString=false)
+	{
+		$classes = explode(' ', $initial);
+
+		if (isset($options['class']))
+		{
+			$classes = array_merge($classes, explode(' ', $options['class']));
+		}
+
+		if (isset($this->states['activeNavItem']) && isset($this->states['activeNavTitle']) &&
+			$this->states['activeNavItem'] == strtolower($this->states['activeNavTitle']))
+		{
+			$classes[] = $this->active_class;
+		}
+
+		$classes = implode(' ', $classes);
+
+		// Substitute the active class for a placeholder.
+		$classes = str_replace('{active}', $this->active_class, $classes);
+
+		return $buildEntireString ? "class='{$classes}'" : $classes;
+	}
+	//--------------------------------------------------------------------
+
+	/**
+	 * Checks the options array for an ID and returns the entire string.
+	 *
+	 * Example Return:
+	 *      id='MyID'
+	 *
+	 * @param $options
+	 * @return string
+	 */
+	protected function buildIdFromOptions($options)
+	{
+		return isset($options['id']) ? "id='{$options['id']}'" : ' ';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Parses out attributes from the options array. The attributes array
+	 * should all contain no key names, only values, so:
+	 *
+	 * 'attributes' => [
+	 *      'style="width:100%",
+	 *      'required'
+	 * ]
+	 *
+	 * @param $options
+	 * @return string
+	 */
+	protected function buildAttributesFromOptions($options)
+	{
+		if (isset($options['attributes']) && ! is_array($options['attributes']))
+		{
+			$options['attributes'] = [ $options['attributes'] ];
+		}
+
+		return isset($options['attributes']) ? implode($options['attributes']) : '';
+	}
+
+	//--------------------------------------------------------------------
 }

myth/UIKits/Bootstrap.php

Indentation +544 added lines, -544 removed lines

@@ -1,34 +1,34 @@ 
 <?php namespace Myth\UIKits;
 /**
- * Sprint
- *
- * A set of power tools to enhance the CodeIgniter framework and provide consistent workflow.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package     Sprint
- * @author      Lonnie Ezell
- * @copyright   Copyright 2014-2015, New Myth Media, LLC (http://newmythmedia.com)
- * @license     http://opensource.org/licenses/MIT  (MIT)
- * @link        http://sprintphp.com
- * @since       Version 1.0
- */
+	 * Sprint
+	 *
+	 * A set of power tools to enhance the CodeIgniter framework and provide consistent workflow.
+	 *
+	 * Permission is hereby granted, free of charge, to any person obtaining a copy
+	 * of this software and associated documentation files (the "Software"), to deal
+	 * in the Software without restriction, including without limitation the rights
+	 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+	 * copies of the Software, and to permit persons to whom the Software is
+	 * furnished to do so, subject to the following conditions:
+	 *
+	 * The above copyright notice and this permission notice shall be included in
+	 * all copies or substantial portions of the Software.
+	 *
+	 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+	 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+	 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+	 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+	 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+	 * THE SOFTWARE.
+	 *
+	 * @package     Sprint
+	 * @author      Lonnie Ezell
+	 * @copyright   Copyright 2014-2015, New Myth Media, LLC (http://newmythmedia.com)
+	 * @license     http://opensource.org/licenses/MIT  (MIT)
+	 * @link        http://sprintphp.com
+	 * @since       Version 1.0
+	 */
 
 /**
  * Class Bootstrap3UIKit
@@ -37,168 +37,168 @@ 
  */
 class Bootstrap extends BaseUIKit {
 
-    protected $name = 'Bootstrap3UIKit';
-
-    //--------------------------------------------------------------------
-    // Grid
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a row wrapper of HTML. We would have simple returned the
-     * the class for it, but some frameworks use a completely different
-     * approach to rows and columns than the reference Bootstrap and Foundation.
-     *
-     * @param array $options
-     * @return mixed
-     */
-    public function row($options=[], \Closure $c)
-    {
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'row', true);
-
-        $output = "<div {$classes} {$id} {$attributes}>\n";
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</div>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates the CSS for a column in a grid.
-     *
-     * The attribute array is made up of key/value pairs with the
-     * key being the size, and the value being the number of columns/offset
-     * in a 12-column grid.
-     *
-     * Note that we currently DO NOT support offset columns.
-     *
-     * Valid sizes - 's', 'm', 'l', 'xl', 's-offset', 'm-offset', 'l-offset', 'xl-offset'
-     *
-     * Please note that that sizes are different than in Bootstrap. For example, for a 'xs'
-     * column size in Bootstrap, you would use 's' here. 'sm' = 'm', etc.
-     *
-     * @param array $attributes
-     * @return mixed
-     */
-    public function column($options=[], \Closure $c)
-    {
-        // Build our classes
-        $classes = '';
-
-        foreach ($options['sizes'] as $size => $value)
-        {
-            switch ($size)
-            {
-                case 's':
-                    $classes .= ' col-xs-'. $value;
-                    break;
-                case 'm':
-                    $classes .= ' col-sm-'. $value;
-                    break;
-                case 'l':
-                    $classes .= ' col-md-'. $value;
-                    break;
-                case 'xl':
-                    $classes .= ' col-lg-'. $value;
-                    break;
-                case 's-offset':
-                    $classes .= ' col-xs-offset-'. $value;
-                    break;
-                case 'm-offset':
-                    $classes .= ' col-sm-offset-'. $value;
-                    break;
-                case 'l-offset':
-                    $classes .= ' col-md-offset-'. $value;
-                    break;
-                case 'xl-offset':
-                    $classes .= ' col-lg-offset-'. $value;
-                    break;
-            }
-        }
-
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, $classes, true);
-
-        $output = "<div {$classes} {$id} {$attributes}>\n";
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</div>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Navigation
-    //--------------------------------------------------------------------
-
-    /**
-     * Generates the container code for a navbar, typically used along the
-     * top of a page.
-     *
-     * @param array    $options
-     * @param callable $c
-     * @return string
-     */
-    public function navbar($options=[], \Closure $c)
-    {
-        $output = '';
-
-        /*
+	protected $name = 'Bootstrap3UIKit';
+
+	//--------------------------------------------------------------------
+	// Grid
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a row wrapper of HTML. We would have simple returned the
+	 * the class for it, but some frameworks use a completely different
+	 * approach to rows and columns than the reference Bootstrap and Foundation.
+	 *
+	 * @param array $options
+	 * @return mixed
+	 */
+	public function row($options=[], \Closure $c)
+	{
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'row', true);
+
+		$output = "<div {$classes} {$id} {$attributes}>\n";
+
+		$output .= $this->runClosure($c);
+
+		$output .= "</div>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates the CSS for a column in a grid.
+	 *
+	 * The attribute array is made up of key/value pairs with the
+	 * key being the size, and the value being the number of columns/offset
+	 * in a 12-column grid.
+	 *
+	 * Note that we currently DO NOT support offset columns.
+	 *
+	 * Valid sizes - 's', 'm', 'l', 'xl', 's-offset', 'm-offset', 'l-offset', 'xl-offset'
+	 *
+	 * Please note that that sizes are different than in Bootstrap. For example, for a 'xs'
+	 * column size in Bootstrap, you would use 's' here. 'sm' = 'm', etc.
+	 *
+	 * @param array $attributes
+	 * @return mixed
+	 */
+	public function column($options=[], \Closure $c)
+	{
+		// Build our classes
+		$classes = '';
+
+		foreach ($options['sizes'] as $size => $value)
+		{
+			switch ($size)
+			{
+				case 's':
+					$classes .= ' col-xs-'. $value;
+					break;
+				case 'm':
+					$classes .= ' col-sm-'. $value;
+					break;
+				case 'l':
+					$classes .= ' col-md-'. $value;
+					break;
+				case 'xl':
+					$classes .= ' col-lg-'. $value;
+					break;
+				case 's-offset':
+					$classes .= ' col-xs-offset-'. $value;
+					break;
+				case 'm-offset':
+					$classes .= ' col-sm-offset-'. $value;
+					break;
+				case 'l-offset':
+					$classes .= ' col-md-offset-'. $value;
+					break;
+				case 'xl-offset':
+					$classes .= ' col-lg-offset-'. $value;
+					break;
+			}
+		}
+
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, $classes, true);
+
+		$output = "<div {$classes} {$id} {$attributes}>\n";
+
+		$output .= $this->runClosure($c);
+
+		$output .= "</div>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Navigation
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates the container code for a navbar, typically used along the
+	 * top of a page.
+	 *
+	 * @param array    $options
+	 * @param callable $c
+	 * @return string
+	 */
+	public function navbar($options=[], \Closure $c)
+	{
+		$output = '';
+
+		/*
          * Open the navbar
          */
-        $classes = "navbar navbar-default ";
-
-        foreach ($options as $option)
-        {
-            switch ($option)
-            {
-                case 'sticky-top':
-                    $classes .= " navbar-static-top";
-                    break;
-                case 'fixed':
-                    $classes .= " navbar-fixed-top";
-                    break;
-                case 'inverse':
-                    $classes .= " navbar-inverse";
-            }
-        }
-
-        list($class, $id, $attributes) = $this->parseStandardOptions($options, $classes, true);
-
-        $output .= "<nav {$class} {$id} {$attributes} role='navigation'>
+		$classes = "navbar navbar-default ";
+
+		foreach ($options as $option)
+		{
+			switch ($option)
+			{
+				case 'sticky-top':
+					$classes .= " navbar-static-top";
+					break;
+				case 'fixed':
+					$classes .= " navbar-fixed-top";
+					break;
+				case 'inverse':
+					$classes .= " navbar-inverse";
+			}
+		}
+
+		list($class, $id, $attributes) = $this->parseStandardOptions($options, $classes, true);
+
+		$output .= "<nav {$class} {$id} {$attributes} role='navigation'>
   <div class='container-fluid'>\n";
 
-        /*
+		/*
          * Do any user content inside the bar
          */
-        $output .= $this->runClosure($c);
+		$output .= $this->runClosure($c);
 
-        /*
+		/*
          * Close out the navbar
          */
-        $output .= "</div></nav>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Builds the HTML for the Title portion of the navbar. This typically
-     * includes the code for the hamburger menu on small resolutions.
-     *
-     * @param        $title
-     * @param string $url
-     * @return string
-     */
-    public function navbarTitle($title, $url='#')
-    {
-        return '<div class="navbar-header">
+		$output .= "</div></nav>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Builds the HTML for the Title portion of the navbar. This typically
+	 * includes the code for the hamburger menu on small resolutions.
+	 *
+	 * @param        $title
+	 * @param string $url
+	 * @return string
+	 */
+	public function navbarTitle($title, $url='#')
+	{
+		return '<div class="navbar-header">
       <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">
         <span class="sr-only">Toggle navigation</span>
         <span class="icon-bar"></span>
@@ -207,396 +207,396 @@ 
       </button>
       <a class="navbar-brand" href="'. $url .'">'. $title .'</a>
     </div>';
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a UL meant to pull to the right within the navbar.
-     *
-     * Available options:
-     *      'class'     - An additional class to add
-     *
-     * @param array    $options
-     * @param callable $c
-     * @return string
-     */
-    public function navbarRight($options=[], \Closure $c)
-    {
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'nav navbar-nav navbar-right', true);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a UL meant to pull to the right within the navbar.
+	 *
+	 * Available options:
+	 *      'class'     - An additional class to add
+	 *
+	 * @param array    $options
+	 * @param callable $c
+	 * @return string
+	 */
+	public function navbarRight($options=[], \Closure $c)
+	{
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'nav navbar-nav navbar-right', true);
         
-        $output = "<ul {$classes} {$id} {$attributes}>\n";
+		$output = "<ul {$classes} {$id} {$attributes}>\n";
 
-        $output .= $this->runClosure($c);
+		$output .= $this->runClosure($c);
 
-        $output .= "</ul>\n";
+		$output .= "</ul>\n";
 
-        return $output;
-    }
+		return $output;
+	}
     
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    public function nav()
-    {
+	public function nav()
+	{
 
-    }
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 
-    /**
-     * Creates a single list item for use within a nav section.
-     *
-     * @param       $title
-     * @param       $url
-     * @param array $options
-     * @return string
-     */
-    public function navItem($title, $url='#', $options=[], $isActive=false)
-    {
-        $this->states['activeNavTitle'] = $title;
+	/**
+	 * Creates a single list item for use within a nav section.
+	 *
+	 * @param       $title
+	 * @param       $url
+	 * @param array $options
+	 * @return string
+	 */
+	public function navItem($title, $url='#', $options=[], $isActive=false)
+	{
+		$this->states['activeNavTitle'] = $title;
 
-        $class = $isActive ? $this->active_class : '';
+		$class = $isActive ? $this->active_class : '';
 
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, $class, true);
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, $class, true);
 
-        return "    <li {$classes} {$id} {$attributes}><a href='{$url}'>{$title}</a></li>\n";
-    }
+		return "    <li {$classes} {$id} {$attributes}><a href='{$url}'>{$title}</a></li>\n";
+	}
     
-    //--------------------------------------------------------------------
-
-    /**
-     * Builds the shell of a Dropdown button for use within a nav area.
-     *
-     * @param          $title
-     * @param array    $options
-     * @param callable $c
-     */
-    public function navDropdown($title,$options=[], \Closure $c)
-    {
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'dropdown', true);
-
-        $output = "\t<li {$classes} {$id} {$attributes}>
+	//--------------------------------------------------------------------
+
+	/**
+	 * Builds the shell of a Dropdown button for use within a nav area.
+	 *
+	 * @param          $title
+	 * @param array    $options
+	 * @param callable $c
+	 */
+	public function navDropdown($title,$options=[], \Closure $c)
+	{
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'dropdown', true);
+
+		$output = "\t<li {$classes} {$id} {$attributes}>
         <a href='#' class='dropdown-toggle' data-toggle='dropdown'>{$title} <span class='caret'></span></a>
         <ul class='dropdown-menu' role='menu'>\n";
 
-        $output .= $this->runClosure($c);
+		$output .= $this->runClosure($c);
+
+		$output .= "    </ul></li>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a divider for use within a nav list.
+	 *
+	 * @return string
+	 */
+	public function navDivider()
+	{
+		return "<li class=\"divider\"></li>\n";
+	}
 
-        $output .= "    </ul></li>\n";
+	//--------------------------------------------------------------------
 
-        return $output;
-    }
+	public function sideNav($options=[], \Closure $c)
+	{
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'nav nav-pills nav-stacked', true);
 
-    //--------------------------------------------------------------------
+		$output = "<ul {$classes} {$id} {$attributes}>\n";
 
-    /**
-     * Creates a divider for use within a nav list.
-     *
-     * @return string
-     */
-    public function navDivider()
-    {
-        return "<li class=\"divider\"></li>\n";
-    }
+		$output .= $this->runClosure($c);
 
-    //--------------------------------------------------------------------
+		$output .= "</ul>\n";
 
-    public function sideNav($options=[], \Closure $c)
-    {
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'nav nav-pills nav-stacked', true);
+		return $output;
+	}
 
-        $output = "<ul {$classes} {$id} {$attributes}>\n";
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</ul>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a list of nav items to function as breadcrumbs for a site.
-     *
-     * @param array    $options
-     * @param callable $c
-     * @return mixed
-     */
-    public function breadcrumb($options=[], \Closure $c)
-    {
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'breadcrumb', true);
-
-        $output = "<ol {$classes} {$id} {$attributes}>\n";
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</ol>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Tables
-    //--------------------------------------------------------------------
-
-    public function table()
-    {
-        return 'table';
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Buttons
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a simple button.
-     *
-     * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
-     * $size can be 'default', 'small', 'xsmall', 'large'
-     *
-     * @param       $title
-     * @param string $style
-     * @param array $options
-     * @return mixed
-     */
-    public function button($title, $style='default', $size='default', $options=[])
-    {
-        $tag= "<button type='button' {classes} {id} {attributes}>{$title}</button>";
-
-        return $this->renderButtonElement($title, $style, $size, $options, $tag);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a simple link styled as a button.
-     *
-     * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
-     * $size can be 'default', 'small', 'xsmall', 'large'
-     *
-     * @param       $title
-     * @param string $url
-     * @param string $style
-     * @param array $options
-     * @return mixed
-     */
-    public function buttonLink($title, $url='#', $style='default', $size='default', $options=[])
-    {
-        $tag = "<a href='{$url}' {classes} {id} {attributes} role='button'>{$title}</a>";
-
-        return $this->renderButtonElement($title, $style, $size, $options, $tag);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Helper method to render out our buttons in a DRY manner.
-     *
-     * @param $title
-     * @param $style
-     * @param $size
-     * @param $tag
-     */
-    protected function renderButtonElement($title, $style, $size, $options, $tag)
-    {
-        $valid_styles = ['default', 'primary', 'success', 'info', 'warning', 'danger'];
-        $valid_sizes  = ['default', 'small', 'xsmall', 'large'];
-
-        if (! in_array($style, $valid_styles))
-        {
-            $style = 'default';
-            $options['attributes'][] = 'data-error="Invalid Style passed to button method."';
-        }
-
-        $classes = 'btn ';
-
-        // Sizes
-        switch($size)
-        {
-            case 'small':
-                $classes .= 'btn-sm ';
-                break;
-            case 'xsmall':
-                $classes .= 'btn-xs ';
-                break;
-            case 'large':
-                $classes .= 'btn-lg ';
-                break;
-            default:
-                break;
-        }
-
-        // Styles
-        switch ($style)
-        {
-            case 'primary':
-                $classes .= 'btn-primary ';
-                break;
-            case 'success':
-                $classes .= 'btn-success ';
-                break;
-            case 'info':
-                $classes .= 'btn-info ';
-                break;
-            case 'warning':
-                $classes .= 'btn-warning ';
-                break;
-            case 'danger':
-                $classes .= 'btn-danger ';
-                break;
-            case 'default':
-                $classes .= 'btn-default ';
-                break;
-        }
-
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, $classes, true);
-
-        $tag = str_replace('{classes}', $classes, $tag);
-        $tag = str_replace('{id}', $id, $tag);
-        $tag = str_replace('{attributes}', $attributes, $tag);
-        $tag = str_replace('{title}', $title, $tag);
-
-        return $tag;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates button groups wrapping HTML.
-     *
-     * @param          $options
-     * @param callable $c
-     * @return mixed
-     */
-    public function buttonGroup($options, \Closure $c)
-    {
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'btn-group', true);
-
-        $output = "<div {$classes} {$id} {$attributes}>\n";
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</div>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates the button bar wrapping HTML.
-     *
-     * @param          $options
-     * @param callable $c
-     * @return mixed
-     */
-    public function buttonBar($options, \Closure $c)
-    {
-        $options['attributes'][] = 'role="toolbar"';
-
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'btn-toolbar', true);
-
-        $output = "<div {$classes} {$id} {$attributes}>\n";
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</div>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a button that also has a dropdown menu. Also called Split Buttons
-     * by some frameworks.
-     *
-     * @param        $title
-     * @param string $style
-     * @param string $size
-     * @param array  $options
-     * @param callable $c
-     * @return mixed
-     */
-    public function buttonDropdown($title, $style='default', $size='default', $options=[], \Closure $c)
-    {
-        $tag = "<button type='button' {classes} data-toggle='dropdown'>
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a list of nav items to function as breadcrumbs for a site.
+	 *
+	 * @param array    $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	public function breadcrumb($options=[], \Closure $c)
+	{
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'breadcrumb', true);
+
+		$output = "<ol {$classes} {$id} {$attributes}>\n";
+
+		$output .= $this->runClosure($c);
+
+		$output .= "</ol>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Tables
+	//--------------------------------------------------------------------
+
+	public function table()
+	{
+		return 'table';
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Buttons
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a simple button.
+	 *
+	 * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
+	 * $size can be 'default', 'small', 'xsmall', 'large'
+	 *
+	 * @param       $title
+	 * @param string $style
+	 * @param array $options
+	 * @return mixed
+	 */
+	public function button($title, $style='default', $size='default', $options=[])
+	{
+		$tag= "<button type='button' {classes} {id} {attributes}>{$title}</button>";
+
+		return $this->renderButtonElement($title, $style, $size, $options, $tag);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a simple link styled as a button.
+	 *
+	 * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
+	 * $size can be 'default', 'small', 'xsmall', 'large'
+	 *
+	 * @param       $title
+	 * @param string $url
+	 * @param string $style
+	 * @param array $options
+	 * @return mixed
+	 */
+	public function buttonLink($title, $url='#', $style='default', $size='default', $options=[])
+	{
+		$tag = "<a href='{$url}' {classes} {id} {attributes} role='button'>{$title}</a>";
+
+		return $this->renderButtonElement($title, $style, $size, $options, $tag);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Helper method to render out our buttons in a DRY manner.
+	 *
+	 * @param $title
+	 * @param $style
+	 * @param $size
+	 * @param $tag
+	 */
+	protected function renderButtonElement($title, $style, $size, $options, $tag)
+	{
+		$valid_styles = ['default', 'primary', 'success', 'info', 'warning', 'danger'];
+		$valid_sizes  = ['default', 'small', 'xsmall', 'large'];
+
+		if (! in_array($style, $valid_styles))
+		{
+			$style = 'default';
+			$options['attributes'][] = 'data-error="Invalid Style passed to button method."';
+		}
+
+		$classes = 'btn ';
+
+		// Sizes
+		switch($size)
+		{
+			case 'small':
+				$classes .= 'btn-sm ';
+				break;
+			case 'xsmall':
+				$classes .= 'btn-xs ';
+				break;
+			case 'large':
+				$classes .= 'btn-lg ';
+				break;
+			default:
+				break;
+		}
+
+		// Styles
+		switch ($style)
+		{
+			case 'primary':
+				$classes .= 'btn-primary ';
+				break;
+			case 'success':
+				$classes .= 'btn-success ';
+				break;
+			case 'info':
+				$classes .= 'btn-info ';
+				break;
+			case 'warning':
+				$classes .= 'btn-warning ';
+				break;
+			case 'danger':
+				$classes .= 'btn-danger ';
+				break;
+			case 'default':
+				$classes .= 'btn-default ';
+				break;
+		}
+
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, $classes, true);
+
+		$tag = str_replace('{classes}', $classes, $tag);
+		$tag = str_replace('{id}', $id, $tag);
+		$tag = str_replace('{attributes}', $attributes, $tag);
+		$tag = str_replace('{title}', $title, $tag);
+
+		return $tag;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates button groups wrapping HTML.
+	 *
+	 * @param          $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	public function buttonGroup($options, \Closure $c)
+	{
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'btn-group', true);
+
+		$output = "<div {$classes} {$id} {$attributes}>\n";
+
+		$output .= $this->runClosure($c);
+
+		$output .= "</div>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates the button bar wrapping HTML.
+	 *
+	 * @param          $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	public function buttonBar($options, \Closure $c)
+	{
+		$options['attributes'][] = 'role="toolbar"';
+
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'btn-toolbar', true);
+
+		$output = "<div {$classes} {$id} {$attributes}>\n";
+
+		$output .= $this->runClosure($c);
+
+		$output .= "</div>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a button that also has a dropdown menu. Also called Split Buttons
+	 * by some frameworks.
+	 *
+	 * @param        $title
+	 * @param string $style
+	 * @param string $size
+	 * @param array  $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	public function buttonDropdown($title, $style='default', $size='default', $options=[], \Closure $c)
+	{
+		$tag = "<button type='button' {classes} data-toggle='dropdown'>
     {title} <span class='caret'></span>
   </button>
   <ul class='dropdown-menu' role='menu'>";
 
-        $output = $this->renderButtonElement($title, $style, $size, $options, $tag);
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</ul>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Notices
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates an 'alert-box' style of notice grid.
-     *
-     * $style can be 'default', 'success', 'info', 'warning', 'danger'
-     *
-     * @param $content
-     * @param string $style
-     * @param bool $closable
-     * @return mixed
-     */
-    public function notice($content, $style='success', $closable=true, $options=[])
-    {
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'alert', false);
-
-        // Styles
-        switch ($style)
-        {
-            case 'success':
-                $classes .= ' alert-success ';
-                break;
-            case 'info':
-                $classes .= ' alert-info ';
-                break;
-            case 'warning':
-                $classes .= ' alert-warning ';
-                break;
-            case 'danger':
-                $classes .= ' alert-danger ';
-                break;
-            case 'default':
-                $classes .= ' text-muted ';
-                break;
-        }
-
-        $output = "<div class='{$classes}'>\n";
-
-        $output .= "\t$content\n";
-
-        if ($closable)
-        {
-            $output .= "\t<a href='#' class='close'>&times;</a>\n";
-        }
-
-        $output .= "</div>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
+		$output = $this->renderButtonElement($title, $style, $size, $options, $tag);
+
+		$output .= $this->runClosure($c);
+
+		$output .= "</ul>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Notices
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates an 'alert-box' style of notice grid.
+	 *
+	 * $style can be 'default', 'success', 'info', 'warning', 'danger'
+	 *
+	 * @param $content
+	 * @param string $style
+	 * @param bool $closable
+	 * @return mixed
+	 */
+	public function notice($content, $style='success', $closable=true, $options=[])
+	{
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'alert', false);
+
+		// Styles
+		switch ($style)
+		{
+			case 'success':
+				$classes .= ' alert-success ';
+				break;
+			case 'info':
+				$classes .= ' alert-info ';
+				break;
+			case 'warning':
+				$classes .= ' alert-warning ';
+				break;
+			case 'danger':
+				$classes .= ' alert-danger ';
+				break;
+			case 'default':
+				$classes .= ' text-muted ';
+				break;
+		}
+
+		$output = "<div class='{$classes}'>\n";
+
+		$output .= "\t$content\n";
+
+		if ($closable)
+		{
+			$output .= "\t<a href='#' class='close'>&times;</a>\n";
+		}
+
+		$output .= "</div>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
 
 	//--------------------------------------------------------------------
 	// Forms