ci-bonfire / Sprint

myth/Controllers/CLIController.php

Indentation +138 added lines, -138 removed lines

@@ -41,144 +41,144 @@
  */
 class CLIController extends \CI_Controller {
 
-    /**
-     * Holds short descriptions for the public functions in this class.
-     * Each 'key' in the array should match the function name.
-     *
-     * @var array
-     */
-    protected $descriptions = [];
-
-    /**
-     * Holds long descriptions for the public functions in this class.
-     * Each 'key' in the array should match the function name.
-     * @var array
-     */
-    protected $long_descriptions = [];
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Ensures that we are running on the CLI, and collects basic settings
-     * like collecting our command line arguments into a pretty array.
-     */
-    public function __construct()
-    {
-        parent::__construct();
-
-        // Restrict usage to the command line.
-        if (! is_cli() )
-        {
-            show_error( lang('cli_required') );
-        }
-
-        // Make sure the CLI library is loaded and ready.
+	/**
+	 * Holds short descriptions for the public functions in this class.
+	 * Each 'key' in the array should match the function name.
+	 *
+	 * @var array
+	 */
+	protected $descriptions = [];
+
+	/**
+	 * Holds long descriptions for the public functions in this class.
+	 * Each 'key' in the array should match the function name.
+	 * @var array
+	 */
+	protected $long_descriptions = [];
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Ensures that we are running on the CLI, and collects basic settings
+	 * like collecting our command line arguments into a pretty array.
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		// Restrict usage to the command line.
+		if (! is_cli() )
+		{
+			show_error( lang('cli_required') );
+		}
+
+		// Make sure the CLI library is loaded and ready.
 //        CLI::_init();
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * A default index method that all CLI Controllers can share. Will
-     * list all of the methods and their short descriptions, if available.
-     */
-    public function index()
-    {
-        CLI::new_line();
-        CLI::write( lang('cli.available_commands') );
-
-        $this->sayDescriptions($this->descriptions);
-
-        CLI::new_line();
-    }
-
-    //--------------------------------------------------------------------
-
-
-    /**
-     * Grabs the short description of a command, if it exists.
-     *
-     * @param null $method
-     */
-    public function describeMethod($method=null)
-    {
-        if (empty($this->descriptions[$method]))
-        {
-            return CLI::error( lang('cli.bad_description') );
-        }
-
-        CLI::write("\t{$this->descriptions[$method]}", 'yellow');
-    }
-
-    //--------------------------------------------------------------------
-
-    public function longDescribeMethod($method=null)
-    {
-        if (empty($this->long_descriptions[$method]))
-        {
-            return CLI::error( lang('cli.no_help') );
-        }
-
-        CLI::write("\t{$this->long_descriptions[$method]}", 'yellow');
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Private Methods
-    //--------------------------------------------------------------------
-
-    protected function sayDescriptions($descriptions)
-    {
-        $names      = array_keys($descriptions);
-        $syntaxes   = array_column($descriptions, 0);
-        $descs      = array_column($descriptions, 1);
-
-        // Pad each item to the same length
-        $names      = $this->padArray($names);
-        $syntaxes   = $this->padArray($syntaxes);
-
-        for ($i=0; $i < count($names); $i++)
-        {
-            $out = CLI::color($names[$i], 'yellow');
-
-            // The rest of the items stay default color.
-            if (isset($syntaxes[$i]))
-            {
-                $out .= $syntaxes[$i];
-            }
-
-            if (isset($descs[$i]))
-            {
-                $out .= CLI::wrap($descs[$i], 125, strlen($names[$i]) + strlen($syntaxes[$i]));
-            }
-
-            CLI::write($out);
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns a new array where all of the string elements have
-     * been padding with trailling spaces to be the same length.
-     *
-     * @param array $array
-     * @param int $extra // How many extra spaces to add at the end
-     * @return array
-     */
-    protected function padArray($array, $extra=2)
-    {
-        $max = max(array_map('strlen', $array)) + $extra;
-
-        foreach ($array as &$item)
-        {
-            $item = str_pad($item, $max);
-        }
-
-        return $array;
-    }
-
-    //--------------------------------------------------------------------
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * A default index method that all CLI Controllers can share. Will
+	 * list all of the methods and their short descriptions, if available.
+	 */
+	public function index()
+	{
+		CLI::new_line();
+		CLI::write( lang('cli.available_commands') );
+
+		$this->sayDescriptions($this->descriptions);
+
+		CLI::new_line();
+	}
+
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * Grabs the short description of a command, if it exists.
+	 *
+	 * @param null $method
+	 */
+	public function describeMethod($method=null)
+	{
+		if (empty($this->descriptions[$method]))
+		{
+			return CLI::error( lang('cli.bad_description') );
+		}
+
+		CLI::write("\t{$this->descriptions[$method]}", 'yellow');
+	}
+
+	//--------------------------------------------------------------------
+
+	public function longDescribeMethod($method=null)
+	{
+		if (empty($this->long_descriptions[$method]))
+		{
+			return CLI::error( lang('cli.no_help') );
+		}
+
+		CLI::write("\t{$this->long_descriptions[$method]}", 'yellow');
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Private Methods
+	//--------------------------------------------------------------------
+
+	protected function sayDescriptions($descriptions)
+	{
+		$names      = array_keys($descriptions);
+		$syntaxes   = array_column($descriptions, 0);
+		$descs      = array_column($descriptions, 1);
+
+		// Pad each item to the same length
+		$names      = $this->padArray($names);
+		$syntaxes   = $this->padArray($syntaxes);
+
+		for ($i=0; $i < count($names); $i++)
+		{
+			$out = CLI::color($names[$i], 'yellow');
+
+			// The rest of the items stay default color.
+			if (isset($syntaxes[$i]))
+			{
+				$out .= $syntaxes[$i];
+			}
+
+			if (isset($descs[$i]))
+			{
+				$out .= CLI::wrap($descs[$i], 125, strlen($names[$i]) + strlen($syntaxes[$i]));
+			}
+
+			CLI::write($out);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a new array where all of the string elements have
+	 * been padding with trailling spaces to be the same length.
+	 *
+	 * @param array $array
+	 * @param int $extra // How many extra spaces to add at the end
+	 * @return array
+	 */
+	protected function padArray($array, $extra=2)
+	{
+		$max = max(array_map('strlen', $array)) + $extra;
+
+		foreach ($array as &$item)
+		{
+			$item = str_pad($item, $max);
+		}
+
+		return $array;
+	}
+
+	//--------------------------------------------------------------------
 
 }

Spacing +9 added lines, -9 removed lines

@@ -67,9 +67,9 @@ 
         parent::__construct();
 
         // Restrict usage to the command line.
-        if (! is_cli() )
+        if ( ! is_cli())
         {
-            show_error( lang('cli_required') );
+            show_error(lang('cli_required'));
         }
 
         // Make sure the CLI library is loaded and ready.
@@ -85,7 +85,7 @@ 
     public function index()
     {
         CLI::new_line();
-        CLI::write( lang('cli.available_commands') );
+        CLI::write(lang('cli.available_commands'));
 
         $this->sayDescriptions($this->descriptions);
 
@@ -100,11 +100,11 @@ 
      *
      * @param null $method
      */
-    public function describeMethod($method=null)
+    public function describeMethod($method = null)
     {
         if (empty($this->descriptions[$method]))
         {
-            return CLI::error( lang('cli.bad_description') );
+            return CLI::error(lang('cli.bad_description'));
         }
 
         CLI::write("\t{$this->descriptions[$method]}", 'yellow');
@@ -112,11 +112,11 @@ 
 
     //--------------------------------------------------------------------
 
-    public function longDescribeMethod($method=null)
+    public function longDescribeMethod($method = null)
     {
         if (empty($this->long_descriptions[$method]))
         {
-            return CLI::error( lang('cli.no_help') );
+            return CLI::error(lang('cli.no_help'));
         }
 
         CLI::write("\t{$this->long_descriptions[$method]}", 'yellow');
@@ -138,7 +138,7 @@ 
         $names      = $this->padArray($names);
         $syntaxes   = $this->padArray($syntaxes);
 
-        for ($i=0; $i < count($names); $i++)
+        for ($i = 0; $i < count($names); $i++)
         {
             $out = CLI::color($names[$i], 'yellow');
 
@@ -167,7 +167,7 @@ 
      * @param int $extra // How many extra spaces to add at the end
      * @return array
      */
-    protected function padArray($array, $extra=2)
+    protected function padArray($array, $extra = 2)
     {
         $max = max(array_map('strlen', $array)) + $extra;
 

myth/Cron/CronManager.php

Indentation +252 added lines, -252 removed lines

@@ -34,257 +34,257 @@
 
 class CronManager {
 
-    protected static $tasks = [];
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Schedules a new task in the system.
-     *
-     * @param $alias
-     * @param $time_string
-     * @param callable|string $task
-     */
-    public static function schedule($alias, $time_string, $task)
-    {
-        // Valid Alias?
-        if (! is_string($alias) || empty($alias))
-        {
-            throw new \RuntimeException( lang('cron.bad_alias') );
-        }
-
-        // Valid TimeString?
-        if (! is_string($time_string) || empty($time_string))
-        {
-            throw new \RuntimeException( lang('cron.bad_timestring') );
-        }
-
-        // Valid Task?
-        if (! is_callable($task) && ! is_string($task))
-        {
-            throw new \RuntimeException( lang('cron.bad_task') . $alias);
-        }
-
-        static::$tasks[$alias] = new CronTask($time_string, $task);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Removes a single task from the system.
-     *
-     * @param $alias
-     */
-    public static function remove($alias)
-    {
-        if (empty(static::$tasks[$alias]))
-        {
-            return null;
-        }
-
-        unset(static::$tasks[$alias]);
-
-        return true;
-    }
-
-    //--------------------------------------------------------------------
-
-
-    /**
-     * Provides an array of all tasks in the system. The format will be
-     * like:
-     *      [
-     *          'alias' => [
-     *              'next_run'  => '123456789',
-     *              'prev_run'  => '123456789',
-     *              'task'  => mixed
-     *          ],
-     *          ...
-     *      ]
-     */
-    public static function listAll($current_time='now')
-    {
-        if (! count(static::$tasks))
-        {
-            return null;
-        }
-
-        $output = array();
-
-        foreach (static::$tasks as $alias => $task)
-        {
-            $output[$alias] = [
-                'next_run'  => $task->nextRunDate($current_time),
-                'prev_run'  => $task->previousRunDate($current_time),
-                'task'      => $task->task()
-            ];
-        }
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Gets the task object assigned to an alias.
-     *
-     * @param $alias
-     * @return null|CronTask object
-     */
-    public static function task($alias)
-    {
-        if (empty(static::$tasks[$alias]) )
-        {
-            return null;
-        }
-
-        return static::$tasks[$alias];
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns all tasks currently in the system.
-     *
-     * @return array
-     */
-    public static function tasks()
-    {
-        return count(static::$tasks) ? static::$tasks : null;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Runs all tasks scheduled to run right now.
-     *
-     * Can be limited to a single task by passing it's alias in the first param.
-     *
-     * Returns the output of all task runs as a single string. Perfect for
-     * emailing to users on completion
-     *
-     * @param null $alias
-     * @param bool $force_run
-     * @param string $current_time
-     * @return string
-     */
-    public static function run($alias=null, $force_run=false, $current_time='now')
-    {
-        $tasks = static::$tasks;
-
-        if (! empty($alias) && isset($tasks[$alias]))
-        {
-            $tasks = [$alias => $tasks[$alias] ];
-        }
-
-        $output = '';
-
-        $count = 0; // How many tasks have ran?
-
-        foreach ($tasks as $alias => $task)
-        {
-            if ($task->isDue($current_time) || $force_run === true)
-            {
-                $output .= sprintf( lang('cron.running_task'), $alias);
-
-                try {
-                    $result = self::runTask($alias);
-
-                    if (is_bool($result))
-                    {
-                        $output .= $result === true ? lang('done') ."\n" : lang('failed') ."\n";
-                    }
-                    else if (is_string($result))
-                    {
-                        $output .= sprintf( lang('cron.done_with_msg'), $result);
-                    }
-                }
-                catch (\Exception $e)
-                {
-                    $output .= "[Exception] ". $e->getMessage() ."\n";
-                }
-
-                $count++;
-            }
-            else
-            {
-                $output .= sprintf( lang('cron.not_scheduled_until'), $alias, $task->nextRunDate() );
-            }
-        }
-
-        if (! $count)
-        {
-            $output .= lang('cron.nothing_scheduled');
-        }
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Clears all tasks from the system
-     */
-    public static function reset()
-    {
-        static::$tasks = [];
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Protected Methods
-    //--------------------------------------------------------------------
-
-    /**
-     * Runs a single Task.
-     *
-     * NOTE: Tasks MUST return a true/false value only.
-     *
-     * @param $alias
-     * @return bool
-     */
-    protected static function runTask($alias)
-    {
-        $task = static::$tasks[$alias]->task();
-
-        $success = false;
-
-        // If it's a standard callable item,
-        // then run it.
-        if (is_callable($task))
-        {
-            $success = call_user_func($task);
-        }
-
-        // Otherwise, if it's a string it should be
-        // a library:method string so try to run it.
-        else if (is_string($task) && ! empty($task) && strpos($task, ':') !== false)
-        {
-            list($class, $method) = explode(':', $task);
-
-            // Let PHP try to autoload it through any available autoloaders
-            // (including Composer and user's custom autoloaders). If we
-            // don't find it, then assume it's a CI library that we can reach.
-            if (class_exists($class)) {
-                $class = new $class();
-            } else {
-                get_instance()->load->library($class);
-                $class =& get_instance()->$class;
-            }
-
-            if (! method_exists($class, $method)) {
-                log_message('error', "[CRON] Method not found: {$class}::{$method}");
-                return $success;
-            }
-
-            // Call the class with our parameters
-            $success = $class->{$method}();
-        }
-
-        return $success;
-    }
-
-    //--------------------------------------------------------------------
+	protected static $tasks = [];
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Schedules a new task in the system.
+	 *
+	 * @param $alias
+	 * @param $time_string
+	 * @param callable|string $task
+	 */
+	public static function schedule($alias, $time_string, $task)
+	{
+		// Valid Alias?
+		if (! is_string($alias) || empty($alias))
+		{
+			throw new \RuntimeException( lang('cron.bad_alias') );
+		}
+
+		// Valid TimeString?
+		if (! is_string($time_string) || empty($time_string))
+		{
+			throw new \RuntimeException( lang('cron.bad_timestring') );
+		}
+
+		// Valid Task?
+		if (! is_callable($task) && ! is_string($task))
+		{
+			throw new \RuntimeException( lang('cron.bad_task') . $alias);
+		}
+
+		static::$tasks[$alias] = new CronTask($time_string, $task);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Removes a single task from the system.
+	 *
+	 * @param $alias
+	 */
+	public static function remove($alias)
+	{
+		if (empty(static::$tasks[$alias]))
+		{
+			return null;
+		}
+
+		unset(static::$tasks[$alias]);
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * Provides an array of all tasks in the system. The format will be
+	 * like:
+	 *      [
+	 *          'alias' => [
+	 *              'next_run'  => '123456789',
+	 *              'prev_run'  => '123456789',
+	 *              'task'  => mixed
+	 *          ],
+	 *          ...
+	 *      ]
+	 */
+	public static function listAll($current_time='now')
+	{
+		if (! count(static::$tasks))
+		{
+			return null;
+		}
+
+		$output = array();
+
+		foreach (static::$tasks as $alias => $task)
+		{
+			$output[$alias] = [
+				'next_run'  => $task->nextRunDate($current_time),
+				'prev_run'  => $task->previousRunDate($current_time),
+				'task'      => $task->task()
+			];
+		}
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Gets the task object assigned to an alias.
+	 *
+	 * @param $alias
+	 * @return null|CronTask object
+	 */
+	public static function task($alias)
+	{
+		if (empty(static::$tasks[$alias]) )
+		{
+			return null;
+		}
+
+		return static::$tasks[$alias];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns all tasks currently in the system.
+	 *
+	 * @return array
+	 */
+	public static function tasks()
+	{
+		return count(static::$tasks) ? static::$tasks : null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Runs all tasks scheduled to run right now.
+	 *
+	 * Can be limited to a single task by passing it's alias in the first param.
+	 *
+	 * Returns the output of all task runs as a single string. Perfect for
+	 * emailing to users on completion
+	 *
+	 * @param null $alias
+	 * @param bool $force_run
+	 * @param string $current_time
+	 * @return string
+	 */
+	public static function run($alias=null, $force_run=false, $current_time='now')
+	{
+		$tasks = static::$tasks;
+
+		if (! empty($alias) && isset($tasks[$alias]))
+		{
+			$tasks = [$alias => $tasks[$alias] ];
+		}
+
+		$output = '';
+
+		$count = 0; // How many tasks have ran?
+
+		foreach ($tasks as $alias => $task)
+		{
+			if ($task->isDue($current_time) || $force_run === true)
+			{
+				$output .= sprintf( lang('cron.running_task'), $alias);
+
+				try {
+					$result = self::runTask($alias);
+
+					if (is_bool($result))
+					{
+						$output .= $result === true ? lang('done') ."\n" : lang('failed') ."\n";
+					}
+					else if (is_string($result))
+					{
+						$output .= sprintf( lang('cron.done_with_msg'), $result);
+					}
+				}
+				catch (\Exception $e)
+				{
+					$output .= "[Exception] ". $e->getMessage() ."\n";
+				}
+
+				$count++;
+			}
+			else
+			{
+				$output .= sprintf( lang('cron.not_scheduled_until'), $alias, $task->nextRunDate() );
+			}
+		}
+
+		if (! $count)
+		{
+			$output .= lang('cron.nothing_scheduled');
+		}
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Clears all tasks from the system
+	 */
+	public static function reset()
+	{
+		static::$tasks = [];
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Protected Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Runs a single Task.
+	 *
+	 * NOTE: Tasks MUST return a true/false value only.
+	 *
+	 * @param $alias
+	 * @return bool
+	 */
+	protected static function runTask($alias)
+	{
+		$task = static::$tasks[$alias]->task();
+
+		$success = false;
+
+		// If it's a standard callable item,
+		// then run it.
+		if (is_callable($task))
+		{
+			$success = call_user_func($task);
+		}
+
+		// Otherwise, if it's a string it should be
+		// a library:method string so try to run it.
+		else if (is_string($task) && ! empty($task) && strpos($task, ':') !== false)
+		{
+			list($class, $method) = explode(':', $task);
+
+			// Let PHP try to autoload it through any available autoloaders
+			// (including Composer and user's custom autoloaders). If we
+			// don't find it, then assume it's a CI library that we can reach.
+			if (class_exists($class)) {
+				$class = new $class();
+			} else {
+				get_instance()->load->library($class);
+				$class =& get_instance()->$class;
+			}
+
+			if (! method_exists($class, $method)) {
+				log_message('error', "[CRON] Method not found: {$class}::{$method}");
+				return $success;
+			}
+
+			// Call the class with our parameters
+			$success = $class->{$method}();
+		}
+
+		return $success;
+	}
+
+	//--------------------------------------------------------------------
 
 }

Spacing +20 added lines, -20 removed lines

@@ -48,21 +48,21 @@ 
     public static function schedule($alias, $time_string, $task)
     {
         // Valid Alias?
-        if (! is_string($alias) || empty($alias))
+        if ( ! is_string($alias) || empty($alias))
         {
-            throw new \RuntimeException( lang('cron.bad_alias') );
+            throw new \RuntimeException(lang('cron.bad_alias'));
         }
 
         // Valid TimeString?
-        if (! is_string($time_string) || empty($time_string))
+        if ( ! is_string($time_string) || empty($time_string))
         {
-            throw new \RuntimeException( lang('cron.bad_timestring') );
+            throw new \RuntimeException(lang('cron.bad_timestring'));
         }
 
         // Valid Task?
-        if (! is_callable($task) && ! is_string($task))
+        if ( ! is_callable($task) && ! is_string($task))
         {
-            throw new \RuntimeException( lang('cron.bad_task') . $alias);
+            throw new \RuntimeException(lang('cron.bad_task').$alias);
         }
 
         static::$tasks[$alias] = new CronTask($time_string, $task);
@@ -102,9 +102,9 @@ 
      *          ...
      *      ]
      */
-    public static function listAll($current_time='now')
+    public static function listAll($current_time = 'now')
     {
-        if (! count(static::$tasks))
+        if ( ! count(static::$tasks))
         {
             return null;
         }
@@ -133,7 +133,7 @@ 
      */
     public static function task($alias)
     {
-        if (empty(static::$tasks[$alias]) )
+        if (empty(static::$tasks[$alias]))
         {
             return null;
         }
@@ -168,13 +168,13 @@ 
      * @param string $current_time
      * @return string
      */
-    public static function run($alias=null, $force_run=false, $current_time='now')
+    public static function run($alias = null, $force_run = false, $current_time = 'now')
     {
         $tasks = static::$tasks;
 
-        if (! empty($alias) && isset($tasks[$alias]))
+        if ( ! empty($alias) && isset($tasks[$alias]))
         {
-            $tasks = [$alias => $tasks[$alias] ];
+            $tasks = [$alias => $tasks[$alias]];
         }
 
         $output = '';
@@ -185,34 +185,34 @@ 
         {
             if ($task->isDue($current_time) || $force_run === true)
             {
-                $output .= sprintf( lang('cron.running_task'), $alias);
+                $output .= sprintf(lang('cron.running_task'), $alias);
 
                 try {
                     $result = self::runTask($alias);
 
                     if (is_bool($result))
                     {
-                        $output .= $result === true ? lang('done') ."\n" : lang('failed') ."\n";
+                        $output .= $result === true ? lang('done')."\n" : lang('failed')."\n";
                     }
                     else if (is_string($result))
                     {
-                        $output .= sprintf( lang('cron.done_with_msg'), $result);
+                        $output .= sprintf(lang('cron.done_with_msg'), $result);
                     }
                 }
                 catch (\Exception $e)
                 {
-                    $output .= "[Exception] ". $e->getMessage() ."\n";
+                    $output .= "[Exception] ".$e->getMessage()."\n";
                 }
 
                 $count++;
             }
             else
             {
-                $output .= sprintf( lang('cron.not_scheduled_until'), $alias, $task->nextRunDate() );
+                $output .= sprintf(lang('cron.not_scheduled_until'), $alias, $task->nextRunDate());
             }
         }
 
-        if (! $count)
+        if ( ! $count)
         {
             $output .= lang('cron.nothing_scheduled');
         }
@@ -270,10 +270,10 @@ 
                 $class = new $class();
             } else {
                 get_instance()->load->library($class);
-                $class =& get_instance()->$class;
+                $class = & get_instance()->$class;
             }
 
-            if (! method_exists($class, $method)) {
+            if ( ! method_exists($class, $method)) {
                 log_message('error', "[CRON] Method not found: {$class}::{$method}");
                 return $success;
             }

Braces +3 added lines, -6 removed lines

@@ -193,20 +193,17 @@
                     if (is_bool($result))
                     {
                         $output .= $result === true ? lang('done') ."\n" : lang('failed') ."\n";
-                    }
-                    else if (is_string($result))
+                    } else if (is_string($result))
                     {
                         $output .= sprintf( lang('cron.done_with_msg'), $result);
                     }
-                }
-                catch (\Exception $e)
+                } catch (\Exception $e)
                 {
                     $output .= "[Exception] ". $e->getMessage() ."\n";
                 }
 
                 $count++;
-            }
-            else
+            } else
             {
                 $output .= sprintf( lang('cron.not_scheduled_until'), $alias, $task->nextRunDate() );
             }

myth/Cron/CronTask.php

Indentation +291 added lines, -291 removed lines

@@ -45,301 +45,301 @@
  */
 class CronTask {
 
-    /**
-     * The original scheduled string.
-     * Any valid relative time string.
-     * http://php.net/manual/en/datetime.formats.relative.php
-     *
-     * @var
-     */
-    protected $schedule;
-
-    /**
-     * Stores the callable or library name:method to run.
-     *
-     * @var
-     */
-    protected $task;
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Stores our scheduled string and actual task.
-     *
-     * @param $schedule
-     * @param callable $task
-     */
-    public function __construct($schedule, $task)
-    {
-        $this->schedule = $schedule;
-
-        // If $task is not callable, it should be a library:method
-        // string that we can parse. But it must have the colon in the string.
-        if (! is_callable($task) && strpos($task, ':') === false)
-        {
-            throw new \RuntimeException( lang('cron.invalid_task') );
-        }
-
-        $this->task = $task;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Calculates the next date this task is supposed to run.
-     *
-     * @param int|'now' $current_time
-     *
-     * @return timestamp|null
-     */
-    public function nextRunDate($current_time='now')
-    {
-        $current_time = is_numeric($current_time) ? (int)$current_time : strtotime($current_time);
-
-        $scheduleType = $this->determineScheduleType($this->schedule);
-
-        switch ($scheduleType)
-        {
-            case 'time':
-                return $this->findDateInterval($this->schedule, 'next', $current_time);
-                break;
-            case 'ordinal':
-                return strtotime($this->schedule, $current_time);
-                break;
-            case 'increment':
-                return strtotime($this->schedule, $current_time);
-                break;
-        }
-
-        return null;
-    }
+	/**
+	 * The original scheduled string.
+	 * Any valid relative time string.
+	 * http://php.net/manual/en/datetime.formats.relative.php
+	 *
+	 * @var
+	 */
+	protected $schedule;
+
+	/**
+	 * Stores the callable or library name:method to run.
+	 *
+	 * @var
+	 */
+	protected $task;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Stores our scheduled string and actual task.
+	 *
+	 * @param $schedule
+	 * @param callable $task
+	 */
+	public function __construct($schedule, $task)
+	{
+		$this->schedule = $schedule;
+
+		// If $task is not callable, it should be a library:method
+		// string that we can parse. But it must have the colon in the string.
+		if (! is_callable($task) && strpos($task, ':') === false)
+		{
+			throw new \RuntimeException( lang('cron.invalid_task') );
+		}
+
+		$this->task = $task;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Calculates the next date this task is supposed to run.
+	 *
+	 * @param int|'now' $current_time
+	 *
+	 * @return timestamp|null
+	 */
+	public function nextRunDate($current_time='now')
+	{
+		$current_time = is_numeric($current_time) ? (int)$current_time : strtotime($current_time);
+
+		$scheduleType = $this->determineScheduleType($this->schedule);
+
+		switch ($scheduleType)
+		{
+			case 'time':
+				return $this->findDateInterval($this->schedule, 'next', $current_time);
+				break;
+			case 'ordinal':
+				return strtotime($this->schedule, $current_time);
+				break;
+			case 'increment':
+				return strtotime($this->schedule, $current_time);
+				break;
+		}
+
+		return null;
+	}
     
-    //--------------------------------------------------------------------
-
-    /**
-     * Calculates the last time the task should have ran.
-     *
-     * @param int|'now' $current_time
-     *
-     * @return timestamp|null
-     */
-    public function previousRunDate($current_time='now')
-    {
-        $current_time = is_numeric($current_time) ? (int)$current_time : strtotime($current_time);
-
-        $scheduleType = $this->determineScheduleType($this->schedule);
-
-        switch ($scheduleType)
-        {
-            case 'time':
-                return $this->findDateInterval($this->schedule, 'prev', $current_time);
-                break;
-            case 'ordinal':
-                return $this->findPreviousOrdinal($this->schedule, $current_time);
-                break;
-            case 'increment':
-                return strtotime('-1 '. $this->schedule, $current_time);
-                break;
-        }
-
-        return null;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Determines if the task is due to be run now.
-     *
-     * @param string $current_time
-     * @internal param $ int|'now' $current_time
-     *
-     * @return bool
-     */
-    public function isDue($current_time='now')
-    {
-        $current_time = is_numeric($current_time) ? (int)$current_time : strtotime($current_time);
-
-        // For easier matching, and I can't imagine people needing cronjob
-        // accuracy to the seconds, we'll just take the current minute.
-        return date('Y-m-d H:i', $current_time) == date('Y-m-d H:i', $this->nextRunDate($current_time) );
-    }
+	//--------------------------------------------------------------------
+
+	/**
+	 * Calculates the last time the task should have ran.
+	 *
+	 * @param int|'now' $current_time
+	 *
+	 * @return timestamp|null
+	 */
+	public function previousRunDate($current_time='now')
+	{
+		$current_time = is_numeric($current_time) ? (int)$current_time : strtotime($current_time);
+
+		$scheduleType = $this->determineScheduleType($this->schedule);
+
+		switch ($scheduleType)
+		{
+			case 'time':
+				return $this->findDateInterval($this->schedule, 'prev', $current_time);
+				break;
+			case 'ordinal':
+				return $this->findPreviousOrdinal($this->schedule, $current_time);
+				break;
+			case 'increment':
+				return strtotime('-1 '. $this->schedule, $current_time);
+				break;
+		}
+
+		return null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines if the task is due to be run now.
+	 *
+	 * @param string $current_time
+	 * @internal param $ int|'now' $current_time
+	 *
+	 * @return bool
+	 */
+	public function isDue($current_time='now')
+	{
+		$current_time = is_numeric($current_time) ? (int)$current_time : strtotime($current_time);
+
+		// For easier matching, and I can't imagine people needing cronjob
+		// accuracy to the seconds, we'll just take the current minute.
+		return date('Y-m-d H:i', $current_time) == date('Y-m-d H:i', $this->nextRunDate($current_time) );
+	}
     
-    //--------------------------------------------------------------------
-
-    /**
-     * Formats the timestamp produced by nextRunDate and previousRunDate
-     * into any format available to date.
-     *
-     * @param $format_string
-     * @return bool|string
-     */
-    public function format($format_string)
-    {
-        return date($format_string, strtotime($this->schedule));
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Gets the associated task.
-     *
-     * return callable|string
-     */
-    public function task()
-    {
-        return $this->task;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Gets the original schedule string.
-     */
-    public function schedule()
-    {
-        return $this->schedule;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Checks the schedule text and determines how we have to treat
-     * the schedule when determining next and previous values.
-     *
-     * Potential Types are:
-     *
-     *  - increment         Can simply add a +x/-x to the front to get the value.
-     *  - time              Something like "every 5 minutes"
-     *  - ordinal           Like "first", "second", etc.
-     *
-     * @param $schedule
-     * @return null|string
-     */
-    public function determineScheduleType($schedule)
-    {
-        $incs = ['sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'sun', 'mon', 'tue',
-                'wed', 'thu', 'fri', 'sat', 'weekday', 'weekdays', 'midnight', 'noon'];
-        $bigger_incs = [ 'back of', 'front of', 'first day of', 'last day of'];
-        $ordinals = ['first', 'second', 'third', 'fourth', 'fifth', 'sixth', 'seventh', 'eighth', 'ninth', 'tenth', 'eleventh', 'twelfth'];
-        $schedule = trim( strtolower($schedule) );
-
-        $multiple_words = strpos($schedule, ' ');
-        $first_word = substr($schedule, 0, $multiple_words ? $multiple_words : strlen($schedule));
-
-        // Is the first character a number? Then it's a time
-        if ( is_numeric( $first_word ) )
-        {
-            return 'time';
-        }
-
-
-        // First, try the shorter increments. We do increments in
-        // two passes becuase this should be faster than the loop.
-        if (in_array($first_word, $incs))
-        {
-            return 'increment';
-        }
-
-        // But we have to loop before checking ordinals since
-        // ordinals may have same first word as these phrases.
-        foreach ($bigger_incs as $test)
-        {
-            if (strpos($schedule, $test) === 0)
-            {
-                return 'increment';
-            }
-        }
-
-        if (in_array($first_word, $ordinals))
-        {
-            return 'ordinal';
-        }
-
-        return null;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Determines the correct time for 'time' type intervals where
-     * the timestamp is expected to happen every 'x period', like
-     * 'every 5 minutes', every 3 days, etc.
-     *
-     * @param $schedule
-     * @param $type
-     * @return float|int|null
-     */
-    public function findDateInterval($schedule, $type, $current_time='now')
-    {
-        $current_time = is_numeric($current_time) ? (int)$current_time : strtotime($current_time);
+	//--------------------------------------------------------------------
+
+	/**
+	 * Formats the timestamp produced by nextRunDate and previousRunDate
+	 * into any format available to date.
+	 *
+	 * @param $format_string
+	 * @return bool|string
+	 */
+	public function format($format_string)
+	{
+		return date($format_string, strtotime($this->schedule));
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Gets the associated task.
+	 *
+	 * return callable|string
+	 */
+	public function task()
+	{
+		return $this->task;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Gets the original schedule string.
+	 */
+	public function schedule()
+	{
+		return $this->schedule;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Checks the schedule text and determines how we have to treat
+	 * the schedule when determining next and previous values.
+	 *
+	 * Potential Types are:
+	 *
+	 *  - increment         Can simply add a +x/-x to the front to get the value.
+	 *  - time              Something like "every 5 minutes"
+	 *  - ordinal           Like "first", "second", etc.
+	 *
+	 * @param $schedule
+	 * @return null|string
+	 */
+	public function determineScheduleType($schedule)
+	{
+		$incs = ['sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'sun', 'mon', 'tue',
+				'wed', 'thu', 'fri', 'sat', 'weekday', 'weekdays', 'midnight', 'noon'];
+		$bigger_incs = [ 'back of', 'front of', 'first day of', 'last day of'];
+		$ordinals = ['first', 'second', 'third', 'fourth', 'fifth', 'sixth', 'seventh', 'eighth', 'ninth', 'tenth', 'eleventh', 'twelfth'];
+		$schedule = trim( strtolower($schedule) );
+
+		$multiple_words = strpos($schedule, ' ');
+		$first_word = substr($schedule, 0, $multiple_words ? $multiple_words : strlen($schedule));
+
+		// Is the first character a number? Then it's a time
+		if ( is_numeric( $first_word ) )
+		{
+			return 'time';
+		}
+
+
+		// First, try the shorter increments. We do increments in
+		// two passes becuase this should be faster than the loop.
+		if (in_array($first_word, $incs))
+		{
+			return 'increment';
+		}
+
+		// But we have to loop before checking ordinals since
+		// ordinals may have same first word as these phrases.
+		foreach ($bigger_incs as $test)
+		{
+			if (strpos($schedule, $test) === 0)
+			{
+				return 'increment';
+			}
+		}
+
+		if (in_array($first_word, $ordinals))
+		{
+			return 'ordinal';
+		}
+
+		return null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines the correct time for 'time' type intervals where
+	 * the timestamp is expected to happen every 'x period', like
+	 * 'every 5 minutes', every 3 days, etc.
+	 *
+	 * @param $schedule
+	 * @param $type
+	 * @return float|int|null
+	 */
+	public function findDateInterval($schedule, $type, $current_time='now')
+	{
+		$current_time = is_numeric($current_time) ? (int)$current_time : strtotime($current_time);
 
 //        list($int, $period) = explode(' ', $schedule);
 
-        $diff = strtotime($schedule, $current_time) - $current_time;
-
-        $return = null;
-
-        switch ($type)
-        {
-            case 'next':
-                $next = floor($current_time / $diff) * $diff;
-
-                // Does next already match the current time?
-                if (date('Y-m-d H:i', $next) == date('Y-m-d H:i', $current_time))
-                {
-                    $return = $next;
-                }
-                else {
-                    $return = $next + $diff;
-                }
-                break;
-            case 'prev':
-                $next = ceil($current_time / $diff) * $diff;
-                $return = $next - $diff;
-                break;
-        }
-
-        if (is_numeric($return))
-        {
-            $return = (int)$return;
-        }
-
-        return $return;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Determines the timestamp of the previous ordinal-based time, like
-     * 'second Monday'.
-     *
-     * @param $schedule
-     * @param string $current_time
-     * @return int|null
-     */
-    public function findPreviousOrdinal($schedule, $current_time='now')
-    {
-        $current_time = is_numeric($current_time) ? (int)$current_time : strtotime($current_time);
-
-        if (empty($schedule)) return null;
-
-        // Loop through months in reverse, checking each one to
-        // see if the ordinal is in the past. If so - wer'e done.
-        foreach ([0, -1, -2, -3, -4, -5, -6, -7, -8, -9, -10, -11, -12] as $i)
-        {
-            $lastmonth = strtotime("last day of {$i} month", $current_time);
-
-            $test = strtotime($schedule, $lastmonth);
-
-            if ($test <= $current_time)
-            {
-                return $test;
-            }
-        }
-
-        return null;
-    }
-
-    //--------------------------------------------------------------------
+		$diff = strtotime($schedule, $current_time) - $current_time;
+
+		$return = null;
+
+		switch ($type)
+		{
+			case 'next':
+				$next = floor($current_time / $diff) * $diff;
+
+				// Does next already match the current time?
+				if (date('Y-m-d H:i', $next) == date('Y-m-d H:i', $current_time))
+				{
+					$return = $next;
+				}
+				else {
+					$return = $next + $diff;
+				}
+				break;
+			case 'prev':
+				$next = ceil($current_time / $diff) * $diff;
+				$return = $next - $diff;
+				break;
+		}
+
+		if (is_numeric($return))
+		{
+			$return = (int)$return;
+		}
+
+		return $return;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines the timestamp of the previous ordinal-based time, like
+	 * 'second Monday'.
+	 *
+	 * @param $schedule
+	 * @param string $current_time
+	 * @return int|null
+	 */
+	public function findPreviousOrdinal($schedule, $current_time='now')
+	{
+		$current_time = is_numeric($current_time) ? (int)$current_time : strtotime($current_time);
+
+		if (empty($schedule)) return null;
+
+		// Loop through months in reverse, checking each one to
+		// see if the ordinal is in the past. If so - wer'e done.
+		foreach ([0, -1, -2, -3, -4, -5, -6, -7, -8, -9, -10, -11, -12] as $i)
+		{
+			$lastmonth = strtotime("last day of {$i} month", $current_time);
+
+			$test = strtotime($schedule, $lastmonth);
+
+			if ($test <= $current_time)
+			{
+				return $test;
+			}
+		}
+
+		return null;
+	}
+
+	//--------------------------------------------------------------------
 
 }

Spacing +18 added lines, -18 removed lines

@@ -75,9 +75,9 @@ 
 
         // If $task is not callable, it should be a library:method
         // string that we can parse. But it must have the colon in the string.
-        if (! is_callable($task) && strpos($task, ':') === false)
+        if ( ! is_callable($task) && strpos($task, ':') === false)
         {
-            throw new \RuntimeException( lang('cron.invalid_task') );
+            throw new \RuntimeException(lang('cron.invalid_task'));
         }
 
         $this->task = $task;
@@ -92,9 +92,9 @@ 
      *
      * @return timestamp|null
      */
-    public function nextRunDate($current_time='now')
+    public function nextRunDate($current_time = 'now')
     {
-        $current_time = is_numeric($current_time) ? (int)$current_time : strtotime($current_time);
+        $current_time = is_numeric($current_time) ? (int) $current_time : strtotime($current_time);
 
         $scheduleType = $this->determineScheduleType($this->schedule);
 
@@ -123,9 +123,9 @@ 
      *
      * @return timestamp|null
      */
-    public function previousRunDate($current_time='now')
+    public function previousRunDate($current_time = 'now')
     {
-        $current_time = is_numeric($current_time) ? (int)$current_time : strtotime($current_time);
+        $current_time = is_numeric($current_time) ? (int) $current_time : strtotime($current_time);
 
         $scheduleType = $this->determineScheduleType($this->schedule);
 
@@ -138,7 +138,7 @@ 
                 return $this->findPreviousOrdinal($this->schedule, $current_time);
                 break;
             case 'increment':
-                return strtotime('-1 '. $this->schedule, $current_time);
+                return strtotime('-1 '.$this->schedule, $current_time);
                 break;
         }
 
@@ -155,13 +155,13 @@ 
      *
      * @return bool
      */
-    public function isDue($current_time='now')
+    public function isDue($current_time = 'now')
     {
-        $current_time = is_numeric($current_time) ? (int)$current_time : strtotime($current_time);
+        $current_time = is_numeric($current_time) ? (int) $current_time : strtotime($current_time);
 
         // For easier matching, and I can't imagine people needing cronjob
         // accuracy to the seconds, we'll just take the current minute.
-        return date('Y-m-d H:i', $current_time) == date('Y-m-d H:i', $this->nextRunDate($current_time) );
+        return date('Y-m-d H:i', $current_time) == date('Y-m-d H:i', $this->nextRunDate($current_time));
     }
     
     //--------------------------------------------------------------------
@@ -219,15 +219,15 @@ 
     {
         $incs = ['sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'sun', 'mon', 'tue',
                 'wed', 'thu', 'fri', 'sat', 'weekday', 'weekdays', 'midnight', 'noon'];
-        $bigger_incs = [ 'back of', 'front of', 'first day of', 'last day of'];
+        $bigger_incs = ['back of', 'front of', 'first day of', 'last day of'];
         $ordinals = ['first', 'second', 'third', 'fourth', 'fifth', 'sixth', 'seventh', 'eighth', 'ninth', 'tenth', 'eleventh', 'twelfth'];
-        $schedule = trim( strtolower($schedule) );
+        $schedule = trim(strtolower($schedule));
 
         $multiple_words = strpos($schedule, ' ');
         $first_word = substr($schedule, 0, $multiple_words ? $multiple_words : strlen($schedule));
 
         // Is the first character a number? Then it's a time
-        if ( is_numeric( $first_word ) )
+        if (is_numeric($first_word))
         {
             return 'time';
         }
@@ -269,9 +269,9 @@ 
      * @param $type
      * @return float|int|null
      */
-    public function findDateInterval($schedule, $type, $current_time='now')
+    public function findDateInterval($schedule, $type, $current_time = 'now')
     {
-        $current_time = is_numeric($current_time) ? (int)$current_time : strtotime($current_time);
+        $current_time = is_numeric($current_time) ? (int) $current_time : strtotime($current_time);
 
 //        list($int, $period) = explode(' ', $schedule);
 
@@ -301,7 +301,7 @@ 
 
         if (is_numeric($return))
         {
-            $return = (int)$return;
+            $return = (int) $return;
         }
 
         return $return;
@@ -317,9 +317,9 @@ 
      * @param string $current_time
      * @return int|null
      */
-    public function findPreviousOrdinal($schedule, $current_time='now')
+    public function findPreviousOrdinal($schedule, $current_time = 'now')
     {
-        $current_time = is_numeric($current_time) ? (int)$current_time : strtotime($current_time);
+        $current_time = is_numeric($current_time) ? (int) $current_time : strtotime($current_time);
 
         if (empty($schedule)) return null;
 

Braces +4 added lines, -3 removed lines

@@ -288,8 +288,7 @@ 
                 if (date('Y-m-d H:i', $next) == date('Y-m-d H:i', $current_time))
                 {
                     $return = $next;
-                }
-                else {
+                } else {
                     $return = $next + $diff;
                 }
                 break;
@@ -321,7 +320,9 @@ 
     {
         $current_time = is_numeric($current_time) ? (int)$current_time : strtotime($current_time);
 
-        if (empty($schedule)) return null;
+        if (empty($schedule)) {
+        	return null;
+        }
 
         // Loop through months in reverse, checking each one to
         // see if the ordinal is in the past. If so - wer'e done.

Doc Comments +5 added lines, -5 removed lines

@@ -66,7 +66,7 @@ 
     /**
      * Stores our scheduled string and actual task.
      *
-     * @param $schedule
+     * @param string $schedule
      * @param callable $task
      */
     public function __construct($schedule, $task)
@@ -90,7 +90,7 @@ 
      *
      * @param int|'now' $current_time
      *
-     * @return timestamp|null
+     * @return integer|null
      */
     public function nextRunDate($current_time='now')
     {
@@ -121,7 +121,7 @@ 
      *
      * @param int|'now' $current_time
      *
-     * @return timestamp|null
+     * @return integer|null
      */
     public function previousRunDate($current_time='now')
     {
@@ -266,8 +266,8 @@ 
      * 'every 5 minutes', every 3 days, etc.
      *
      * @param $schedule
-     * @param $type
-     * @return float|int|null
+     * @param string $type
+     * @return integer|null
      */
     public function findDateInterval($schedule, $type, $current_time='now')
     {

myth/Docs/DocBuilderInterface.php

Indentation +103 added lines, -103 removed lines

@@ -40,117 +40,117 @@
  */
 interface DocBuilderInterface
 {
-    /**
-     * 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);
+	/**
+	 * 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);
 
-    /**
-     * Parses the contents. Currently runs through the Markdown Extended
-     * parser to convert to HTML.
-     *
-     * @param $str
-     * @return mixed
-     */
-    public function parse($str);
+	/**
+	 * Parses the contents. Currently runs through the Markdown Extended
+	 * parser to convert to HTML.
+	 *
+	 * @param $str
+	 * @return mixed
+	 */
+	public function parse($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);
+	/**
+	 * 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);
 
-    /**
-     * Allows users to define the classes that are attached to
-     * generated tables.
-     *
-     * @param null $classes
-     * @return $this
-     */
-    public function setTableClasses($classes = null);
+	/**
+	 * Allows users to define the classes that are attached to
+	 * generated tables.
+	 *
+	 * @param null $classes
+	 * @return $this
+	 */
+	public function setTableClasses($classes = null);
 
-    /**
-     * 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);
+	/**
+	 * 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);
 
-    /**
-     * 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);
 
-    /**
-     * 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);
+	/**
+	 * 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);
 
-    /**
-     * Returns the current docFolders array.
-     *
-     * @return array
-     */
-    public function docFolders();
+	/**
+	 * Returns the current docFolders array.
+	 *
+	 * @return array
+	 */
+	public function docFolders();
 
-    /**
-     * 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);
+	/**
+	 * 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);
 
-    /**
-     * Removes a folder from the folders we scan for documentation files
-     * within.
-     *
-     * @param $name
-     * @return $this
-     */
-    public function removeDocFolder($name);
+	/**
+	 * Removes a folder from the folders we scan for documentation files
+	 * within.
+	 *
+	 * @param $name
+	 * @return $this
+	 */
+	public function removeDocFolder($name);
 }

myth/Docs/DocSearchInterface.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
      * @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);
+    public function registerFormatter($callback_name = '', $cascade = false);
 
     //--------------------------------------------------------------------
 

Indentation +30 added lines, -30 removed lines

@@ -32,40 +32,40 @@
 
 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/Docs/Search.php

Indentation +415 added lines, -415 removed lines

@@ -41,420 +41,420 @@
 class Search implements DocSearchInterface
 {
 
-    /**
-     * Minimum characters that can be submitted for a search.
-     *
-     * @var int
-     */
-    protected $min_chars = 3;
-
-    /**
-     * Maximum characters that can be submitted for a search.
-     *
-     * @var int
-     */
-    protected $max_chars = 30;
-
-    /**
-     * Valid file extensions we can search in.
-     *
-     * @var string
-     */
-    protected $allowed_file_types = 'html|htm|php|php4|php5|txt|md';
-
-    /**
-     * Which files should we skip over during our search?
-     *
-     * @var array
-     */
-    protected $skip_files = ['.', '..', '_404.md', '_toc.ini'];
-
-    /**
-     * How much of each file should we read.
-     * Use lower values for faster searches.
-     *
-     * @var int
-     */
-    protected $byte_size = 51200;
-
-    /**
-     * Number of words long (approximately)
-     * the result excerpt should be.
-     *
-     * @var int
-     */
-    protected $excerpt_length = 60;
-
-    /**
-     * The maximum number of results allowed from a single file.
-     *
-     * @var int
-     */
-    protected $max_per_file = 1;
-
-    protected $doc_folders = array();
-
-    protected $formatters = array();
-
-    //--------------------------------------------------------------------
-
-    /**
-     * 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 = [])
-    {
-        if (empty($terms) || empty($folders)) {
-            return null;
-        }
-
-        $results = [];
-        $this->doc_folders = $folders;
-
-        foreach ($folders as $group => $folder) {
-            $results = array_merge($results, $this->searchFolder($terms, $folder, $group));
-        }
-
-        return $results;
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Private Methods
-    //--------------------------------------------------------------------
-
-
-    /**
-     * Searches a single directory worth of files.
-     *
-     * @param $term
-     * @param $folder
-     * @param $group_name
-     *
-     * @return array The results.
-     */
-    protected function searchFolder($term, $folder, $group_name)
-    {
-        $results = [];
-
-        $map = $this->directory_map($folder, 2);
-
-        $map = $this->flattenMap($map);
-
-        // Make sure we have something to work with.
-        if (! is_array($map) || (is_array($map) && ! count($map))) {
-            return [];
-        }
-
-        // Loop over each file and search the contents for our term.
-        foreach ($map as $dir => $file) {
-            $file_count = 0;
-
-            if (in_array($file, $this->skip_files)) {
-                continue;
-            }
-
-            // Is it a folder?
-            if (is_array($file) && count($file)) {
-                $results = array_merge($results, $this->searchFolder($term, $folder . '/' . $dir, $group_name));
-                continue;
-            }
-
-            // Make sure it's the right file type...
-            if (! preg_match("/({$this->allowed_file_types})/i", $file)) {
-                continue;
-            }
-
-            $path = is_string($dir) ? $folder . '/' . $dir . '/' . $file : $folder . '/' . $file;
-            $term_html = htmlentities($term);
-
-            // Read in the file text
-            $handle = fopen($path, 'r');
-            $text = fread($handle, $this->byte_size);
-
-            // Do we have a match in here somewhere?
-            $found = stristr($text, $term) || stristr($text, $term_html);
-
-            if (! $found) {
-                continue;
-            }
-
-            // Escape our terms to safely use in a preg_match
-            $excerpt = strip_tags($text);
-            $term = preg_quote($term);
-            $term = str_replace("/", "\/", "{$term}");
-            $term_html = preg_quote($term_html);
-            $term_html = str_replace("/", "\/", "{$term_html}");
-
-            // Add the item to our results with extracts.
-            if (preg_match_all(
-                "/((\s\S*){0,3})($term|$term_html)((\s?\S*){0,3})/i",
-                $excerpt,
-                $matches,
-                PREG_OFFSET_CAPTURE | PREG_SET_ORDER
-            )) {
-                foreach ($matches as $match) {
-                    if ($file_count >= $this->max_per_file) {
-                        continue;
-                    }
-                    $result_url = '/docs/' . $group_name . '/' . str_replace('.md', '', $file);
-
-                    foreach ($this->doc_folders as $alias => $folder) {
-                        $result_url = str_replace($folder, $alias, $result_url);
-                    }
-
-                    $results[] = [
-                        'title' => $this->extractTitle($excerpt, $file),
-                        'file' => $folder . '/' . $file,
-                        'url' => $result_url,
-                        'extract' => $this->buildExtract($excerpt, $term, $match[0][0])
-                    ];
-
-                    $file_count++;
-                }
-            }
-        }
-
-        return $results;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * 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)
-    {
-        if (empty($callback_name)) return;
-
-        $this->formatters[] = array($callback_name => $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 = key($formatter);
-            $cascade = $formatter[$method];
-
-            $str = call_user_func($method, $str);
-
-            if (! $cascade) return $str;
-        }
-
-        return $str;
-    }
-
-    //--------------------------------------------------------------------
-
-
-    //--------------------------------------------------------------------
-    // Protected Methods
-    //--------------------------------------------------------------------
-
-    /**
-     * Converts an array generated by directory_map into a flat array of
-     * folders, removing any nested folders and adding them to the path.
-     *
-     * @param $map
-     * @param $prefix   Used to recursively add the folder name...
-     * @return mixed
-     */
-    protected function flattenMap($map, $prefix = '')
-    {
-        if (! is_array($map) || ! count($map)) {
-            return $map;
-        }
-
-        $return = [];
-
-        foreach ($map as $folder => $files) {
-
-            // If it's a folder name and an array of files
-            // then call this method recursively to flatten it out.
-            if (is_array($files)) {
-                $return = array_merge($return, $this->flattenMap($files, $prefix . $folder));
-                continue;
-            }
-
-            // Else, add our prefix (if any) to the filename...
-            $return[] = $prefix . $files;
-        }
-
-        return $return;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Handles extracting the text surrounding our match and basic match formatting.
-     *
-     * @param $excerpt
-     * @param $term
-     * @param $match_string
-     *
-     * @return string
-     */
-    protected function buildExtract($excerpt, $term, $match_string)
-    {
-        // Find the character positions within the string that our match was found at.
-        // That way we'll know from what positions before and after this we want to grab it in.
-        $start_offset = stripos($excerpt, $match_string);
-
-        // Modify the start and end positions based on $this->excerpt_length / 2.
-        $buffer = floor($this->excerpt_length / 2);
-
-        // Adjust our start position
-        $start_offset = $start_offset - $buffer;
-        if ($start_offset < 0) {
-            $start_offset = 0;
-        }
-
-        $extract = substr($excerpt, $start_offset);
-
-        $extract = strip_tags($this->format($extract));
-
-        $extract = $this->firstXWords($extract, $this->excerpt_length);
-
-        // Wrap the search term in a span we can style.
-        $extract = str_ireplace($term, '<span class="term-hilight">' . $term . '</span>', $extract);
-
-        return $extract;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Extracts the title from a bit of markdown formatted text. If it doesn't
-     * have an h1 or h2, then it uses the filename.
-     *
-     * @param $excerpt
-     * @param $file
-     * @return string
-     */
-    protected function extractTitle($excerpt, $file)
-    {
-        $title = '';
-
-        // Easiest to work if this is split into lines.
-        $lines = explode("\n", $excerpt);
-
-        if (is_array($lines) && count($lines)) {
-            foreach ($lines as $line) {
-                if (strpos($line, '# ') === 0 || strpos($line, '## ') === 0) {
-                    $title = trim(str_replace('#', '', $line));
-                    break;
-                }
-            }
-        }
-
-        // If it's empty, we'll use the filename.
-        if (empty($title)) {
-            $title = str_replace('_', ' ', $file);
-            $title = str_replace('.md', ' ', $title);
-            $title = ucwords($title);
-        }
-
-        return $title;
-    }
-    //--------------------------------------------------------------------
-
-    /**
-     * 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] = $this->directory_map($source_dir . $file, $new_depth, $hidden);
-                } else
-                {
-                    // Replace the directory separator here with a forward slash since
-                    // Windows uses backward slashes and not all browsers will auto-replace
-                    // those slashes in URLs.
-                    $filedata[] = str_replace(DIRECTORY_SEPARATOR, '/', $file);
-                }
-            }
-
-            closedir($fp);
-            return $filedata;
-        }
-
-        return FALSE;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Gets the first 'X' words of a string.
-     *
-     * @param $str
-     * @param int $wordCount
-     * @return string
-     */
-    protected function firstXWords($str, $wordCount = 10)
-    {
-        return implode(
-            '',
-            array_slice(
-                preg_split(
-                    '/([\s,\.;\?\!]+)/',
-                    $str,
-                    $wordCount * 2 + 1,
-                    PREG_SPLIT_DELIM_CAPTURE
-                ),
-                0,
-                $wordCount * 2 - 1
-            )
-        );
-    }
-
-    //--------------------------------------------------------------------
+	/**
+	 * Minimum characters that can be submitted for a search.
+	 *
+	 * @var int
+	 */
+	protected $min_chars = 3;
+
+	/**
+	 * Maximum characters that can be submitted for a search.
+	 *
+	 * @var int
+	 */
+	protected $max_chars = 30;
+
+	/**
+	 * Valid file extensions we can search in.
+	 *
+	 * @var string
+	 */
+	protected $allowed_file_types = 'html|htm|php|php4|php5|txt|md';
+
+	/**
+	 * Which files should we skip over during our search?
+	 *
+	 * @var array
+	 */
+	protected $skip_files = ['.', '..', '_404.md', '_toc.ini'];
+
+	/**
+	 * How much of each file should we read.
+	 * Use lower values for faster searches.
+	 *
+	 * @var int
+	 */
+	protected $byte_size = 51200;
+
+	/**
+	 * Number of words long (approximately)
+	 * the result excerpt should be.
+	 *
+	 * @var int
+	 */
+	protected $excerpt_length = 60;
+
+	/**
+	 * The maximum number of results allowed from a single file.
+	 *
+	 * @var int
+	 */
+	protected $max_per_file = 1;
+
+	protected $doc_folders = array();
+
+	protected $formatters = array();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * 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 = [])
+	{
+		if (empty($terms) || empty($folders)) {
+			return null;
+		}
+
+		$results = [];
+		$this->doc_folders = $folders;
+
+		foreach ($folders as $group => $folder) {
+			$results = array_merge($results, $this->searchFolder($terms, $folder, $group));
+		}
+
+		return $results;
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Private Methods
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * Searches a single directory worth of files.
+	 *
+	 * @param $term
+	 * @param $folder
+	 * @param $group_name
+	 *
+	 * @return array The results.
+	 */
+	protected function searchFolder($term, $folder, $group_name)
+	{
+		$results = [];
+
+		$map = $this->directory_map($folder, 2);
+
+		$map = $this->flattenMap($map);
+
+		// Make sure we have something to work with.
+		if (! is_array($map) || (is_array($map) && ! count($map))) {
+			return [];
+		}
+
+		// Loop over each file and search the contents for our term.
+		foreach ($map as $dir => $file) {
+			$file_count = 0;
+
+			if (in_array($file, $this->skip_files)) {
+				continue;
+			}
+
+			// Is it a folder?
+			if (is_array($file) && count($file)) {
+				$results = array_merge($results, $this->searchFolder($term, $folder . '/' . $dir, $group_name));
+				continue;
+			}
+
+			// Make sure it's the right file type...
+			if (! preg_match("/({$this->allowed_file_types})/i", $file)) {
+				continue;
+			}
+
+			$path = is_string($dir) ? $folder . '/' . $dir . '/' . $file : $folder . '/' . $file;
+			$term_html = htmlentities($term);
+
+			// Read in the file text
+			$handle = fopen($path, 'r');
+			$text = fread($handle, $this->byte_size);
+
+			// Do we have a match in here somewhere?
+			$found = stristr($text, $term) || stristr($text, $term_html);
+
+			if (! $found) {
+				continue;
+			}
+
+			// Escape our terms to safely use in a preg_match
+			$excerpt = strip_tags($text);
+			$term = preg_quote($term);
+			$term = str_replace("/", "\/", "{$term}");
+			$term_html = preg_quote($term_html);
+			$term_html = str_replace("/", "\/", "{$term_html}");
+
+			// Add the item to our results with extracts.
+			if (preg_match_all(
+				"/((\s\S*){0,3})($term|$term_html)((\s?\S*){0,3})/i",
+				$excerpt,
+				$matches,
+				PREG_OFFSET_CAPTURE | PREG_SET_ORDER
+			)) {
+				foreach ($matches as $match) {
+					if ($file_count >= $this->max_per_file) {
+						continue;
+					}
+					$result_url = '/docs/' . $group_name . '/' . str_replace('.md', '', $file);
+
+					foreach ($this->doc_folders as $alias => $folder) {
+						$result_url = str_replace($folder, $alias, $result_url);
+					}
+
+					$results[] = [
+						'title' => $this->extractTitle($excerpt, $file),
+						'file' => $folder . '/' . $file,
+						'url' => $result_url,
+						'extract' => $this->buildExtract($excerpt, $term, $match[0][0])
+					];
+
+					$file_count++;
+				}
+			}
+		}
+
+		return $results;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * 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)
+	{
+		if (empty($callback_name)) return;
+
+		$this->formatters[] = array($callback_name => $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 = key($formatter);
+			$cascade = $formatter[$method];
+
+			$str = call_user_func($method, $str);
+
+			if (! $cascade) return $str;
+		}
+
+		return $str;
+	}
+
+	//--------------------------------------------------------------------
+
+
+	//--------------------------------------------------------------------
+	// Protected Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Converts an array generated by directory_map into a flat array of
+	 * folders, removing any nested folders and adding them to the path.
+	 *
+	 * @param $map
+	 * @param $prefix   Used to recursively add the folder name...
+	 * @return mixed
+	 */
+	protected function flattenMap($map, $prefix = '')
+	{
+		if (! is_array($map) || ! count($map)) {
+			return $map;
+		}
+
+		$return = [];
+
+		foreach ($map as $folder => $files) {
+
+			// If it's a folder name and an array of files
+			// then call this method recursively to flatten it out.
+			if (is_array($files)) {
+				$return = array_merge($return, $this->flattenMap($files, $prefix . $folder));
+				continue;
+			}
+
+			// Else, add our prefix (if any) to the filename...
+			$return[] = $prefix . $files;
+		}
+
+		return $return;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Handles extracting the text surrounding our match and basic match formatting.
+	 *
+	 * @param $excerpt
+	 * @param $term
+	 * @param $match_string
+	 *
+	 * @return string
+	 */
+	protected function buildExtract($excerpt, $term, $match_string)
+	{
+		// Find the character positions within the string that our match was found at.
+		// That way we'll know from what positions before and after this we want to grab it in.
+		$start_offset = stripos($excerpt, $match_string);
+
+		// Modify the start and end positions based on $this->excerpt_length / 2.
+		$buffer = floor($this->excerpt_length / 2);
+
+		// Adjust our start position
+		$start_offset = $start_offset - $buffer;
+		if ($start_offset < 0) {
+			$start_offset = 0;
+		}
+
+		$extract = substr($excerpt, $start_offset);
+
+		$extract = strip_tags($this->format($extract));
+
+		$extract = $this->firstXWords($extract, $this->excerpt_length);
+
+		// Wrap the search term in a span we can style.
+		$extract = str_ireplace($term, '<span class="term-hilight">' . $term . '</span>', $extract);
+
+		return $extract;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Extracts the title from a bit of markdown formatted text. If it doesn't
+	 * have an h1 or h2, then it uses the filename.
+	 *
+	 * @param $excerpt
+	 * @param $file
+	 * @return string
+	 */
+	protected function extractTitle($excerpt, $file)
+	{
+		$title = '';
+
+		// Easiest to work if this is split into lines.
+		$lines = explode("\n", $excerpt);
+
+		if (is_array($lines) && count($lines)) {
+			foreach ($lines as $line) {
+				if (strpos($line, '# ') === 0 || strpos($line, '## ') === 0) {
+					$title = trim(str_replace('#', '', $line));
+					break;
+				}
+			}
+		}
+
+		// If it's empty, we'll use the filename.
+		if (empty($title)) {
+			$title = str_replace('_', ' ', $file);
+			$title = str_replace('.md', ' ', $title);
+			$title = ucwords($title);
+		}
+
+		return $title;
+	}
+	//--------------------------------------------------------------------
+
+	/**
+	 * 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] = $this->directory_map($source_dir . $file, $new_depth, $hidden);
+				} else
+				{
+					// Replace the directory separator here with a forward slash since
+					// Windows uses backward slashes and not all browsers will auto-replace
+					// those slashes in URLs.
+					$filedata[] = str_replace(DIRECTORY_SEPARATOR, '/', $file);
+				}
+			}
+
+			closedir($fp);
+			return $filedata;
+		}
+
+		return FALSE;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Gets the first 'X' words of a string.
+	 *
+	 * @param $str
+	 * @param int $wordCount
+	 * @return string
+	 */
+	protected function firstXWords($str, $wordCount = 10)
+	{
+		return implode(
+			'',
+			array_slice(
+				preg_split(
+					'/([\s,\.;\?\!]+)/',
+					$str,
+					$wordCount * 2 + 1,
+					PREG_SPLIT_DELIM_CAPTURE
+				),
+				0,
+				$wordCount * 2 - 1
+			)
+		);
+	}
+
+	//--------------------------------------------------------------------
 
 }

Spacing +17 added lines, -17 removed lines

@@ -147,7 +147,7 @@ 
         $map = $this->flattenMap($map);
 
         // Make sure we have something to work with.
-        if (! is_array($map) || (is_array($map) && ! count($map))) {
+        if ( ! is_array($map) || (is_array($map) && ! count($map))) {
             return [];
         }
 
@@ -161,16 +161,16 @@ 
 
             // Is it a folder?
             if (is_array($file) && count($file)) {
-                $results = array_merge($results, $this->searchFolder($term, $folder . '/' . $dir, $group_name));
+                $results = array_merge($results, $this->searchFolder($term, $folder.'/'.$dir, $group_name));
                 continue;
             }
 
             // Make sure it's the right file type...
-            if (! preg_match("/({$this->allowed_file_types})/i", $file)) {
+            if ( ! preg_match("/({$this->allowed_file_types})/i", $file)) {
                 continue;
             }
 
-            $path = is_string($dir) ? $folder . '/' . $dir . '/' . $file : $folder . '/' . $file;
+            $path = is_string($dir) ? $folder.'/'.$dir.'/'.$file : $folder.'/'.$file;
             $term_html = htmlentities($term);
 
             // Read in the file text
@@ -180,7 +180,7 @@ 
             // Do we have a match in here somewhere?
             $found = stristr($text, $term) || stristr($text, $term_html);
 
-            if (! $found) {
+            if ( ! $found) {
                 continue;
             }
 
@@ -202,7 +202,7 @@ 
                     if ($file_count >= $this->max_per_file) {
                         continue;
                     }
-                    $result_url = '/docs/' . $group_name . '/' . str_replace('.md', '', $file);
+                    $result_url = '/docs/'.$group_name.'/'.str_replace('.md', '', $file);
 
                     foreach ($this->doc_folders as $alias => $folder) {
                         $result_url = str_replace($folder, $alias, $result_url);
@@ -210,7 +210,7 @@ 
 
                     $results[] = [
                         'title' => $this->extractTitle($excerpt, $file),
-                        'file' => $folder . '/' . $file,
+                        'file' => $folder.'/'.$file,
                         'url' => $result_url,
                         'extract' => $this->buildExtract($excerpt, $term, $match[0][0])
                     ];
@@ -254,7 +254,7 @@ 
      */
     public function format($str)
     {
-        if (! is_array($this->formatters)) return $str;
+        if ( ! is_array($this->formatters)) return $str;
 
         foreach ($this->formatters as $formatter) {
             $method = key($formatter);
@@ -262,7 +262,7 @@ 
 
             $str = call_user_func($method, $str);
 
-            if (! $cascade) return $str;
+            if ( ! $cascade) return $str;
         }
 
         return $str;
@@ -285,7 +285,7 @@ 
      */
     protected function flattenMap($map, $prefix = '')
     {
-        if (! is_array($map) || ! count($map)) {
+        if ( ! is_array($map) || ! count($map)) {
             return $map;
         }
 
@@ -296,12 +296,12 @@ 
             // If it's a folder name and an array of files
             // then call this method recursively to flatten it out.
             if (is_array($files)) {
-                $return = array_merge($return, $this->flattenMap($files, $prefix . $folder));
+                $return = array_merge($return, $this->flattenMap($files, $prefix.$folder));
                 continue;
             }
 
             // Else, add our prefix (if any) to the filename...
-            $return[] = $prefix . $files;
+            $return[] = $prefix.$files;
         }
 
         return $return;
@@ -340,7 +340,7 @@ 
         $extract = $this->firstXWords($extract, $this->excerpt_length);
 
         // Wrap the search term in a span we can style.
-        $extract = str_ireplace($term, '<span class="term-hilight">' . $term . '</span>', $extract);
+        $extract = str_ireplace($term, '<span class="term-hilight">'.$term.'</span>', $extract);
 
         return $extract;
     }
@@ -400,7 +400,7 @@ 
         if ($fp = @opendir($source_dir)) {
             $filedata = array();
             $new_depth = $directory_depth - 1;
-            $source_dir = rtrim($source_dir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+            $source_dir = rtrim($source_dir, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
 
             while (FALSE !== ($file = readdir($fp))) {
                 // Remove '.', '..', and hidden files [optional]
@@ -408,11 +408,11 @@ 
                     continue;
                 }
 
-                is_dir($source_dir . $file) && $file .= DIRECTORY_SEPARATOR;
+                is_dir($source_dir.$file) && $file .= DIRECTORY_SEPARATOR;
 
-                if (($directory_depth < 1 OR $new_depth > 0) && is_dir($source_dir . $file))
+                if (($directory_depth < 1 OR $new_depth > 0) && is_dir($source_dir.$file))
                 {
-                    $filedata[$file] = $this->directory_map($source_dir . $file, $new_depth, $hidden);
+                    $filedata[$file] = $this->directory_map($source_dir.$file, $new_depth, $hidden);
                 } else
                 {
                     // Replace the directory separator here with a forward slash since

Braces +9 added lines, -3 removed lines

@@ -237,7 +237,9 @@ 
      */
     public function registerFormatter($callback_name = '', $cascade = false)
     {
-        if (empty($callback_name)) return;
+        if (empty($callback_name)) {
+        	return;
+        }
 
         $this->formatters[] = array($callback_name => $cascade);
 
@@ -254,7 +256,9 @@ 
      */
     public function format($str)
     {
-        if (! is_array($this->formatters)) return $str;
+        if (! is_array($this->formatters)) {
+        	return $str;
+        }
 
         foreach ($this->formatters as $formatter) {
             $method = key($formatter);
@@ -262,7 +266,9 @@ 
 
             $str = call_user_func($method, $str);
 
-            if (! $cascade) return $str;
+            if (! $cascade) {
+            	return $str;
+            }
         }
 
         return $str;

myth/Events/Events.php

Indentation +169 added lines, -169 removed lines

@@ -36,176 +36,176 @@
 
 class Events {
 
-    /**
-     * The list of listeners.
-     *
-     * @var array
-     */
-    protected static $listeners = [];
-
-    /**
-     * Flag to let us know if we've read from the config file
-     * and have all of the defined events.
-     *
-     * @var bool
-     */
-    protected static $have_read_from_file = false;
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Registers an action to happen on an event. The action can be any sort
-     * of callable:
-     *
-     *  Events::on('create', 'myFunction');               // procedural function
-     *  Events::on('create', ['myClass', 'myMethod']);    // Class::method
-     *  Events::on('create', [$myInstance, 'myMethod']);  // Method on an existing instance
-     *  Events::on('create', function() {});              // Closure
-     *
-     * @param $event_name
-     * @param callable $callback
-     * @param int $priority
-     */
-    public static function on($event_name, callable $callback, $priority=EVENTS_PRIORITY_NORMAL)
-    {
-        if (! isset(self::$listeners[$event_name]))
-        {
-            self::$listeners[$event_name] = [
-                true,   // If there's only 1 item, it's sorted.
-                [$priority],
-                [$callback]
-            ];
-        }
-        else
-        {
-            self::$listeners[$event_name][0] = false; // Not sorted
-            self::$listeners[$event_name][1][] = $priority;
-            self::$listeners[$event_name][2][] = $callback;
-        }
-    }
+	/**
+	 * The list of listeners.
+	 *
+	 * @var array
+	 */
+	protected static $listeners = [];
+
+	/**
+	 * Flag to let us know if we've read from the config file
+	 * and have all of the defined events.
+	 *
+	 * @var bool
+	 */
+	protected static $have_read_from_file = false;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Registers an action to happen on an event. The action can be any sort
+	 * of callable:
+	 *
+	 *  Events::on('create', 'myFunction');               // procedural function
+	 *  Events::on('create', ['myClass', 'myMethod']);    // Class::method
+	 *  Events::on('create', [$myInstance, 'myMethod']);  // Method on an existing instance
+	 *  Events::on('create', function() {});              // Closure
+	 *
+	 * @param $event_name
+	 * @param callable $callback
+	 * @param int $priority
+	 */
+	public static function on($event_name, callable $callback, $priority=EVENTS_PRIORITY_NORMAL)
+	{
+		if (! isset(self::$listeners[$event_name]))
+		{
+			self::$listeners[$event_name] = [
+				true,   // If there's only 1 item, it's sorted.
+				[$priority],
+				[$callback]
+			];
+		}
+		else
+		{
+			self::$listeners[$event_name][0] = false; // Not sorted
+			self::$listeners[$event_name][1][] = $priority;
+			self::$listeners[$event_name][2][] = $callback;
+		}
+	}
     
-    //--------------------------------------------------------------------
-
-    /**
-     * Runs through all subscribed methods running them one at a time,
-     * until either:
-     *  a) All subscribers have finished or
-     *  b) a method returns false, at which point execution of subscribers stops.
-     *
-     * @param $event_name
-     * @return bool
-     */
-    public static function trigger($event_name, array $arguments = [])
-    {
-        // Read in our config/events file so that we have them all!
-        if (! self::$have_read_from_file)
-        {
-            if (is_file(APPPATH .'config/events.php'))
-            {
-                include APPPATH .'config/events.php';
-            }
-            self::$have_read_from_file = true;
-        }
-
-        foreach (self::listeners($event_name) as $listener)
-        {
-            $result = call_user_func_array($listener, $arguments);
-
-            if ($result === false)
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
+	//--------------------------------------------------------------------
+
+	/**
+	 * Runs through all subscribed methods running them one at a time,
+	 * until either:
+	 *  a) All subscribers have finished or
+	 *  b) a method returns false, at which point execution of subscribers stops.
+	 *
+	 * @param $event_name
+	 * @return bool
+	 */
+	public static function trigger($event_name, array $arguments = [])
+	{
+		// Read in our config/events file so that we have them all!
+		if (! self::$have_read_from_file)
+		{
+			if (is_file(APPPATH .'config/events.php'))
+			{
+				include APPPATH .'config/events.php';
+			}
+			self::$have_read_from_file = true;
+		}
+
+		foreach (self::listeners($event_name) as $listener)
+		{
+			$result = call_user_func_array($listener, $arguments);
+
+			if ($result === false)
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
     
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns an array of listeners for a single event. They are
-     * sorted by priority.
-     *
-     * If the listener could not be found, returns FALSE, or TRUE if
-     * it was removed.
-     *
-     * @param $event_name
-     * @return array
-     */
-    public static function listeners($event_name)
-    {
-        if (! isset(self::$listeners[$event_name]))
-        {
-            return [];
-        }
-
-        // The list is not sorted
-        if (! self::$listeners[$event_name][0])
-        {
-            // Sort it!
-            array_multisort(self::$listeners[$event_name][1], SORT_NUMERIC, self::$listeners[$event_name][2]);
-
-            // Mark it as sorted already!
-            self::$listeners[$event_name][0] = true;
-        }
-
-        return self::$listeners[$event_name][2];
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Removes a single listener from an event.
-     *
-     * If the listener couldn't be found, returns FALSE, else TRUE if
-     * it was removed.
-     *
-     * @param $event_name
-     * @param callable $listener
-     * @return bool
-     */
-    public static function removeListener($event_name, callable $listener)
-    {
-        if (! isset(self::$listeners[$event_name]))
-        {
-            return false;
-        }
-
-        foreach (self::$listeners[$event_name][2] as $index => $check)
-        {
-            if ($check === $listener)
-            {
-                unset(self::$listeners[$event_name][1][$index]);
-                unset(self::$listeners[$event_name][2][$index]);
-
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Removes all listeners.
-     *
-     * If the event_name is specified, only listeners for that event will be
-     * removed, otherwise all listeners for all events are removed.
-     *
-     * @param null $event_name
-     */
-    public static function removeAllListeners($event_name=null)
-    {
-        if (! is_null($event_name))
-        {
-            unset(self::$listeners[$event_name]);
-        }
-        else {
-            self::$listeners = [];
-        }
-    }
-
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns an array of listeners for a single event. They are
+	 * sorted by priority.
+	 *
+	 * If the listener could not be found, returns FALSE, or TRUE if
+	 * it was removed.
+	 *
+	 * @param $event_name
+	 * @return array
+	 */
+	public static function listeners($event_name)
+	{
+		if (! isset(self::$listeners[$event_name]))
+		{
+			return [];
+		}
+
+		// The list is not sorted
+		if (! self::$listeners[$event_name][0])
+		{
+			// Sort it!
+			array_multisort(self::$listeners[$event_name][1], SORT_NUMERIC, self::$listeners[$event_name][2]);
+
+			// Mark it as sorted already!
+			self::$listeners[$event_name][0] = true;
+		}
+
+		return self::$listeners[$event_name][2];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Removes a single listener from an event.
+	 *
+	 * If the listener couldn't be found, returns FALSE, else TRUE if
+	 * it was removed.
+	 *
+	 * @param $event_name
+	 * @param callable $listener
+	 * @return bool
+	 */
+	public static function removeListener($event_name, callable $listener)
+	{
+		if (! isset(self::$listeners[$event_name]))
+		{
+			return false;
+		}
+
+		foreach (self::$listeners[$event_name][2] as $index => $check)
+		{
+			if ($check === $listener)
+			{
+				unset(self::$listeners[$event_name][1][$index]);
+				unset(self::$listeners[$event_name][2][$index]);
+
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Removes all listeners.
+	 *
+	 * If the event_name is specified, only listeners for that event will be
+	 * removed, otherwise all listeners for all events are removed.
+	 *
+	 * @param null $event_name
+	 */
+	public static function removeAllListeners($event_name=null)
+	{
+		if (! is_null($event_name))
+		{
+			unset(self::$listeners[$event_name]);
+		}
+		else {
+			self::$listeners = [];
+		}
+	}
+
+	//--------------------------------------------------------------------
 
 }

Spacing +11 added lines, -11 removed lines

@@ -66,12 +66,12 @@ 
      * @param callable $callback
      * @param int $priority
      */
-    public static function on($event_name, callable $callback, $priority=EVENTS_PRIORITY_NORMAL)
+    public static function on($event_name, callable $callback, $priority = EVENTS_PRIORITY_NORMAL)
     {
-        if (! isset(self::$listeners[$event_name]))
+        if ( ! isset(self::$listeners[$event_name]))
         {
             self::$listeners[$event_name] = [
-                true,   // If there's only 1 item, it's sorted.
+                true, // If there's only 1 item, it's sorted.
                 [$priority],
                 [$callback]
             ];
@@ -98,11 +98,11 @@ 
     public static function trigger($event_name, array $arguments = [])
     {
         // Read in our config/events file so that we have them all!
-        if (! self::$have_read_from_file)
+        if ( ! self::$have_read_from_file)
         {
-            if (is_file(APPPATH .'config/events.php'))
+            if (is_file(APPPATH.'config/events.php'))
             {
-                include APPPATH .'config/events.php';
+                include APPPATH.'config/events.php';
             }
             self::$have_read_from_file = true;
         }
@@ -134,13 +134,13 @@ 
      */
     public static function listeners($event_name)
     {
-        if (! isset(self::$listeners[$event_name]))
+        if ( ! isset(self::$listeners[$event_name]))
         {
             return [];
         }
 
         // The list is not sorted
-        if (! self::$listeners[$event_name][0])
+        if ( ! self::$listeners[$event_name][0])
         {
             // Sort it!
             array_multisort(self::$listeners[$event_name][1], SORT_NUMERIC, self::$listeners[$event_name][2]);
@@ -166,7 +166,7 @@ 
      */
     public static function removeListener($event_name, callable $listener)
     {
-        if (! isset(self::$listeners[$event_name]))
+        if ( ! isset(self::$listeners[$event_name]))
         {
             return false;
         }
@@ -195,9 +195,9 @@ 
      *
      * @param null $event_name
      */
-    public static function removeAllListeners($event_name=null)
+    public static function removeAllListeners($event_name = null)
     {
-        if (! is_null($event_name))
+        if ( ! is_null($event_name))
         {
             unset(self::$listeners[$event_name]);
         }

Braces +2 added lines, -4 removed lines

@@ -75,8 +75,7 @@ 
                 [$priority],
                 [$callback]
             ];
-        }
-        else
+        } else
         {
             self::$listeners[$event_name][0] = false; // Not sorted
             self::$listeners[$event_name][1][] = $priority;
@@ -200,8 +199,7 @@ 
         if (! is_null($event_name))
         {
             unset(self::$listeners[$event_name]);
-        }
-        else {
+        } else {
             self::$listeners = [];
         }
     }

myth/Forensics/Console.php

Indentation +5 added lines, -5 removed lines

@@ -167,11 +167,11 @@
 
 	public function reset()
 	{
-	    self::$logs = array(
-		    'console'		=> array(),
-		    'log_count'		=> 0,
-		    'memory_count'	=> 0,
-	    );
+		self::$logs = array(
+			'console'		=> array(),
+			'log_count'		=> 0,
+			'memory_count'	=> 0,
+		);
 	}
 
 	//--------------------------------------------------------------------

Spacing +6 added lines, -6 removed lines

@@ -92,7 +92,7 @@ 
 	*/
 	public static function init() 
 	{
-		self::$ci =& get_instance();
+		self::$ci = & get_instance();
 	}
 	
 	//--------------------------------------------------------------------
@@ -105,7 +105,7 @@ 
 		Parameters:
 			$data	- The variable to log.
 	*/
-	public static function log($data=null) 
+	public static function log($data = null) 
 	{
 		if ($data !== 0 && empty($data)) 
 		{ 
@@ -131,7 +131,7 @@ 
 			$object	- The object to store the memory usage of.
 			$name	- The name to be displayed in the console.
 	*/
-	public static function logMemory($object=false, $name='PHP')
+	public static function logMemory($object = false, $name = 'PHP')
 	{
 		$memory = memory_get_usage();
 		
@@ -182,15 +182,15 @@ 
 	// !PRIVATE METHODS
 	//--------------------------------------------------------------------
 	
-	protected static function addToConsole($log=null, $item=null)
+	protected static function addToConsole($log = null, $item = null)
 	{
 		if (empty($log) || empty($item)) 
 		{ 
 			return;
 		}
 		
-		self::$logs['console'][]	= $item;
-		self::$logs[$log] 			+= 1;
+		self::$logs['console'][] = $item;
+		self::$logs[$log] += 1;
 	}
 	
 	//--------------------------------------------------------------------

myth/Forensics/views/profiler_template.php

Spacing +2 added lines, -2 removed lines

@@ -196,7 +196,7 @@ 
 				Load Time
 			</a>
 			<a href="#" id="ci-profiler-menu-memory" onclick="ci_profiler_bar.show('ci-profiler-memory', 'ci-profiler-menu-memory'); return false;">
-				<span><?php echo (! function_exists('memory_get_usage')) ? '0' : round(memory_get_usage()/1024/1024, 2).' MB' ?></span>
+				<span><?php echo ( ! function_exists('memory_get_usage')) ? '0' : round(memory_get_usage() / 1024 / 1024, 2).' MB' ?></span>
 				Memory Used
 			</a>
 		<?php endif; ?>
@@ -384,7 +384,7 @@ 
 
 					<?php $append = ($section == 'get' || $section == 'post') ? '_data' : '' ?>
 					<a href="#" onclick="ci_profiler_bar.toggle_data_table('<?php echo $section ?>'); return false;">
-						<h2><?php echo lang('profiler_' . $section . $append) ?></h2>
+						<h2><?php echo lang('profiler_'.$section.$append) ?></h2>
 					</a>
 
 

Braces +35 added lines, -14 removed lines

@@ -257,9 +257,12 @@ 
 				<?php endforeach; ?>
 				</table>
 
-			<?php else : ?>
+			<?php else {
+	: ?>
 
-				<?php echo $sections['console']; ?>
+				<?php echo $sections['console'];
+}
+?>
 
 			<?php endif; ?>
 		</div>
@@ -288,9 +291,12 @@ 
 				<?php endforeach; ?>
 				</table>
 
-			<?php else : ?>
+			<?php else {
+	: ?>
 
-				<?php echo $sections['console']; ?>
+				<?php echo $sections['console'];
+}
+?>
 
 			<?php endif; ?>
 		</div>
@@ -309,9 +315,12 @@ 
 				<?php endforeach; ?>
 				</table>
 
-			<?php else : ?>
+			<?php else {
+	: ?>
 
-				<?php echo $sections['benchmarks']; ?>
+				<?php echo $sections['benchmarks'];
+}
+?>
 
 			<?php endif; ?>
 		</div>
@@ -332,9 +341,12 @@ 
 				<?php endforeach; ?>
 				</table>
 
-			<?php else : ?>
+			<?php else {
+	: ?>
 
-				<?php echo $sections['queries']; ?>
+				<?php echo $sections['queries'];
+}
+?>
 
 			<?php endif; ?>
 		</div>
@@ -394,8 +406,11 @@ 
 						<?php foreach ($sections[$section] as $key => $val) : ?>
 							<tr><td class="hilight"><?php echo $key ?></td><td><?php echo htmlspecialchars($val) ?></td></tr>
 						<?php endforeach; ?>
-						<?php else : ?>
-							<tr><td><?php echo $sections[$section]; ?></td></tr>
+						<?php else {
+	: ?>
+							<tr><td><?php echo $sections[$section];
+}
+?></td></tr>
 						<?php endif; ?>
 						</table>
 				<?php endif; ?>
@@ -422,19 +437,25 @@ 
 				<?php endforeach; ?>
 				</table>
 
-			<?php else : ?>
+			<?php else {
+	: ?>
 
-				<?php echo $sections['files']; ?>
+				<?php echo $sections['files'];
+}
+?>
 
 			<?php endif; ?>
 		</div>
 	<?php endif; ?>
 
 
-<?php else: ?>
+<?php else {
+	: ?>
 
 	<p class="ci-profiler-box"><?php echo lang('profiler_no_profiles') ?></p>
 
-<?php endif; ?>
+<?php endif;
+}
+?>
 
 </div>	<!-- /codeigniter_profiler -->