ci-bonfire / Sprint

myth/CIModules/auth/helpers/password_helper.php

Indentation +21 added lines, -21 removed lines

@@ -32,28 +32,28 @@
 
 if (! function_exists('isStrongPassword'))
 {
-    /**
-     * Works with Myth\Auth\Password to enforce a strong password.
-     * Uses settings from the auth config file.
-     *
-     * @param $password
-     */
-    function isStrongPassword($password)
-    {
-        $min_strength = config_item('auth.min_password_strength');
-        $use_dict = config_item('auth.use_dictionary');
+	/**
+	 * Works with Myth\Auth\Password to enforce a strong password.
+	 * Uses settings from the auth config file.
+	 *
+	 * @param $password
+	 */
+	function isStrongPassword($password)
+	{
+		$min_strength = config_item('auth.min_password_strength');
+		$use_dict = config_item('auth.use_dictionary');
 
-        $strong = \Myth\Auth\Password::isStrongPassword($password, $min_strength, $use_dict);
+		$strong = \Myth\Auth\Password::isStrongPassword($password, $min_strength, $use_dict);
 
-        if (! $strong)
-        {
-            if (isset(get_instance()->form_validation))
-            {
-                get_instance()->form_validation->set_message('isStrongPassword', lang('auth.pass_not_strong'));
-            }
-            return false;
-        }
+		if (! $strong)
+		{
+			if (isset(get_instance()->form_validation))
+			{
+				get_instance()->form_validation->set_message('isStrongPassword', lang('auth.pass_not_strong'));
+			}
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 }

myth/CIModules/cron/controllers/Cron.php

Indentation +304 added lines, -304 removed lines

@@ -37,325 +37,325 @@
 // todo Add ability to log actual cron jobs to database to verify when they ran for sure.
 class Cron extends \Myth\Controllers\CLIController {
 
-    protected $descriptions = [
-        'show'  => ['show [all/<task>]', 'Lists the names one or more tasks, with run times.'],
-        'run'   => ['run [<task>]', 'Runs all scheduled tasks. If <task> is present only runs that task.'],
-        'disable'   => ['disable', 'Disables the cron system and will not run any tasks.'],
-        'enable'    => ['enable', 'Enables the cron system and will run tasks again.'],
-        'suspend'   => ['suspend <task>', 'Stops a single task from running until resumed.'],
-        'resume'    => ['resume <task>', 'Resumes execution of a single suspended task.']
-    ];
-
-    protected $long_descriptions = [
-        'show'  => '',
-        'run'   => '',
-        'disable'   => '',
-        'enable'    => '',
-        'suspend'   => '',
-        'resume'    => ''
-    ];
-
-    //--------------------------------------------------------------------
-
-    public function __construct()
-    {
-        parent::__construct();
-
-        // Load our tasks into the sytem.
-        require APPPATH .'config/cron.php';
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Runs all of the tasks (after checking their time, of course...)
-     *
-     * @param string $alias
-     * @return mixed
-     */
-    public function run($alias=null)
-    {
-        // Has the system been disabled?
-        if (Settings::get('is_disabled', 'cron') == 'y')
-        {
-            return CLI::error('The cron system has been disabled. No tasks were run.');
-        }
-
-        $force_run = false;
-
-        // Run one task or all?
-        if (! empty($alias))
-        {
-            $tasks = \Myth\Cron\CronManager::task($alias);
-
-            if (is_null($tasks))
-            {
-                return CLI::error("Unable to find the task: '{$alias}'.");
-            }
-
-            $tasks = [ $alias => $tasks];
-            $force_run = true;
-        }
-        else
-        {
-            $tasks = \Myth\Cron\CronManager::tasks();
-        }
-
-        if (empty($tasks))
-        {
-            return CLI::write("There are no tasks to run at this time.");
-        }
-
-        // We need to be able to check against suspended tasks.
-        $suspended = Settings::get('suspended_tasks', 'cron');
-
-        if (! is_array($suspended))
-        {
-            $suspended = array($suspended);
-        }
-
-        // Loop over all of our tasks, checking them against the
-        // suspended tasks to see if they're okay to run.
-
-        // Collect the output of the actions so that we can make
-        // it available to the event (for sending emails and the like)
-        $output = '';
-
-        echo CLI::write('Starting Tasks...');
-
-        foreach ($tasks as $alias => $task)
-        {
-            if (in_array($alias, $suspended))
-            {
-                echo CLI::write("\t[Suspended] {$alias} will not run until resumed.", 'yellow');
-                $output .= "[Suspended] {$alias} will not run until resumed.";
-                continue;
-            }
-
-            echo CLI::write("\tRunning task: {$alias}...");
-            $output .= \Myth\Cron\CronManager::run($alias, $force_run);
-        }
-
-        // Give other people a chance to respond.
-        echo CLI::write('Done. Firing the event so others can play too...');
-
-        Events::trigger('afterCron', [$output]);
-
-        // And we're out of here boys and girls!
-        echo CLI::write('Done');
-    }
-
-    //--------------------------------------------------------------------
-
-
-    /**
-     * Lists one or more tasks with their scheduled run times.
-     *
-     * @param null $task
-     * @return mixed
-     */
-    public function show($task=null)
-    {
-        if (empty($task))
-        {
-            return $this->listTaskNames();
-        }
-
-        if (trim(strtolower($task)) == 'all')
-        {
-            $tasks = \Myth\Cron\CronManager::listAll();
-        }
-        else
-        {
-            $tasks = \Myth\Cron\CronManager::task($task);
-        }
-
-        if (! is_array($tasks))
-        {
-            $tasks = [ $task => [
-                'next_run'  => $tasks->nextRunDate(),
-                'prev_run'  => $tasks->previousRunDate()
-            ]];
-        }
-
-        if (! count($tasks))
-        {
-            return CLI::found('No tasks found.', 'red');
-        }
-
-        $suspended = Settings::get('suspended_tasks', 'cron');
-
-        if (empty($suspended))
-        {
-            $suspended = [];
-        }
-        /*
+	protected $descriptions = [
+		'show'  => ['show [all/<task>]', 'Lists the names one or more tasks, with run times.'],
+		'run'   => ['run [<task>]', 'Runs all scheduled tasks. If <task> is present only runs that task.'],
+		'disable'   => ['disable', 'Disables the cron system and will not run any tasks.'],
+		'enable'    => ['enable', 'Enables the cron system and will run tasks again.'],
+		'suspend'   => ['suspend <task>', 'Stops a single task from running until resumed.'],
+		'resume'    => ['resume <task>', 'Resumes execution of a single suspended task.']
+	];
+
+	protected $long_descriptions = [
+		'show'  => '',
+		'run'   => '',
+		'disable'   => '',
+		'enable'    => '',
+		'suspend'   => '',
+		'resume'    => ''
+	];
+
+	//--------------------------------------------------------------------
+
+	public function __construct()
+	{
+		parent::__construct();
+
+		// Load our tasks into the sytem.
+		require APPPATH .'config/cron.php';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Runs all of the tasks (after checking their time, of course...)
+	 *
+	 * @param string $alias
+	 * @return mixed
+	 */
+	public function run($alias=null)
+	{
+		// Has the system been disabled?
+		if (Settings::get('is_disabled', 'cron') == 'y')
+		{
+			return CLI::error('The cron system has been disabled. No tasks were run.');
+		}
+
+		$force_run = false;
+
+		// Run one task or all?
+		if (! empty($alias))
+		{
+			$tasks = \Myth\Cron\CronManager::task($alias);
+
+			if (is_null($tasks))
+			{
+				return CLI::error("Unable to find the task: '{$alias}'.");
+			}
+
+			$tasks = [ $alias => $tasks];
+			$force_run = true;
+		}
+		else
+		{
+			$tasks = \Myth\Cron\CronManager::tasks();
+		}
+
+		if (empty($tasks))
+		{
+			return CLI::write("There are no tasks to run at this time.");
+		}
+
+		// We need to be able to check against suspended tasks.
+		$suspended = Settings::get('suspended_tasks', 'cron');
+
+		if (! is_array($suspended))
+		{
+			$suspended = array($suspended);
+		}
+
+		// Loop over all of our tasks, checking them against the
+		// suspended tasks to see if they're okay to run.
+
+		// Collect the output of the actions so that we can make
+		// it available to the event (for sending emails and the like)
+		$output = '';
+
+		echo CLI::write('Starting Tasks...');
+
+		foreach ($tasks as $alias => $task)
+		{
+			if (in_array($alias, $suspended))
+			{
+				echo CLI::write("\t[Suspended] {$alias} will not run until resumed.", 'yellow');
+				$output .= "[Suspended] {$alias} will not run until resumed.";
+				continue;
+			}
+
+			echo CLI::write("\tRunning task: {$alias}...");
+			$output .= \Myth\Cron\CronManager::run($alias, $force_run);
+		}
+
+		// Give other people a chance to respond.
+		echo CLI::write('Done. Firing the event so others can play too...');
+
+		Events::trigger('afterCron', [$output]);
+
+		// And we're out of here boys and girls!
+		echo CLI::write('Done');
+	}
+
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * Lists one or more tasks with their scheduled run times.
+	 *
+	 * @param null $task
+	 * @return mixed
+	 */
+	public function show($task=null)
+	{
+		if (empty($task))
+		{
+			return $this->listTaskNames();
+		}
+
+		if (trim(strtolower($task)) == 'all')
+		{
+			$tasks = \Myth\Cron\CronManager::listAll();
+		}
+		else
+		{
+			$tasks = \Myth\Cron\CronManager::task($task);
+		}
+
+		if (! is_array($tasks))
+		{
+			$tasks = [ $task => [
+				'next_run'  => $tasks->nextRunDate(),
+				'prev_run'  => $tasks->previousRunDate()
+			]];
+		}
+
+		if (! count($tasks))
+		{
+			return CLI::found('No tasks found.', 'red');
+		}
+
+		$suspended = Settings::get('suspended_tasks', 'cron');
+
+		if (empty($suspended))
+		{
+			$suspended = [];
+		}
+		/*
          * Headers
          */
-        echo CLI::write("Task\t\t\t\tNext Run\t\tPrevious Run");
-        echo CLI::write( str_repeat('-', 80) );
-
-        foreach ($tasks as $alias => $task)
-        {
-            // Suspended?
-            $color = 'yellow';
-            $extra = '';
-
-            if (in_array($alias, $suspended) )
-            {
-                $color = 'blue';
-                $extra = "\t[Suspended]";
-            }
-
-            // Alias can only be 24 chars long.
-            $alias = strlen($alias) >= 32 ? substr($alias, 0, 28) .'... ' : $alias . str_repeat(" ", 32 - strlen($alias));
-
-            $next = date('D Y-m-d H:i', $task['next_run']);
-            $prev = date('D Y-m-d H:i', $task['prev_run']);
-
-            echo CLI::write("{$alias}{$next}\t{$prev}{$extra}", $color);
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Stops a task from being executed during the normal cron runs.
-     *
-     * @param $alias
-     */
-    public function suspend($alias)
-    {
-        // Verify the task actually exists.
-        $task = \Myth\Cron\CronManager::task($alias);
-
-        if (is_null($task))
-        {
-            return CLI::error("Unable to find the task: {$alias}.");
-        }
-
-        // Update the existing setting.
-        $suspended = Settings::get('suspended_tasks', 'cron');
-
-        if (empty($suspended))
-        {
-            $suspended = [];
-        }
-
-        $suspended[] = $alias;
-
-        if (Settings::save('suspended_tasks', $suspended, 'cron') )
-        {
-            return CLI::write('Done');
-        }
-
-        echo CLI::error('Unkown problem saving the settings.');
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Allows the execution of a suspended task to continue again
-     * during normal cron execution.
-     *
-     * @param $alias
-     */
-    public function resume($alias)
-    {
-        // Verify the task actually exists.
-        $task = \Myth\Cron\CronManager::task($alias);
-
-        if (is_null($task))
-        {
-            return CLI::error("Unable to find the task: {$alias}.");
-        }
-
-        // Update the existing setting.
-        $suspended = Settings::get('suspended_tasks', 'cron');
-
-        if (! empty($suspended))
-        {
-            unset($suspended[ array_search($alias, $suspended) ]);
-
-            if (! Settings::save('suspended_tasks', $suspended, 'cron') )
-            {
-                return CLI::error('Unkown problem saving the settings.');
-            }
-        }
-
-        return CLI::write('Done');
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Disables the cron tasks and stops the system from running any tasks.
-     * To start the system allowing it to run again, use the `enable` command.
-     */
-    public function disable()
-    {
-        if (! Settings::save('is_disabled', 'y', 'cron'))
-        {
-            return CLI::error('Unknown problem saving the setting. '. CLI::color('Cron jobs will still run!', 'yellow'));
-        }
-
-        CLI::write('Done');
-    }
+		echo CLI::write("Task\t\t\t\tNext Run\t\tPrevious Run");
+		echo CLI::write( str_repeat('-', 80) );
+
+		foreach ($tasks as $alias => $task)
+		{
+			// Suspended?
+			$color = 'yellow';
+			$extra = '';
+
+			if (in_array($alias, $suspended) )
+			{
+				$color = 'blue';
+				$extra = "\t[Suspended]";
+			}
+
+			// Alias can only be 24 chars long.
+			$alias = strlen($alias) >= 32 ? substr($alias, 0, 28) .'... ' : $alias . str_repeat(" ", 32 - strlen($alias));
+
+			$next = date('D Y-m-d H:i', $task['next_run']);
+			$prev = date('D Y-m-d H:i', $task['prev_run']);
+
+			echo CLI::write("{$alias}{$next}\t{$prev}{$extra}", $color);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Stops a task from being executed during the normal cron runs.
+	 *
+	 * @param $alias
+	 */
+	public function suspend($alias)
+	{
+		// Verify the task actually exists.
+		$task = \Myth\Cron\CronManager::task($alias);
+
+		if (is_null($task))
+		{
+			return CLI::error("Unable to find the task: {$alias}.");
+		}
+
+		// Update the existing setting.
+		$suspended = Settings::get('suspended_tasks', 'cron');
+
+		if (empty($suspended))
+		{
+			$suspended = [];
+		}
+
+		$suspended[] = $alias;
+
+		if (Settings::save('suspended_tasks', $suspended, 'cron') )
+		{
+			return CLI::write('Done');
+		}
+
+		echo CLI::error('Unkown problem saving the settings.');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Allows the execution of a suspended task to continue again
+	 * during normal cron execution.
+	 *
+	 * @param $alias
+	 */
+	public function resume($alias)
+	{
+		// Verify the task actually exists.
+		$task = \Myth\Cron\CronManager::task($alias);
+
+		if (is_null($task))
+		{
+			return CLI::error("Unable to find the task: {$alias}.");
+		}
+
+		// Update the existing setting.
+		$suspended = Settings::get('suspended_tasks', 'cron');
+
+		if (! empty($suspended))
+		{
+			unset($suspended[ array_search($alias, $suspended) ]);
+
+			if (! Settings::save('suspended_tasks', $suspended, 'cron') )
+			{
+				return CLI::error('Unkown problem saving the settings.');
+			}
+		}
+
+		return CLI::write('Done');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Disables the cron tasks and stops the system from running any tasks.
+	 * To start the system allowing it to run again, use the `enable` command.
+	 */
+	public function disable()
+	{
+		if (! Settings::save('is_disabled', 'y', 'cron'))
+		{
+			return CLI::error('Unknown problem saving the setting. '. CLI::color('Cron jobs will still run!', 'yellow'));
+		}
+
+		CLI::write('Done');
+	}
     
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Resumes the running of tasks after the system has been disabled
-     * with the `disable` command.
-     */
-    public function enable()
-    {
-        if (! Settings::save('is_disabled', 'n', 'cron'))
-        {
-            return CLI::error('Unknown problem saving the setting. '. CLI::color('Cron jobs will NOT run!', 'yellow'));
-        }
+	/**
+	 * Resumes the running of tasks after the system has been disabled
+	 * with the `disable` command.
+	 */
+	public function enable()
+	{
+		if (! Settings::save('is_disabled', 'n', 'cron'))
+		{
+			return CLI::error('Unknown problem saving the setting. '. CLI::color('Cron jobs will NOT run!', 'yellow'));
+		}
 
-        CLI::write('Done');
-    }
+		CLI::write('Done');
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 
-    //--------------------------------------------------------------------
-    // Private Methods
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+	// Private Methods
+	//--------------------------------------------------------------------
 
-    /**
-     * Lists out all available tasks, names only.
-     */
-    private function listTaskNames()
-    {
-        $suspended = Settings::get('suspended_tasks', 'cron');
+	/**
+	 * Lists out all available tasks, names only.
+	 */
+	private function listTaskNames()
+	{
+		$suspended = Settings::get('suspended_tasks', 'cron');
 
-        if (empty($suspended))
-        {
-            $suspended = [];
-        }
+		if (empty($suspended))
+		{
+			$suspended = [];
+		}
 
-        $tasks = \Myth\Cron\CronManager::listAll();
+		$tasks = \Myth\Cron\CronManager::listAll();
 
-        echo CLI::write("\nAvailable Tasks:");
+		echo CLI::write("\nAvailable Tasks:");
 
-        foreach ($tasks as $alias => $task)
-        {
-            $color = 'yellow';
-            $extra = '';
+		foreach ($tasks as $alias => $task)
+		{
+			$color = 'yellow';
+			$extra = '';
 
-            if (in_array($alias, $suspended) )
-            {
-                $color = 'blue';
-                $extra = "[Suspended]";
-            }
+			if (in_array($alias, $suspended) )
+			{
+				$color = 'blue';
+				$extra = "[Suspended]";
+			}
 
-            echo CLI::write("\t{$extra} {$alias}", $color);
-        }
-    }
+			echo CLI::write("\t{$extra} {$alias}", $color);
+		}
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 }

myth/CIModules/database/controllers/Database.php

Indentation +224 added lines, -224 removed lines

@@ -35,207 +35,207 @@ 
 class Database extends \Myth\Controllers\CLIController
 {
 
-    protected $descriptions = [
-        'migrate'       => ['migrate [$to]',        'Runs the migrations up or down until schema at version \$to'],
-        'quietMigrate'  => ['quiteMigrate [$to]',   'Same as migrate but without any feedback.'],
-        'refresh'       => ['refresh',              'Runs migrations back to version 0 (uninstall) and then back to the most recent migration.'],
-        'newMigration'  => ['newMigration [$name]', 'Creates a new migration file.'],
-        'seed'          => ['seed [$name]',         'Runs the named database seeder.']
-    ];
-
-    protected $long_descriptions = [
-        'migrate'       => '',
-        'quietMigrate'  => '',
-        'refresh'       => '',
-        'newMigration'  => '',
-        'seed'          => ''
-    ];
-
-    //-------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Migration Methods
-    //--------------------------------------------------------------------
-
-    /**
-     * Provides a command-line interface to the migration scripts.
-     * If no $to is provided, will migrate to the latest version.
-     *
-     * Example:
-     *      > php index.php database migrate
-     *
-     * @param string $type 'app', 'myth', 'all' or {module_name}
-     * @param null $to
-     * @param bool $silent If TRUE, will NOT display any prompts for verification.
-     * @return bool|void
-     */
-    public function migrate($type=null, $to = null, $silent = false)
-    {
-        $this->load->library('migration');
-
-        if (empty($type))
-        {
-            $type = CLI::prompt("Migration group to refresh?", $this->migration->default_migration_path());
-
-            if (empty($type))
-            {
-                return $silent ? false : CLI::error("\tYou must supply a group to refresh.");
-            }
-        }
-
-        // We need to append 'mod:' to properly handle modules, if
-        // the $type is not one of the recognized migration groups.
-        $this->config->load('migration');
-        $groups = config_item('migration_paths');
-        $groups = array_keys($groups);
-
-        // If it's not in the groups list, then assume it's a module.
-        if (! in_array($type, $groups))
-        {
-            if (strpos($type, 'mod:') !== 0)
-            {
-                $type = 'mod:'. $type;
-            }
-        }
-
-        unset($groups);
-
-        // Get our stats on the migrations
-        $latest = $this->migration->get_latest($type);
-        $latest = empty($latest) ? 0 : substr($latest, 0, strpos($latest, '_'));
-
-        if (empty($latest)) {
-            return CLI::write("\tNo migrations found.", 'yellow');
-        }
-
-        $current = $this->migration->get_version($type);
-
-        // Already at the desired version?
-        if ((! is_null($to) && $current == $to) OR (is_null($to) && $current == $latest))
-        {
-            return $silent ? true : CLI::write("\tDatabase is already at the desired version ({$current})", 'yellow');
-        }
-
-        $target = is_null($to) ? $latest : $to;
-
-        // Just to be safe, verify with the user they want to migrate
-        // to the latest version.
-        if (is_null($to)) {
-            // If we're in silent mode, don't prompt, just go to the latest...
-            if (! $silent) {
-                $go_ahead = CLI::prompt('Migrate to the latest available version?', array('y', 'n'));
-
-                if ($go_ahead == 'n') {
-                    return CLI::write('Bailing...', 'yellow');
-                }
-            }
-
-            if (! $this->migration->latest($type)) {
-                return CLI::error("\n\tERROR: " . $this->migration->error_string() . "\n");
-            }
-        } else {
-            if ($this->migration->version($type, $to) === false) {
-                return CLI::error("\n\tERROR: " . $this->migration->error_string() . "\n");
-            }
-        }
-
-        return $silent ? true :
-            CLI::write("\n\tSuccessfully migrated database from version {$current} to {$target}.\n", 'green');
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Performs a migration that does not prompt for any information.
-     * Suitable for use within automated scripts that can't be
-     * bothered with answering questions.
-     *
-     * @param string $type 'app', 'myth', 'all' or {module_name}
-     * @param null $to
-     * @return bool|void
-     */
-    public function quietMigrate($type='app', $to = null)
-    {
-        return $this->migrate($type, $to, true);
-    }
-
-    //--------------------------------------------------------------------
-
-
-    /**
-     * Migrates the database back to 0, then back up to the latest version.
-     *
-     * @param string $type  The group or module to refresh.
-     * @return mixed
-     */
-    public function refresh($type=null)
-    {
-        $this->load->library('migration');
-
-        if (empty($type))
-        {
-            $type = CLI::prompt("Migration group to refresh?", $this->migration->default_migration_path());
-
-            if (empty($type))
-            {
-                return CLI::error("\tYou must supply a group to refresh.");
-            }
-        }
-
-        if ($this->migration->version($type, 0) === false) {
-            return CLI::error("\tERROR: " . $this->migration->error_string());
-        }
-
-        CLI::write(CLI::color("\tCleared the database.", 'green'));
-
-        if ($this->migration->latest($type) === false) {
-            return CLI::error("\tERROR: " . $this->migration->error_string());
-        }
-
-        CLI::write("\tRe-installed the database to the latest migration.", 'green');
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a new migration file ready to be used.
-     *
-     * @param $name
-     */
-    public function newMigration($name = null, $type = 'app')
-    {
-        if (empty($name)) {
-            $name = CLI::prompt('Migration name? ');
-
-            if (empty($name)) {
-                return CLI::error("\tYou must provide a migration name.", 'red');
-            }
-        }
-
-        $this->load->library('migration');
-
-        $path = $this->migration->determine_migration_path($type);
-
-        // Does the alias path exist in our config?
-        if (! $path) {
-            return CLI::error("\tThe migration path for '{$type}' does not exist.'");
-        }
-
-        // Does the path really exist?
-        if (! is_dir($path)) {
-            return CLI::error("\tThe path for '{$type}' is not a directory.");
-        }
-
-        // Is the folder writeable?
-        if (! is_writeable($path)) {
-            return CLI::error("\tThe folder for '{$type}' migrations is not writeable.");
-        }
-
-        $file = $this->migration->make_name($name);
-
-        $path = rtrim($path, '/') .'/'. $file;
-
-        $contents = <<<EOT
+	protected $descriptions = [
+		'migrate'       => ['migrate [$to]',        'Runs the migrations up or down until schema at version \$to'],
+		'quietMigrate'  => ['quiteMigrate [$to]',   'Same as migrate but without any feedback.'],
+		'refresh'       => ['refresh',              'Runs migrations back to version 0 (uninstall) and then back to the most recent migration.'],
+		'newMigration'  => ['newMigration [$name]', 'Creates a new migration file.'],
+		'seed'          => ['seed [$name]',         'Runs the named database seeder.']
+	];
+
+	protected $long_descriptions = [
+		'migrate'       => '',
+		'quietMigrate'  => '',
+		'refresh'       => '',
+		'newMigration'  => '',
+		'seed'          => ''
+	];
+
+	//-------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Migration Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Provides a command-line interface to the migration scripts.
+	 * If no $to is provided, will migrate to the latest version.
+	 *
+	 * Example:
+	 *      > php index.php database migrate
+	 *
+	 * @param string $type 'app', 'myth', 'all' or {module_name}
+	 * @param null $to
+	 * @param bool $silent If TRUE, will NOT display any prompts for verification.
+	 * @return bool|void
+	 */
+	public function migrate($type=null, $to = null, $silent = false)
+	{
+		$this->load->library('migration');
+
+		if (empty($type))
+		{
+			$type = CLI::prompt("Migration group to refresh?", $this->migration->default_migration_path());
+
+			if (empty($type))
+			{
+				return $silent ? false : CLI::error("\tYou must supply a group to refresh.");
+			}
+		}
+
+		// We need to append 'mod:' to properly handle modules, if
+		// the $type is not one of the recognized migration groups.
+		$this->config->load('migration');
+		$groups = config_item('migration_paths');
+		$groups = array_keys($groups);
+
+		// If it's not in the groups list, then assume it's a module.
+		if (! in_array($type, $groups))
+		{
+			if (strpos($type, 'mod:') !== 0)
+			{
+				$type = 'mod:'. $type;
+			}
+		}
+
+		unset($groups);
+
+		// Get our stats on the migrations
+		$latest = $this->migration->get_latest($type);
+		$latest = empty($latest) ? 0 : substr($latest, 0, strpos($latest, '_'));
+
+		if (empty($latest)) {
+			return CLI::write("\tNo migrations found.", 'yellow');
+		}
+
+		$current = $this->migration->get_version($type);
+
+		// Already at the desired version?
+		if ((! is_null($to) && $current == $to) OR (is_null($to) && $current == $latest))
+		{
+			return $silent ? true : CLI::write("\tDatabase is already at the desired version ({$current})", 'yellow');
+		}
+
+		$target = is_null($to) ? $latest : $to;
+
+		// Just to be safe, verify with the user they want to migrate
+		// to the latest version.
+		if (is_null($to)) {
+			// If we're in silent mode, don't prompt, just go to the latest...
+			if (! $silent) {
+				$go_ahead = CLI::prompt('Migrate to the latest available version?', array('y', 'n'));
+
+				if ($go_ahead == 'n') {
+					return CLI::write('Bailing...', 'yellow');
+				}
+			}
+
+			if (! $this->migration->latest($type)) {
+				return CLI::error("\n\tERROR: " . $this->migration->error_string() . "\n");
+			}
+		} else {
+			if ($this->migration->version($type, $to) === false) {
+				return CLI::error("\n\tERROR: " . $this->migration->error_string() . "\n");
+			}
+		}
+
+		return $silent ? true :
+			CLI::write("\n\tSuccessfully migrated database from version {$current} to {$target}.\n", 'green');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Performs a migration that does not prompt for any information.
+	 * Suitable for use within automated scripts that can't be
+	 * bothered with answering questions.
+	 *
+	 * @param string $type 'app', 'myth', 'all' or {module_name}
+	 * @param null $to
+	 * @return bool|void
+	 */
+	public function quietMigrate($type='app', $to = null)
+	{
+		return $this->migrate($type, $to, true);
+	}
+
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * Migrates the database back to 0, then back up to the latest version.
+	 *
+	 * @param string $type  The group or module to refresh.
+	 * @return mixed
+	 */
+	public function refresh($type=null)
+	{
+		$this->load->library('migration');
+
+		if (empty($type))
+		{
+			$type = CLI::prompt("Migration group to refresh?", $this->migration->default_migration_path());
+
+			if (empty($type))
+			{
+				return CLI::error("\tYou must supply a group to refresh.");
+			}
+		}
+
+		if ($this->migration->version($type, 0) === false) {
+			return CLI::error("\tERROR: " . $this->migration->error_string());
+		}
+
+		CLI::write(CLI::color("\tCleared the database.", 'green'));
+
+		if ($this->migration->latest($type) === false) {
+			return CLI::error("\tERROR: " . $this->migration->error_string());
+		}
+
+		CLI::write("\tRe-installed the database to the latest migration.", 'green');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a new migration file ready to be used.
+	 *
+	 * @param $name
+	 */
+	public function newMigration($name = null, $type = 'app')
+	{
+		if (empty($name)) {
+			$name = CLI::prompt('Migration name? ');
+
+			if (empty($name)) {
+				return CLI::error("\tYou must provide a migration name.", 'red');
+			}
+		}
+
+		$this->load->library('migration');
+
+		$path = $this->migration->determine_migration_path($type);
+
+		// Does the alias path exist in our config?
+		if (! $path) {
+			return CLI::error("\tThe migration path for '{$type}' does not exist.'");
+		}
+
+		// Does the path really exist?
+		if (! is_dir($path)) {
+			return CLI::error("\tThe path for '{$type}' is not a directory.");
+		}
+
+		// Is the folder writeable?
+		if (! is_writeable($path)) {
+			return CLI::error("\tThe folder for '{$type}' migrations is not writeable.");
+		}
+
+		$file = $this->migration->make_name($name);
+
+		$path = rtrim($path, '/') .'/'. $file;
+
+		$contents = <<<EOT
 <?php
 
 /**
@@ -262,36 +262,36 @@ 
 
 }
 EOT;
-        $contents = str_replace('{name}', $name, $contents);
-        $contents = str_replace('{date}', date('Y-m-d H:i:s a'), $contents);
-        $contents = str_replace('{clean_name}', ucwords(str_replace('_', ' ', $name)), $contents);
+		$contents = str_replace('{name}', $name, $contents);
+		$contents = str_replace('{date}', date('Y-m-d H:i:s a'), $contents);
+		$contents = str_replace('{clean_name}', ucwords(str_replace('_', ' ', $name)), $contents);
 
-        $this->load->helper('file');
+		$this->load->helper('file');
 
-        if (write_file($path, $contents)) {
-            return CLI::write("\tNew migration created: " . CLI::color($file, 'yellow'), 'green');
-        }
+		if (write_file($path, $contents)) {
+			return CLI::write("\tNew migration created: " . CLI::color($file, 'yellow'), 'green');
+		}
 
-        return CLI::error("\tUnkown error trying to create migration: {$file}", 'red');
-    }
+		return CLI::error("\tUnkown error trying to create migration: {$file}", 'red');
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    //--------------------------------------------------------------------
-    // Seeding Methods
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+	// Seeding Methods
+	//--------------------------------------------------------------------
 
-    /**
-     * Installs any database seeds stored in database/seeds. Seeds just need to
-     * extend the Seeder class and have a method named run.
-     */
-    public function seed($name = null)
-    {
-        $this->load->library('seeder');
+	/**
+	 * Installs any database seeds stored in database/seeds. Seeds just need to
+	 * extend the Seeder class and have a method named run.
+	 */
+	public function seed($name = null)
+	{
+		$this->load->library('seeder');
 
-        $this->seeder->call($name);
-    }
+		$this->seeder->call($name);
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 }

myth/CIModules/database/libraries/Seeder.php

Indentation +63 added lines, -63 removed lines

@@ -39,92 +39,92 @@
  */
 class Seeder {
 
-    public $error_string    = '';
+	public $error_string    = '';
 
-    protected $ci;
+	protected $ci;
 
-    protected $is_cli = false;
+	protected $is_cli = false;
 
-    protected $db;
-    protected $dbforge;
+	protected $db;
+	protected $dbforge;
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    public function __construct ()
-    {
-        $this->ci =& get_instance();
+	public function __construct ()
+	{
+		$this->ci =& get_instance();
 
-        $this->is_cli = $this->ci->input->is_cli_request();
+		$this->is_cli = $this->ci->input->is_cli_request();
 
-        if ($this->is_cli)
-        {
-            $cli = new CLI();
-            $cli::_init();
-        }
+		if ($this->is_cli)
+		{
+			$cli = new CLI();
+			$cli::_init();
+		}
 
-        $this->ci->load->dbforge();
+		$this->ci->load->dbforge();
 
-        // Setup some convenience vars.
-        $this->db       =& $this->ci->db;
-        $this->dbforge  =& $this->ci->dbforge;
-    }
+		// Setup some convenience vars.
+		$this->db       =& $this->ci->db;
+		$this->dbforge  =& $this->ci->dbforge;
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 
-    /**
-     * Run the database seeds. It's where the magic happens.
-     * This method MUST be overridden by child classes.
-     */
-    public function run ()
-    {
+	/**
+	 * Run the database seeds. It's where the magic happens.
+	 * This method MUST be overridden by child classes.
+	 */
+	public function run ()
+	{
 
-    }
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Loads the class file and calls the run() method
-     * on the class.
-     *
-     * @param $class
-     */
-    public function call ($class)
-    {
-        if (empty($class))
-        {
-            // Ask the user...
-            $class = trim( CLI::prompt("Seeder name") );
+	/**
+	 * Loads the class file and calls the run() method
+	 * on the class.
+	 *
+	 * @param $class
+	 */
+	public function call ($class)
+	{
+		if (empty($class))
+		{
+			// Ask the user...
+			$class = trim( CLI::prompt("Seeder name") );
 
-            if (empty($class)) {
-                return CLI::error("\tNo Seeder was specified.");
-            }
-        }
+			if (empty($class)) {
+				return CLI::error("\tNo Seeder was specified.");
+			}
+		}
 
-        $path = APPPATH .'database/seeds/'. str_replace('.php', '', $class) .'.php';
+		$path = APPPATH .'database/seeds/'. str_replace('.php', '', $class) .'.php';
 
-        if ( ! is_file($path))
-        {
-            return CLI::error("\tUnable to find seed class: ". $class);
-        }
+		if ( ! is_file($path))
+		{
+			return CLI::error("\tUnable to find seed class: ". $class);
+		}
 
-        try {
-            require $path;
+		try {
+			require $path;
 
-            $seeder = new $class();
+			$seeder = new $class();
 
-            $seeder->run();
+			$seeder->run();
 
-            unset($seeder);
-        }
-        catch (\Exception $e)
-        {
-            show_error($e->getMessage(), $e->getCode());
-        }
+			unset($seeder);
+		}
+		catch (\Exception $e)
+		{
+			show_error($e->getMessage(), $e->getCode());
+		}
 
-        return Cli::write("\tSeeded: $class", 'green');
-    }
+		return Cli::write("\tSeeded: $class", 'green');
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 }

myth/CIModules/docs/config/docs.php

Indentation +2 added lines, -2 removed lines

@@ -57,8 +57,8 @@
 | if realpath cannot find/read the folder.
 */
 $config['docs.folders'] = [
-    'application'   => APPPATH .'docs',
-    'developer'     => APPPATH .'../myth/_docs_src'
+	'application'   => APPPATH .'docs',
+	'developer'     => APPPATH .'../myth/_docs_src'
 ];
 
 /*

myth/CIModules/forge/controllers/Forge.php

Indentation +168 added lines, -168 removed lines

@@ -34,133 +34,133 @@ 
 
 class Forge extends \Myth\Controllers\CLIController {
 
-    public function __construct()
-    {
-        parent::__construct();
+	public function __construct()
+	{
+		parent::__construct();
 
-        $this->load->config('forge');
-    }
+		$this->load->config('forge');
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 
-    public function _remap($method, $params)
-    {
-        if (method_exists($this, $method))
-        {
-            call_user_func_array( [$this, $method], $params);
-        }
-        else
-        {
-	        $params = array_merge([CLI::cli_string()], $params);
+	public function _remap($method, $params)
+	{
+		if (method_exists($this, $method))
+		{
+			call_user_func_array( [$this, $method], $params);
+		}
+		else
+		{
+			$params = array_merge([CLI::cli_string()], $params);
 
-            call_user_func_array( [$this, 'run'], $params);
-        }
-    }
+			call_user_func_array( [$this, 'run'], $params);
+		}
+	}
     
-    //--------------------------------------------------------------------
-
-    /**
-     * Overrides to implement dynamic description building based on
-     * scanning the collections and grabbing the information from
-     * 'forge.php' files.
-     */
-    public function index()
-    {
-        $collections = config_item('forge.collections');
-
-        if (! is_array($collections) || ! count($collections) )
-        {
-            return CLI::error('No generator collections found.');
-        }
-
-        // We loop through each collection scanning
-        // for any generator folders that have a
-        // 'forge.php' file. For each one found
-        // we build out another section in our help commands
-        foreach ($collections as $alias => $path)
-        {
-            $path = rtrim($path, '/ ') .'/';
-            $folders = scandir($path);
-
-            $_descriptions = [];
-
-            foreach ($folders as $dir)
-            {
-                if ($dir == '.' || $dir == '..' || ! is_file($path . $dir .'/forge.php'))
-                {
-                    continue;
-                }
-
-                include $path . $dir .'/forge.php';
-
-                // Don't have valid arrays to work with? Move along...
-                if (! isset($descriptions))
-                {
-                    log_message('debug', '[Forge] Invalid forge.php file at: '. $path . $dir .'/forge.php');
-                    continue;
-                }
-
-                $_descriptions = array_merge($descriptions, $_descriptions);
-            }
-
-	        ksort($_descriptions);
-
-            CLI::new_line();
-            CLI::write(ucwords( str_replace('_', ' ', $alias)) .' Collection');
-            $this->sayDescriptions($_descriptions);
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * The primary method that calls the correct generator and
-     * makes it run.
-     */
-    public function run($command)
-    {
-	    $quiet = false;
-
-	    $segments = explode(" ", $command);
-
-	    // Get rid of the 'forge' command
-	    if ($segments[0] == 'forge') {
-		    array_shift( $segments );
-	    }
-
-	    $command = trim(str_ireplace("forge", '', array_shift($segments)));
+	//--------------------------------------------------------------------
+
+	/**
+	 * Overrides to implement dynamic description building based on
+	 * scanning the collections and grabbing the information from
+	 * 'forge.php' files.
+	 */
+	public function index()
+	{
+		$collections = config_item('forge.collections');
+
+		if (! is_array($collections) || ! count($collections) )
+		{
+			return CLI::error('No generator collections found.');
+		}
+
+		// We loop through each collection scanning
+		// for any generator folders that have a
+		// 'forge.php' file. For each one found
+		// we build out another section in our help commands
+		foreach ($collections as $alias => $path)
+		{
+			$path = rtrim($path, '/ ') .'/';
+			$folders = scandir($path);
+
+			$_descriptions = [];
+
+			foreach ($folders as $dir)
+			{
+				if ($dir == '.' || $dir == '..' || ! is_file($path . $dir .'/forge.php'))
+				{
+					continue;
+				}
+
+				include $path . $dir .'/forge.php';
+
+				// Don't have valid arrays to work with? Move along...
+				if (! isset($descriptions))
+				{
+					log_message('debug', '[Forge] Invalid forge.php file at: '. $path . $dir .'/forge.php');
+					continue;
+				}
+
+				$_descriptions = array_merge($descriptions, $_descriptions);
+			}
+
+			ksort($_descriptions);
+
+			CLI::new_line();
+			CLI::write(ucwords( str_replace('_', ' ', $alias)) .' Collection');
+			$this->sayDescriptions($_descriptions);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The primary method that calls the correct generator and
+	 * makes it run.
+	 */
+	public function run($command)
+	{
+		$quiet = false;
+
+		$segments = explode(" ", $command);
+
+		// Get rid of the 'forge' command
+		if ($segments[0] == 'forge') {
+			array_shift( $segments );
+		}
+
+		$command = trim(str_ireplace("forge", '', array_shift($segments)));
 
 		$dir = $this->locateGenerator($command);
 
 		$class_name = ucfirst($command) .'Generator';
 
-	    if (! file_exists($dir . $class_name .'.php'))
-	    {
-		    return CLI::error("Generator file not found for: {$class_name}");
-	    }
+		if (! file_exists($dir . $class_name .'.php'))
+		{
+			return CLI::error("Generator file not found for: {$class_name}");
+		}
 
 		require_once $dir . $class_name .'.php';
 
-	    if (! class_exists($class_name, false))
-	    {
-		    return CLI::error("No class `{$class_name}` found in generator file.");
-	    }
+		if (! class_exists($class_name, false))
+		{
+			return CLI::error("No class `{$class_name}` found in generator file.");
+		}
 
-	    // Should we run the process quietly?
-	    if ( (CLI::option('q') || CLI::option('quiet')))
-	    {
-		    $quiet = true;
-	    }
+		// Should we run the process quietly?
+		if ( (CLI::option('q') || CLI::option('quiet')))
+		{
+			$quiet = true;
+		}
 
-	    CLI::write('Invoked '. CLI::color($class_name, 'yellow'));
+		CLI::write('Invoked '. CLI::color($class_name, 'yellow'));
 
 		$class = new $class_name();
 
-	    $class->run( $segments, $quiet );
-    }
+		$class->run( $segments, $quiet );
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 	/**
 	 * Displays the readme file for a generator if it exists.
@@ -205,67 +205,67 @@ 
 	//--------------------------------------------------------------------
 
 
-    /**
-     * Overrides CLIController's version to support searching our
-     * collections for the help description.
-     *
-     * @param null $method
-     */
-    public function longDescribeMethod($method=null)
-    {
-	    $collections = config_item('forge.collections');
-
-	    if (! is_array($collections) || ! count($collections) )
-	    {
-		    return CLI::error('No generator collections found.');
-	    }
-
-	    // We loop through each collection scanning
-	    // for any generator folders that have a
-	    // 'forge.php' file. For each one found
-	    // we build out another section in our help commands
-	    foreach ($collections as $alias => $path)
-	    {
-
-		    $path = rtrim($path, '/ ') .'/';
-		    $folders = scandir($path);
-
-		    if (! $i = array_search(ucfirst($method), $folders))
-		    {
-			    continue;
-		    }
-
-		    $dir = $path . $folders[$i] .'/';
-
-		    if (! is_file($dir .'/forge.php'))
-		    {
-			    CLI::error("The {$method} command does not have any cli help available.");
-		    }
-
-		    include $dir .'/forge.php';
-
-		    // Don't have valid arrays to work with? Move along...
-		    if (! isset($long_description))
-		    {
-			    log_message('debug', '[Forge] Invalid forge.php file at: '. $dir .'/forge.php');
-			    continue;
-		    }
-
-		    if (empty($long_description))
-		    {
-			    return CLI::error("The {$method} command does not have an cli help available.");
-		    }
-
-		    CLI::new_line();
-		    CLI::write( CLI::color(ucfirst($method) .' Help', 'yellow') );
-		    return CLI::write( CLI::wrap($long_description, CLI::getWidth()) );
-	    }
-
-	    // Still here?
-	    CLI::error("No help found for command: {$method}");
-    }
-
-    //--------------------------------------------------------------------
+	/**
+	 * Overrides CLIController's version to support searching our
+	 * collections for the help description.
+	 *
+	 * @param null $method
+	 */
+	public function longDescribeMethod($method=null)
+	{
+		$collections = config_item('forge.collections');
+
+		if (! is_array($collections) || ! count($collections) )
+		{
+			return CLI::error('No generator collections found.');
+		}
+
+		// We loop through each collection scanning
+		// for any generator folders that have a
+		// 'forge.php' file. For each one found
+		// we build out another section in our help commands
+		foreach ($collections as $alias => $path)
+		{
+
+			$path = rtrim($path, '/ ') .'/';
+			$folders = scandir($path);
+
+			if (! $i = array_search(ucfirst($method), $folders))
+			{
+				continue;
+			}
+
+			$dir = $path . $folders[$i] .'/';
+
+			if (! is_file($dir .'/forge.php'))
+			{
+				CLI::error("The {$method} command does not have any cli help available.");
+			}
+
+			include $dir .'/forge.php';
+
+			// Don't have valid arrays to work with? Move along...
+			if (! isset($long_description))
+			{
+				log_message('debug', '[Forge] Invalid forge.php file at: '. $dir .'/forge.php');
+				continue;
+			}
+
+			if (empty($long_description))
+			{
+				return CLI::error("The {$method} command does not have an cli help available.");
+			}
+
+			CLI::new_line();
+			CLI::write( CLI::color(ucfirst($method) .' Help', 'yellow') );
+			return CLI::write( CLI::wrap($long_description, CLI::getWidth()) );
+		}
+
+		// Still here?
+		CLI::error("No help found for command: {$method}");
+	}
+
+	//--------------------------------------------------------------------
 
 	/**
 	 * Scans through the collections for the folder for this generator.

myth/Controllers/BaseController.php

Indentation +7 added lines, -7 removed lines

@@ -100,7 +100,7 @@ 
 	{
 		parent::__construct();
 
-        $this->load->library('session');
+		$this->load->library('session');
 
 		$this->setupCache();
 
@@ -236,8 +236,8 @@ 
 		}
 
 		$this->output->enable_profiler( FALSE )
-		             ->set_content_type( 'text/plain' )
-		             ->set_output( $text );
+					 ->set_content_type( 'text/plain' )
+					 ->set_output( $text );
 	}
 
 	//--------------------------------------------------------------------
@@ -267,8 +267,8 @@ 
 		}
 
 		$this->output->enable_profiler( FALSE )
-		             ->set_content_type( 'application/json' )
-		             ->set_output( json_encode( $json ) );
+					 ->set_content_type( 'application/json' )
+					 ->set_output( json_encode( $json ) );
 	}
 
 	//--------------------------------------------------------------------
@@ -292,8 +292,8 @@ 
 		}
 
 		$this->output->enable_profiler( FALSE )
-		             ->set_content_type( 'application/x-javascript' )
-		             ->set_output( $js );
+					 ->set_content_type( 'application/x-javascript' )
+					 ->set_output( $js );
 	}
 
 	//--------------------------------------------------------------------

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

myth/Controllers/ThemedController.php

Indentation +353 added lines, -353 removed lines

@@ -41,358 +41,358 @@
  */
 class ThemedController extends BaseController
 {
-    /**
-     * Stores data variables to be sent to the view.
-     * @var array
-     */
-    protected $vars = array();
-
-    /**
-     * Stores current status message.
-     * @var
-     */
-    protected $message;
-
-    /**
-     * The UIKit to make available to the template views.
-     * @var string
-     */
-    protected $uikit = '';
-
-    /**
-     * An instance of an active Themer to use.
-     * @var null
-     */
-    protected $themer = null;
-
-    /**
-     * Allows per-controller override of theme.
-     * @var null
-     */
-    protected $theme = null;
-
-    /**
-     * Per-controller override of the current layout file.
-     * @var null
-     */
-    protected $layout = null;
-
-    /**
-     * Stores an array of javascript files.
-     * @var array
-     */
-    protected $external_scripts = array();
-
-    /**
-     * Stores an array of CSS stylesheets.
-     * @var array
-     */
-    protected $stylesheets = array();
-
-    /**
-     * A MenuCollection instance
-     * @var
-     */
-    protected $meta;
-
-    /**
-     * Whether set() should escape the output...
-     * @var bool
-     */
-    protected $auto_escape = null;
-
-    /**
-     * An instance of ZendFrameworks Escaper
-     * @var null
-     */
-    protected $escaper = null;
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Constructor takes care of getting the template engine up and running
-     * and bound to our DI object, as well as any other preliminary needs,
-     * like detecting the variant to use, etc.
-     */
-    public function __construct()
-    {
-        parent::__construct();
-
-        // Setup our Template Engine
-        $themer = config_item('active_themer');
-
-        if (empty($themer)) {
-            throw new \RuntimeException( lang('no_themer') );
-        }
-
-        $this->themer = new $themer( get_instance() );
-
-        // Register our paths with the themer
-        $paths = config_item('theme.paths');
-
-        foreach ($paths as $key => $path) {
-            $this->themer->addThemePath($key, $path);
-        }
-
-        // Set our default theme.
-        $this->themer->setDefaultTheme( config_item('theme.default_theme') );
-
-        // Register our variants with the engine.
-        $variants = config_item('theme.variants');
-
-        foreach ($variants as $key => $value) {
-            $this->themer->addVariant($key, $value);
-        }
-
-        $this->detectVariant();
-
-        // Ensure that our UIKit is loaded up if we're using one.
-        $uikit = config_item('theme.uikit');
-
-        if ($uikit)
-        {
-            $this->uikit = new $uikit();
-        }
-
-        // Load up our meta collection
-        $this->meta = new MetaCollection( get_instance() );
-
-        // Should we autoescape vars?
-        if (is_null($this->auto_escape))
-        {
-            $this->auto_escape = config_item( 'theme.auto_escape' );
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Provides a common interface with the other rendering methods to
-     * set the output of the method. Uses the current instance of $this->template.
-     * Ensures that any data we've stored through $this->setVar() are present
-     * and includes the status messages into the data.
-     *
-     * @param array $data
-     * @param int   $cache_time
-     */
-    public function render($data = array(), $cache_time=0)
-    {
-	    if ($cache_time > 0)
-	    {
-		    $this->output->cache( (int)$cache_time );
-	    }
-
-        // Determine the correct theme to use
-        $theme = ! empty($this->theme) ? $this->theme : config_item('theme.default_theme');
-        $this->themer->setTheme($theme);
-
-        // Determine the correct layout to use
-        $layout = !empty($this->layout) ? $this->layout : null;
-        $this->themer->setLayout($layout);
-
-        // Merge any saved vars into the data
-        // But first, escape the data if needed
-        if ($this->auto_escape)
-        {
-            $data = esc($data, 'html');
-        }
-        $data = array_merge($data, $this->vars);
-
-        // Make sure the MetaCollection is available in the view.
-        $data['html_meta'] = $this->meta;
-
-        // Include our UIKit so views can use it
-        if (! empty($this->uikit)) {
-            $data['uikit'] = $this->uikit;
-        }
-
-        // Build our notices from the theme's view file.
-        $data['notice'] = $this->themer->display($this->themer->theme() . ':notice', ["notice" => $this->message()]);
-
-        // Make sure any scripts/stylesheets are available to the view
-        $data['external_scripts'] = $this->external_scripts;
-        $data['stylesheets'] = $this->stylesheets;
-
-        $this->themer->set($data);
-
-        $this->output->set_content_type('html')
-                     ->set_output($this->themer->render());
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets a data variable to be sent to the view during the render() method.
-     * Will auto-escape data on the way in, unless specifically told not to.
-     *
-     * Uses ZendFramework's Escaper to handle the data escaping,
-     * based on context. Valid contexts are:
-     *      - html
-     *      - htmlAttr
-     *      - js
-     *      - css
-     *      - url
-     *
-     * @param string $name
-     * @param mixed $value
-     * @param string $context
-     * @param bool $do_escape
-     */
-    public function setVar($name, $value = null, $context='html', $do_escape=null)
-    {
-        $escape = $do_escape == true ? true : $this->auto_escape;
-
-        if (is_null($this->escaper))
-        {
-            $this->escaper = new Escaper(config_item('charset'));
-        }
-
-        if (is_array($name))
-        {
-            foreach ($name as $k => $v)
-            {
-                $this->vars[$k] = $escape ? esc($v, $context, $this->escaper) : $v;
-            }
-        }
-        else
-        {
-            $this->vars[$name] = $escape ? esc($value, $context, $this->escaper) : $value;
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Status Messages
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets a status message (for displaying small success/error messages).
-     * This is used in place of the session->flashdata functions since you
-     * don't always want to have to refresh the page to show the message.
-     *
-     * @param string $message The message to save.
-     * @param string $type The string to be included as the CSS class of the containing div.
-     */
-    public function setMessage($message = '', $type = 'info')
-    {
-        if (! empty($message)) {
-            if (isset($this->session)) {
-                $this->session->set_flashdata('message', $type . '::' . $message);
-            }
-
-            $this->message = array(
-                'type' => $type,
-                'message' => $message
-            );
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Retrieves the status message to display (if any).
-     *
-     * @param  string $message [description]
-     * @param  string $type [description]
-     * @return array
-     */
-    public function message($message = '', $type = 'info')
-    {
-        $return = array(
-            'message' => $message,
-            'type' => $type
-        );
-
-        // Does session data exist?
-        if (empty($message) && class_exists('CI_Session')) {
-            $message = $this->session->flashdata('message');
-
-            if (! empty($message)) {
-                // Split out our message parts
-                $temp_message = explode('::', $message);
-                $return['type'] = $temp_message[0];
-                $return['message'] = $temp_message[1];
-
-                unset($temp_message);
-            }
-        }
-
-        // If message is empty, we need to check our own storage.
-        if (empty($message)) {
-            if (empty($this->message['message'])) {
-                return '';
-            }
-
-            $return = $this->message;
-        }
-
-        // Clear our session data so we don't get extra messages on rare occasions.
-        if (class_exists('CI_Session')) {
-            $this->session->set_flashdata('message', '');
-        }
-
-        return $return;
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Utility Methods
-    //--------------------------------------------------------------------
-
-    /**
-     * Detects whether the item is being displayed on a desktop, phone,
-     * or tablet device.
-     */
-    protected function detectVariant()
-    {
-        // Variant Detection and setup
-        if (config_item('autodetect_variant') === true) {
-            $detect = new \Mobile_Detect();
-
-            if ($detect->isMobile()) {
-                $this->template->setVariant('phone');
-            } else if ($detect->isTablet()) {
-                $this->template->setVariant('tablet');
-            }
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // 'Asset' functions
-    //--------------------------------------------------------------------
-
-    /**
-     * Adds an external javascript file to the 'external_scripts' array.
-     *
-     * @param [type] $filename [description]
-     */
-    public function addScript($filename)
-    {
-        if (strpos($filename, 'http') === FALSE) {
-            $filename = base_url() . 'assets/js/' . $filename;
-        }
-
-        $this->external_scripts[] = $filename;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Adds an external stylesheet file to the 'stylesheets' array.
-     */
-    public function addStyle($filename)
-    {
-        if (strpos($filename, 'http') === FALSE) {
-            $filename = base_url() . 'assets/css/' . $filename;
-        }
-
-        $this->stylesheets[] = $filename;
-    }
-
-    //--------------------------------------------------------------------
+	/**
+	 * Stores data variables to be sent to the view.
+	 * @var array
+	 */
+	protected $vars = array();
+
+	/**
+	 * Stores current status message.
+	 * @var
+	 */
+	protected $message;
+
+	/**
+	 * The UIKit to make available to the template views.
+	 * @var string
+	 */
+	protected $uikit = '';
+
+	/**
+	 * An instance of an active Themer to use.
+	 * @var null
+	 */
+	protected $themer = null;
+
+	/**
+	 * Allows per-controller override of theme.
+	 * @var null
+	 */
+	protected $theme = null;
+
+	/**
+	 * Per-controller override of the current layout file.
+	 * @var null
+	 */
+	protected $layout = null;
+
+	/**
+	 * Stores an array of javascript files.
+	 * @var array
+	 */
+	protected $external_scripts = array();
+
+	/**
+	 * Stores an array of CSS stylesheets.
+	 * @var array
+	 */
+	protected $stylesheets = array();
+
+	/**
+	 * A MenuCollection instance
+	 * @var
+	 */
+	protected $meta;
+
+	/**
+	 * Whether set() should escape the output...
+	 * @var bool
+	 */
+	protected $auto_escape = null;
+
+	/**
+	 * An instance of ZendFrameworks Escaper
+	 * @var null
+	 */
+	protected $escaper = null;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor takes care of getting the template engine up and running
+	 * and bound to our DI object, as well as any other preliminary needs,
+	 * like detecting the variant to use, etc.
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		// Setup our Template Engine
+		$themer = config_item('active_themer');
+
+		if (empty($themer)) {
+			throw new \RuntimeException( lang('no_themer') );
+		}
+
+		$this->themer = new $themer( get_instance() );
+
+		// Register our paths with the themer
+		$paths = config_item('theme.paths');
+
+		foreach ($paths as $key => $path) {
+			$this->themer->addThemePath($key, $path);
+		}
+
+		// Set our default theme.
+		$this->themer->setDefaultTheme( config_item('theme.default_theme') );
+
+		// Register our variants with the engine.
+		$variants = config_item('theme.variants');
+
+		foreach ($variants as $key => $value) {
+			$this->themer->addVariant($key, $value);
+		}
+
+		$this->detectVariant();
+
+		// Ensure that our UIKit is loaded up if we're using one.
+		$uikit = config_item('theme.uikit');
+
+		if ($uikit)
+		{
+			$this->uikit = new $uikit();
+		}
+
+		// Load up our meta collection
+		$this->meta = new MetaCollection( get_instance() );
+
+		// Should we autoescape vars?
+		if (is_null($this->auto_escape))
+		{
+			$this->auto_escape = config_item( 'theme.auto_escape' );
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Provides a common interface with the other rendering methods to
+	 * set the output of the method. Uses the current instance of $this->template.
+	 * Ensures that any data we've stored through $this->setVar() are present
+	 * and includes the status messages into the data.
+	 *
+	 * @param array $data
+	 * @param int   $cache_time
+	 */
+	public function render($data = array(), $cache_time=0)
+	{
+		if ($cache_time > 0)
+		{
+			$this->output->cache( (int)$cache_time );
+		}
+
+		// Determine the correct theme to use
+		$theme = ! empty($this->theme) ? $this->theme : config_item('theme.default_theme');
+		$this->themer->setTheme($theme);
+
+		// Determine the correct layout to use
+		$layout = !empty($this->layout) ? $this->layout : null;
+		$this->themer->setLayout($layout);
+
+		// Merge any saved vars into the data
+		// But first, escape the data if needed
+		if ($this->auto_escape)
+		{
+			$data = esc($data, 'html');
+		}
+		$data = array_merge($data, $this->vars);
+
+		// Make sure the MetaCollection is available in the view.
+		$data['html_meta'] = $this->meta;
+
+		// Include our UIKit so views can use it
+		if (! empty($this->uikit)) {
+			$data['uikit'] = $this->uikit;
+		}
+
+		// Build our notices from the theme's view file.
+		$data['notice'] = $this->themer->display($this->themer->theme() . ':notice', ["notice" => $this->message()]);
+
+		// Make sure any scripts/stylesheets are available to the view
+		$data['external_scripts'] = $this->external_scripts;
+		$data['stylesheets'] = $this->stylesheets;
+
+		$this->themer->set($data);
+
+		$this->output->set_content_type('html')
+					 ->set_output($this->themer->render());
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets a data variable to be sent to the view during the render() method.
+	 * Will auto-escape data on the way in, unless specifically told not to.
+	 *
+	 * Uses ZendFramework's Escaper to handle the data escaping,
+	 * based on context. Valid contexts are:
+	 *      - html
+	 *      - htmlAttr
+	 *      - js
+	 *      - css
+	 *      - url
+	 *
+	 * @param string $name
+	 * @param mixed $value
+	 * @param string $context
+	 * @param bool $do_escape
+	 */
+	public function setVar($name, $value = null, $context='html', $do_escape=null)
+	{
+		$escape = $do_escape == true ? true : $this->auto_escape;
+
+		if (is_null($this->escaper))
+		{
+			$this->escaper = new Escaper(config_item('charset'));
+		}
+
+		if (is_array($name))
+		{
+			foreach ($name as $k => $v)
+			{
+				$this->vars[$k] = $escape ? esc($v, $context, $this->escaper) : $v;
+			}
+		}
+		else
+		{
+			$this->vars[$name] = $escape ? esc($value, $context, $this->escaper) : $value;
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Status Messages
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets a status message (for displaying small success/error messages).
+	 * This is used in place of the session->flashdata functions since you
+	 * don't always want to have to refresh the page to show the message.
+	 *
+	 * @param string $message The message to save.
+	 * @param string $type The string to be included as the CSS class of the containing div.
+	 */
+	public function setMessage($message = '', $type = 'info')
+	{
+		if (! empty($message)) {
+			if (isset($this->session)) {
+				$this->session->set_flashdata('message', $type . '::' . $message);
+			}
+
+			$this->message = array(
+				'type' => $type,
+				'message' => $message
+			);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieves the status message to display (if any).
+	 *
+	 * @param  string $message [description]
+	 * @param  string $type [description]
+	 * @return array
+	 */
+	public function message($message = '', $type = 'info')
+	{
+		$return = array(
+			'message' => $message,
+			'type' => $type
+		);
+
+		// Does session data exist?
+		if (empty($message) && class_exists('CI_Session')) {
+			$message = $this->session->flashdata('message');
+
+			if (! empty($message)) {
+				// Split out our message parts
+				$temp_message = explode('::', $message);
+				$return['type'] = $temp_message[0];
+				$return['message'] = $temp_message[1];
+
+				unset($temp_message);
+			}
+		}
+
+		// If message is empty, we need to check our own storage.
+		if (empty($message)) {
+			if (empty($this->message['message'])) {
+				return '';
+			}
+
+			$return = $this->message;
+		}
+
+		// Clear our session data so we don't get extra messages on rare occasions.
+		if (class_exists('CI_Session')) {
+			$this->session->set_flashdata('message', '');
+		}
+
+		return $return;
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Utility Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Detects whether the item is being displayed on a desktop, phone,
+	 * or tablet device.
+	 */
+	protected function detectVariant()
+	{
+		// Variant Detection and setup
+		if (config_item('autodetect_variant') === true) {
+			$detect = new \Mobile_Detect();
+
+			if ($detect->isMobile()) {
+				$this->template->setVariant('phone');
+			} else if ($detect->isTablet()) {
+				$this->template->setVariant('tablet');
+			}
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// 'Asset' functions
+	//--------------------------------------------------------------------
+
+	/**
+	 * Adds an external javascript file to the 'external_scripts' array.
+	 *
+	 * @param [type] $filename [description]
+	 */
+	public function addScript($filename)
+	{
+		if (strpos($filename, 'http') === FALSE) {
+			$filename = base_url() . 'assets/js/' . $filename;
+		}
+
+		$this->external_scripts[] = $filename;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Adds an external stylesheet file to the 'stylesheets' array.
+	 */
+	public function addStyle($filename)
+	{
+		if (strpos($filename, 'http') === FALSE) {
+			$filename = base_url() . 'assets/css/' . $filename;
+		}
+
+		$this->stylesheets[] = $filename;
+	}
+
+	//--------------------------------------------------------------------
 }