install bugfix

poll bugfix
updates
2024-08-09 18:00:56 -04:00 · 2024-08-09 17:58:30 -04:00 · 2024-08-09 17:20:00 -04:00 · 2024-08-09 02:24:28 -04:00 · 2024-08-09 01:25:21 -04:00 · 2024-08-09 01:05:20 -04:00
74 changed files with 291 additions and 284 deletions
--- a/app/classes/config.php
+++ b/app/classes/config.php
@ -12,7 +12,7 @@
 namespace TheTempusProject\Classes;

 use TheTempusProject\Houdini\Classes\Forms;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Functions\Input;
 use TheTempusProject\Bedrock\Classes\Config as BedrockConfig;
--- a/app/classes/controller.php
+++ b/app/classes/controller.php
@ -13,11 +13,12 @@ namespace TheTempusProject\Classes;

 use TheTempusProject\Bedrock\Classes\Controller as BedrockController;
 use TheTempusProject\Houdini\Classes\Template;
-use TheTempusProject\Houdini\Classes\Pagination;
+use TheTempusProject\Bedrock\Classes\Pagination;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Models\User;
 use TheTempusProject\Models\Sessions;
 use TheTempusProject\Bedrock\Functions\Token;
+use TheTempusProject\Houdini\Classes\Components;

 class Controller extends BedrockController {
    public static $user;
--- a/app/classes/database_model.php
+++ b/app/classes/database_model.php
@ -13,7 +13,7 @@ namespace TheTempusProject\Classes;

 use TheTempusProject\Bedrock\Classes\DatabaseModel as BedrockDatabaseModel;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Models\Log;

 class DatabaseModel extends BedrockDatabaseModel {
--- a/app/classes/email.php
+++ b/app/classes/email.php
@ -14,7 +14,7 @@ namespace TheTempusProject\Classes;
 use TheTempusProject\Houdini\Classes\Template;
 use TheTempusProject\Houdini\Classes\Views;
 use TheTempusProject\Hermes\Functions\Route as Routes;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;

 class Email {
    private static $header = null;
--- a/app/classes/forms.php
+++ b/app/classes/forms.php
@ -15,7 +15,7 @@
 namespace TheTempusProject\Classes;

 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;

 class Forms extends Check {
    private static $formHandlers = [];
--- a/app/classes/installer.php
+++ b/app/classes/installer.php
@ -16,7 +16,7 @@ namespace TheTempusProject\Classes;
 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Functions\Code;
 use TheTempusProject\Bedrock\Functions\Cookie;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Hermes\Functions\Redirect;
 use TheTempusProject\Hermes\Functions\Route as Routes;
 use TheTempusProject\Bedrock\Functions\Session;
--- a/app/classes/permissions.php
+++ b/app/classes/permissions.php
@ -11,7 +11,7 @@
 */
 namespace TheTempusProject\Classes;

-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Houdini\Classes\Forms;
 use TheTempusProject\Bedrock\Functions\Input;
--- a/app/classes/plugin.php
+++ b/app/classes/plugin.php
@ -14,7 +14,7 @@ namespace TheTempusProject\Classes;
 use TheTempusProject\Houdini\Classes\Navigation;
 use TheTempusProject\Houdini\Classes\Filters;
 use TheTempusProject\TheTempusProject as App;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Bedrock\Classes\Database;

 class Plugin {
--- a/app/classes/preferences.php
+++ b/app/classes/preferences.php
@ -13,7 +13,7 @@ namespace TheTempusProject\Classes;

 use TheTempusProject\Houdini\Classes\Issues;
 use TheTempusProject\Houdini\Classes\Forms;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Functions\Upload;
 use TheTempusProject\Bedrock\Functions\Input;
--- a/app/config/constants.php
+++ b/app/config/constants.php
@ -1,135 +1,135 @@
 <?php
-if ( ! defined( 'APP_SPACE' ) ) {
    define( 'APP_SPACE',                          'TheTempusProject' );
-}
 if ( ! defined( 'APP_ROOT_DIRECTORY' ) ) {
    define( 'APP_ROOT_DIRECTORY',                 dirname( __DIR__ ) . DIRECTORY_SEPARATOR ); // need to verify
 }
-if ( ! defined( 'CONFIG_DIRECTORY' ) ) {
-    define( 'CONFIG_DIRECTORY',                   APP_ROOT_DIRECTORY  . 'app'               . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR );
-}
+    define( 'APP_DIRECTORY',                      APP_ROOT_DIRECTORY  . 'app'               . DIRECTORY_SEPARATOR );
 // Directories
-	define( 'APP_DIRECTORY',                      APP_ROOT_DIRECTORY  . 'app'               . DIRECTORY_SEPARATOR );
-	define( 'CSS_DIRECTORY',                      APP_ROOT_DIRECTORY  . 'css'               . DIRECTORY_SEPARATOR );
-	define( 'IMAGE_DIRECTORY',                    APP_ROOT_DIRECTORY  . 'images'            . DIRECTORY_SEPARATOR );
-	define( 'JAVASCRIPT_DIRECTORY',               APP_ROOT_DIRECTORY  . 'js'                . DIRECTORY_SEPARATOR );
-	define( 'HTACCESS_LOCATION',                  APP_ROOT_DIRECTORY  . '.htaccess' );
-	define( 'PLUGIN_DIRECTORY',                   APP_DIRECTORY       . 'plugins'           . DIRECTORY_SEPARATOR );
-	define( 'MODEL_DIRECTORY',                    APP_DIRECTORY       . 'models'            . DIRECTORY_SEPARATOR );
-	define( 'CONTROLLER_DIRECTORY',               APP_DIRECTORY       . 'controllers'       . DIRECTORY_SEPARATOR );
-	define( 'ADMIN_CONTROLLER_DIRECTORY',         CONTROLLER_DIRECTORY. 'admin'             . DIRECTORY_SEPARATOR );
-	define( 'API_CONTROLLER_DIRECTORY',           CONTROLLER_DIRECTORY. 'api'               . DIRECTORY_SEPARATOR );
+    define( 'CSS_DIRECTORY',                      APP_ROOT_DIRECTORY  . 'css'               . DIRECTORY_SEPARATOR );
+    define( 'IMAGE_DIRECTORY',                    APP_ROOT_DIRECTORY  . 'images'            . DIRECTORY_SEPARATOR );
+    define( 'JAVASCRIPT_DIRECTORY',               APP_ROOT_DIRECTORY  . 'js'                . DIRECTORY_SEPARATOR );
+    define( 'HTACCESS_LOCATION',                  APP_ROOT_DIRECTORY  . '.htaccess' );
+if ( ! defined( 'CONFIG_DIRECTORY' ) ) {
+    define( 'CONFIG_DIRECTORY',                   APP_DIRECTORY       . 'config'            . DIRECTORY_SEPARATOR );
+}
+    define( 'PLUGIN_DIRECTORY',                   APP_DIRECTORY       . 'plugins'           . DIRECTORY_SEPARATOR );
+    define( 'MODEL_DIRECTORY',                    APP_DIRECTORY       . 'models'            . DIRECTORY_SEPARATOR );
+    define( 'CONTROLLER_DIRECTORY',               APP_DIRECTORY       . 'controllers'       . DIRECTORY_SEPARATOR );
+    define( 'ADMIN_CONTROLLER_DIRECTORY',         CONTROLLER_DIRECTORY. 'admin'             . DIRECTORY_SEPARATOR );
+    define( 'API_CONTROLLER_DIRECTORY',           CONTROLLER_DIRECTORY. 'api'               . DIRECTORY_SEPARATOR );
 // Files
-	define( 'PERMISSIONS_JSON',                   CONFIG_DIRECTORY    . 'permissions.json' );
-	define( 'PREFERENCES_JSON',                   CONFIG_DIRECTORY    . 'preferences.json' );
-	define( 'INSTALL_JSON_LOCATION',              CONFIG_DIRECTORY    . 'install.json' );
-	define( 'INSTALLER_LOCATION',                 APP_ROOT_DIRECTORY  . 'install.php' );
+    define( 'PERMISSIONS_JSON',                   CONFIG_DIRECTORY    . 'permissions.json' );
+    define( 'PREFERENCES_JSON',                   CONFIG_DIRECTORY    . 'preferences.json' );
+    define( 'INSTALL_JSON_LOCATION',              CONFIG_DIRECTORY    . 'install.json' );
+    define( 'INSTALLER_LOCATION',                 APP_ROOT_DIRECTORY  . 'install.php' );
 // Other
-	define( 'PLUGINS_ENABLED',                    true );
-	define( 'INSTALL_STATUS_NOT_REQUIRED',        'Not Required' );
-	define( 'INSTALL_STATUS_NOT_FOUND',           'Not Found' );
-	define( 'INSTALL_STATUS_PARTIALLY_INSTALLED', 'Partially Installed' );
-	define( 'INSTALL_STATUS_NOT_INSTALLED',       'Not Installed' );
-	define( 'INSTALL_STATUS_INSTALLED',           'Installed' );
-	define( 'INSTALL_STATUS_UNINSTALLED',         'Uninstalled' );
-	define( 'INSTALL_STATUS_SUCCESS',             'Success' );
-	define( 'INSTALL_STATUS_SKIPPED',             'Skipped' );
-	define( 'INSTALL_STATUS_FAIL',                'Failed' );
-	define( 'MODEL_INSTALL_FLAGS',                [ 'installTable', 'installPermissions', 'installConfigs', 'installResources', 'installPreferences' ] );
-	define( 'PLUGIN_INSTALL_FLAGS',               [ 'models_installed', 'permissions_installed', 'configs_installed', 'resources_installed', 'preferences_installed' ] );
+    define( 'PLUGINS_ENABLED',                    true );
+    define( 'INSTALL_STATUS_NOT_REQUIRED',        'Not Required' );
+    define( 'INSTALL_STATUS_NOT_FOUND',           'Not Found' );
+    define( 'INSTALL_STATUS_PARTIALLY_INSTALLED', 'Partially Installed' );
+    define( 'INSTALL_STATUS_NOT_INSTALLED',       'Not Installed' );
+    define( 'INSTALL_STATUS_INSTALLED',           'Installed' );
+    define( 'INSTALL_STATUS_UNINSTALLED',         'Uninstalled' );
+    define( 'INSTALL_STATUS_SUCCESS',             'Success' );
+    define( 'INSTALL_STATUS_SKIPPED',             'Skipped' );
+    define( 'INSTALL_STATUS_FAIL',                'Failed' );
+    define( 'MODEL_INSTALL_FLAGS',                [ 'installTable', 'installPermissions', 'installConfigs', 'installResources', 'installPreferences' ] );
+    define( 'PLUGIN_INSTALL_FLAGS',               [ 'models_installed', 'permissions_installed', 'configs_installed', 'resources_installed', 'preferences_installed' ] );
 # Tempus Debugger
    define( 'CANARY_SECURE_HASH',        'd73ed7591a30f0ca7d686a0e780f0d05' );
 # Tempus Project Core
-	// Check
-		define( 'MINIMUM_PHP_VERSION',            8.1);
-	// Cookies
-		define( 'DEFAULT_COOKIE_PREFIX',          'TP_');
-	// Debug
+    // Check
+        define( 'MINIMUM_PHP_VERSION',            8.1);
+    // Cookies
+        define( 'DEFAULT_COOKIE_PREFIX',          'TP_');
+    // Debug
        define( 'CANARY_DEBUG_LEVEL_ERROR', 'error' );
        define( 'CANARY_DEBUG_LEVEL_WARN', 'warn' );
        define( 'CANARY_DEBUG_LEVEL_INFO', 'info' );
        define( 'CANARY_DEBUG_LEVEL_LOG', 'log' );
        define( 'CANARY_DEBUG_LEVEL_DEBUG', 'debug' );
        define( 'CANARY_DEBUG_TO_FILE_LEVEL', CANARY_DEBUG_LEVEL_INFO );
-		define( 'CANARY_ENABLED', true );
-		define( 'DEBUG_EMAIL', 'webmaster@' . $_SERVER['HTTP_HOST'] );
-		define( 'HERMES_REDIRECTS_ENABLED', true );
-		define( 'RENDERING_ENABLED', true );
-		define( 'CANARY_TRACE_ENABLED', false );
-		define( 'CANARY_DEBUG_TO_CONSOLE', false );
-		define( 'CANARY_DEBUG_TO_FILE', true );
-	// Directories
-		define( 'VENDOR_DIRECTORY',               APP_ROOT_DIRECTORY  . 'vendor'            . DIRECTORY_SEPARATOR );
-	    if ( is_dir( VENDOR_DIRECTORY . 'thetempusproject' )) {
-	        define( 'TP_VENDOR_DIRECTORY',        VENDOR_DIRECTORY    . 'thetempusproject'  . DIRECTORY_SEPARATOR );
-	    } elseif ( is_dir( VENDOR_DIRECTORY . 'TheTempusProject' )) {
-	        define( 'TP_VENDOR_DIRECTORY',        VENDOR_DIRECTORY    . 'TheTempusProject'  . DIRECTORY_SEPARATOR );
-	    } else {
-			define( 'TP_VENDOR_DIRECTORY',        VENDOR_DIRECTORY);
-	    }
-		# Bedrock
-		    if ( is_dir( TP_VENDOR_DIRECTORY       . 'tempusprojectcore' )) {
-		        define( 'BEDROCK_ROOT_DIRECTORY',     TP_VENDOR_DIRECTORY . 'tempusprojectcore' . DIRECTORY_SEPARATOR );
-		    } elseif ( is_dir( TP_VENDOR_DIRECTORY . 'TempusProjectCore' )) {
-		        define( 'BEDROCK_ROOT_DIRECTORY',     TP_VENDOR_DIRECTORY . 'TempusProjectCore' . DIRECTORY_SEPARATOR );
-		    } elseif ( is_dir( TP_VENDOR_DIRECTORY . 'bedrock' )) {
-		        define( 'BEDROCK_ROOT_DIRECTORY',     TP_VENDOR_DIRECTORY . 'bedrock'           . DIRECTORY_SEPARATOR );
-		    } elseif ( is_dir( TP_VENDOR_DIRECTORY . 'Bedrock' )) {
-		        define( 'BEDROCK_ROOT_DIRECTORY',     TP_VENDOR_DIRECTORY . 'Bedrock'           . DIRECTORY_SEPARATOR );
-		    }
-		    if ( is_dir( BEDROCK_ROOT_DIRECTORY       . 'config' )) {
-		        define( 'BEDROCK_CONFIG_DIRECTORY',      BEDROCK_ROOT_DIRECTORY . 'config'    . DIRECTORY_SEPARATOR );
-		    }
-		# Canary
-		    if ( is_dir( TP_VENDOR_DIRECTORY       . 'tempusdebugger' )) {
-		        define( 'CANARY_ROOT_DIRECTORY',      TP_VENDOR_DIRECTORY . 'tempusdebugger'    . DIRECTORY_SEPARATOR );
-		    } elseif ( is_dir( TP_VENDOR_DIRECTORY . 'TempusDebugger' )) {
-		        define( 'CANARY_ROOT_DIRECTORY',      TP_VENDOR_DIRECTORY . 'TempusDebugger'    . DIRECTORY_SEPARATOR );
-		    } elseif ( is_dir( TP_VENDOR_DIRECTORY . 'canary' )) {
-		        define( 'CANARY_ROOT_DIRECTORY',      TP_VENDOR_DIRECTORY . 'canary'            . DIRECTORY_SEPARATOR );
-		    } elseif ( is_dir( TP_VENDOR_DIRECTORY . 'Canary' )) {
-		        define( 'CANARY_ROOT_DIRECTORY',      TP_VENDOR_DIRECTORY . 'Canary'            . DIRECTORY_SEPARATOR );
-		    }
-		    if ( is_dir( CANARY_ROOT_DIRECTORY       . 'config' )) {
-		        define( 'CANARY_CONFIG_DIRECTORY',      CANARY_ROOT_DIRECTORY . 'config'    . DIRECTORY_SEPARATOR );
-		    }
-		# Hermes
-		    if ( is_dir( TP_VENDOR_DIRECTORY       . 'hermes' )) {
-		        define( 'HERMES_ROOT_DIRECTORY',      TP_VENDOR_DIRECTORY . 'hermes'    . DIRECTORY_SEPARATOR );
-		    } elseif ( is_dir( TP_VENDOR_DIRECTORY . 'Hermes' )) {
-		        define( 'HERMES_ROOT_DIRECTORY',      TP_VENDOR_DIRECTORY . 'Hermes'    . DIRECTORY_SEPARATOR );
-		    }
-		    if ( is_dir( HERMES_ROOT_DIRECTORY       . 'config' )) {
-		        define( 'HERMES_CONFIG_DIRECTORY',      HERMES_ROOT_DIRECTORY . 'config'    . DIRECTORY_SEPARATOR );
-		    }
-		# Houdini
-		    if ( is_dir( TP_VENDOR_DIRECTORY       . 'houdini' )) {
-		        define( 'HOUDINI_ROOT_DIRECTORY',      TP_VENDOR_DIRECTORY . 'houdini'    . DIRECTORY_SEPARATOR );
-		    } elseif ( is_dir( TP_VENDOR_DIRECTORY . 'Houdini' )) {
-		        define( 'HOUDINI_ROOT_DIRECTORY',      TP_VENDOR_DIRECTORY . 'Houdini'    . DIRECTORY_SEPARATOR );
-		    }
-		    if ( is_dir( HOUDINI_ROOT_DIRECTORY       . 'config' )) {
-		        define( 'HOUDINI_CONFIG_DIRECTORY',      HOUDINI_ROOT_DIRECTORY . 'config'    . DIRECTORY_SEPARATOR );
-		    }
-	// Shared Directories
-		define( 'BIN_DIRECTORY',                  APP_ROOT_DIRECTORY  . 'bin'               . DIRECTORY_SEPARATOR );
-		define( 'VIEW_DIRECTORY',                 APP_DIRECTORY       . 'views'             . DIRECTORY_SEPARATOR );
-			define( 'ERRORS_DIRECTORY',           VIEW_DIRECTORY      . 'errors'            . DIRECTORY_SEPARATOR );
-		define( 'CLASSES_DIRECTORY',              APP_DIRECTORY       . 'classes'           . DIRECTORY_SEPARATOR );
-		define( 'FUNCTIONS_DIRECTORY',            APP_DIRECTORY       . 'functions'         . DIRECTORY_SEPARATOR );
-		define( 'RESOURCES_DIRECTORY',            APP_DIRECTORY       . 'resources'         . DIRECTORY_SEPARATOR );
-		define( 'TEMPLATE_DIRECTORY',             APP_DIRECTORY       . 'templates'         . DIRECTORY_SEPARATOR );
-		define( 'UPLOAD_DIRECTORY',               APP_ROOT_DIRECTORY  . 'uploads'           . DIRECTORY_SEPARATOR );
-			define( 'IMAGE_UPLOAD_DIRECTORY',     UPLOAD_DIRECTORY    . 'images'            . DIRECTORY_SEPARATOR );
-	// Files
-		define( 'COMPOSER_JSON_LOCATION',         APP_ROOT_DIRECTORY  . 'composer.json' );
-		define( 'COMPOSER_LOCK_LOCATION',         APP_ROOT_DIRECTORY  . 'composer.lock' );
-		define( 'CONFIG_JSON',                    CONFIG_DIRECTORY    . 'config.json' );
-	// Other
-		define( 'EMAIL_FROM_EMAIL',               'noreply@localohost.com' );
-	// Sessions
-		define( 'DEFAULT_SESSION_PREFIX',         'TP_' );
-	// Token
-		define( 'DEFAULT_TOKEN_NAME',             'TP_SESSION_TOKEN' );
+        define( 'CANARY_ENABLED', true );
+        define( 'DEBUG_EMAIL', 'webmaster@' . $_SERVER['HTTP_HOST'] );
+        define( 'HERMES_REDIRECTS_ENABLED', true );
+        define( 'RENDERING_ENABLED', true );
+        define( 'CANARY_TRACE_ENABLED', false );
+        define( 'CANARY_DEBUG_TO_CONSOLE', false );
+        define( 'CANARY_DEBUG_TO_FILE', true );
+    // Directories
+        if ( ! defined( 'VENDOR_DIRECTORY' ) ) {
+            define( 'VENDOR_DIRECTORY',               APP_ROOT_DIRECTORY  . 'vendor'            . DIRECTORY_SEPARATOR );
+        }
+        if ( is_dir( VENDOR_DIRECTORY . 'thetempusproject' )) {
+            define( 'TP_VENDOR_DIRECTORY',        VENDOR_DIRECTORY    . 'thetempusproject'  . DIRECTORY_SEPARATOR );
+        } elseif ( is_dir( VENDOR_DIRECTORY . 'TheTempusProject' )) {
+            define( 'TP_VENDOR_DIRECTORY',        VENDOR_DIRECTORY    . 'TheTempusProject'  . DIRECTORY_SEPARATOR );
+        } else {
+            define( 'TP_VENDOR_DIRECTORY',        VENDOR_DIRECTORY);
+        }
+        # Bedrock
+            if ( is_dir( TP_VENDOR_DIRECTORY       . 'tempusprojectcore' )) {
+                define( 'BEDROCK_ROOT_DIRECTORY',     TP_VENDOR_DIRECTORY . 'tempusprojectcore' . DIRECTORY_SEPARATOR );
+            } elseif ( is_dir( TP_VENDOR_DIRECTORY . 'TempusProjectCore' )) {
+                define( 'BEDROCK_ROOT_DIRECTORY',     TP_VENDOR_DIRECTORY . 'TempusProjectCore' . DIRECTORY_SEPARATOR );
+            } elseif ( is_dir( TP_VENDOR_DIRECTORY . 'bedrock' )) {
+                define( 'BEDROCK_ROOT_DIRECTORY',     TP_VENDOR_DIRECTORY . 'bedrock'           . DIRECTORY_SEPARATOR );
+            } elseif ( is_dir( TP_VENDOR_DIRECTORY . 'Bedrock' )) {
+                define( 'BEDROCK_ROOT_DIRECTORY',     TP_VENDOR_DIRECTORY . 'Bedrock'           . DIRECTORY_SEPARATOR );
+            }
+            if ( is_dir( BEDROCK_ROOT_DIRECTORY       . 'config' )) {
+                define( 'BEDROCK_CONFIG_DIRECTORY',      BEDROCK_ROOT_DIRECTORY . 'config'    . DIRECTORY_SEPARATOR );
+            }
+        # Canary
+            if ( is_dir( TP_VENDOR_DIRECTORY       . 'tempusdebugger' )) {
+                define( 'CANARY_ROOT_DIRECTORY',      TP_VENDOR_DIRECTORY . 'tempusdebugger'    . DIRECTORY_SEPARATOR );
+            } elseif ( is_dir( TP_VENDOR_DIRECTORY . 'TempusDebugger' )) {
+                define( 'CANARY_ROOT_DIRECTORY',      TP_VENDOR_DIRECTORY . 'TempusDebugger'    . DIRECTORY_SEPARATOR );
+            } elseif ( is_dir( TP_VENDOR_DIRECTORY . 'canary' )) {
+                define( 'CANARY_ROOT_DIRECTORY',      TP_VENDOR_DIRECTORY . 'canary'            . DIRECTORY_SEPARATOR );
+            } elseif ( is_dir( TP_VENDOR_DIRECTORY . 'Canary' )) {
+                define( 'CANARY_ROOT_DIRECTORY',      TP_VENDOR_DIRECTORY . 'Canary'            . DIRECTORY_SEPARATOR );
+            }
+            if ( is_dir( CANARY_ROOT_DIRECTORY       . 'config' )) {
+                define( 'CANARY_CONFIG_DIRECTORY',      CANARY_ROOT_DIRECTORY . 'config'    . DIRECTORY_SEPARATOR );
+            }
+        # Hermes
+            if ( is_dir( TP_VENDOR_DIRECTORY       . 'hermes' )) {
+                define( 'HERMES_ROOT_DIRECTORY',      TP_VENDOR_DIRECTORY . 'hermes'    . DIRECTORY_SEPARATOR );
+            } elseif ( is_dir( TP_VENDOR_DIRECTORY . 'Hermes' )) {
+                define( 'HERMES_ROOT_DIRECTORY',      TP_VENDOR_DIRECTORY . 'Hermes'    . DIRECTORY_SEPARATOR );
+            }
+            if ( is_dir( HERMES_ROOT_DIRECTORY       . 'config' )) {
+                define( 'HERMES_CONFIG_DIRECTORY',      HERMES_ROOT_DIRECTORY . 'config'    . DIRECTORY_SEPARATOR );
+            }
+        # Houdini
+            if ( is_dir( TP_VENDOR_DIRECTORY       . 'houdini' )) {
+                define( 'HOUDINI_ROOT_DIRECTORY',      TP_VENDOR_DIRECTORY . 'houdini'    . DIRECTORY_SEPARATOR );
+            } elseif ( is_dir( TP_VENDOR_DIRECTORY . 'Houdini' )) {
+                define( 'HOUDINI_ROOT_DIRECTORY',      TP_VENDOR_DIRECTORY . 'Houdini'    . DIRECTORY_SEPARATOR );
+            }
+            if ( is_dir( HOUDINI_ROOT_DIRECTORY       . 'config' )) {
+                define( 'HOUDINI_CONFIG_DIRECTORY',      HOUDINI_ROOT_DIRECTORY . 'config'    . DIRECTORY_SEPARATOR );
+            }
+    // Shared Directories
+        define( 'BIN_DIRECTORY',                  APP_ROOT_DIRECTORY  . 'bin'               . DIRECTORY_SEPARATOR );
+        define( 'VIEW_DIRECTORY',                 APP_DIRECTORY       . 'views'             . DIRECTORY_SEPARATOR );
+            define( 'ERRORS_DIRECTORY',           VIEW_DIRECTORY      . 'errors'            . DIRECTORY_SEPARATOR );
+        define( 'CLASSES_DIRECTORY',              APP_DIRECTORY       . 'classes'           . DIRECTORY_SEPARATOR );
+        define( 'FUNCTIONS_DIRECTORY',            APP_DIRECTORY       . 'functions'         . DIRECTORY_SEPARATOR );
+        define( 'RESOURCES_DIRECTORY',            APP_DIRECTORY       . 'resources'         . DIRECTORY_SEPARATOR );
+        define( 'TEMPLATE_DIRECTORY',             APP_DIRECTORY       . 'templates'         . DIRECTORY_SEPARATOR );
+        define( 'UPLOAD_DIRECTORY',               APP_ROOT_DIRECTORY  . 'uploads'           . DIRECTORY_SEPARATOR );
+            define( 'IMAGE_UPLOAD_DIRECTORY',     UPLOAD_DIRECTORY    . 'images'            . DIRECTORY_SEPARATOR );
+    // Files
+        define( 'COMPOSER_JSON_LOCATION',         APP_ROOT_DIRECTORY  . 'composer.json' );
+        define( 'COMPOSER_LOCK_LOCATION',         APP_ROOT_DIRECTORY  . 'composer.lock' );
+        define( 'CONFIG_JSON',                    CONFIG_DIRECTORY    . 'config.json' );
+    // Other
+        define( 'EMAIL_FROM_EMAIL',               'noreply@localohost.com' );
+    // Sessions
+        define( 'DEFAULT_SESSION_PREFIX',         'TP_' );
+    // Token
+        define( 'DEFAULT_TOKEN_NAME',             'TP_SESSION_TOKEN' );
 # Tell the app; all constants have been loaded
-	define( 'TEMPUS_PROJECT_CONSTANTS_LOADED',    true );
+    define( 'TEMPUS_PROJECT_CONSTANTS_LOADED',    true );
--- a/app/models/group.php
+++ b/app/models/group.php
@ -12,7 +12,7 @@
 namespace TheTempusProject\Models;

 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\Permissions;
 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Input;
--- a/app/models/log.php
+++ b/app/models/log.php
@ -16,7 +16,7 @@ use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Classes\CustomException;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Classes\DatabaseModel;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;

 class Log extends DatabaseModel {
    public $tableName = 'logs';
--- a/app/models/routes.php
+++ b/app/models/routes.php
@ -12,7 +12,7 @@
 namespace TheTempusProject\Models;

 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;

 class Routes extends DatabaseModel {
--- a/app/models/sessions.php
+++ b/app/models/sessions.php
@ -16,7 +16,7 @@ namespace TheTempusProject\Models;

 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Functions\Code;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Bedrock\Functions\Session;
 use TheTempusProject\Bedrock\Functions\Cookie;
 use TheTempusProject\Classes\DatabaseModel;
--- a/app/models/user.php
+++ b/app/models/user.php
@ -16,7 +16,7 @@
 namespace TheTempusProject\Models;

 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Bedrock\Functions\Hash;
 use TheTempusProject\Bedrock\Functions\Session;
 use TheTempusProject\Bedrock\Functions\Code;
--- a/app/plugins/blog/controllers/blog.php
+++ b/app/plugins/blog/controllers/blog.php
@ -13,7 +13,7 @@
 namespace TheTempusProject\Controllers;

 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Bedrock\Functions\Input;
 use TheTempusProject\Houdini\Classes\Components;
 use TheTempusProject\Houdini\Classes\Issues;
--- a/app/plugins/blog/models/posts.php
+++ b/app/plugins/blog/models/posts.php
@ -12,7 +12,7 @@
 */
 namespace TheTempusProject\Models;

-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Functions\Sanitize;
 use TheTempusProject\Classes\DatabaseModel;
--- a/app/plugins/bookmarks/models/bookmarkViews.php
+++ b/app/plugins/bookmarks/models/bookmarkViews.php
@ -14,7 +14,7 @@ namespace TheTempusProject\Models;

 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Houdini\Classes\Filters;
--- a/app/plugins/bookmarks/models/bookmarks.php
+++ b/app/plugins/bookmarks/models/bookmarks.php
@ -14,7 +14,7 @@ namespace TheTempusProject\Models;

 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Houdini\Classes\Filters;
--- a/app/plugins/bookmarks/models/folders.php
+++ b/app/plugins/bookmarks/models/folders.php
@ -14,7 +14,7 @@ namespace TheTempusProject\Models;

 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Houdini\Classes\Filters;
--- a/app/plugins/bugreport/models/bugreport.php
+++ b/app/plugins/bugreport/models/bugreport.php
@ -14,7 +14,7 @@ namespace TheTempusProject\Models;

 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Classes\Config;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Bedrock\Classes\CustomException;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\Plugins\Bugreport as Plugin;
--- a/app/plugins/bugtracker/models/bugtracker.php
+++ b/app/plugins/bugtracker/models/bugtracker.php
@ -14,7 +14,7 @@ namespace TheTempusProject\Models;

 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Classes\Config;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Bedrock\Classes\CustomException;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
--- a/app/plugins/calendar/models/calendars.php
+++ b/app/plugins/calendar/models/calendars.php
@ -15,7 +15,7 @@ namespace TheTempusProject\Models;
 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Functions\Date;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Houdini\Classes\Filters;
--- a/app/plugins/calendar/models/events.php
+++ b/app/plugins/calendar/models/events.php
@ -14,14 +14,14 @@ namespace TheTempusProject\Models;

 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Houdini\Classes\Filters;
 use TheTempusProject\Models\Calendars;
 use TheTempusProject\Bedrock\Classes\CustomException;
 use TheTempusProject\Bedrock\Functions\Date;
-use TheTempusProject\Houdini\Classes\Pagination;
+use TheTempusProject\Bedrock\Classes\Pagination;

 class Events extends DatabaseModel {
    public $tableName = 'events';
--- a/app/plugins/chat/controllers/chat.php
+++ b/app/plugins/chat/controllers/chat.php
@ -26,7 +26,7 @@ use TheTempusProject\Models\Upload as UploadModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Houdini\Classes\Components;
 use TheTempusProject\Houdini\Classes\Template;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;

 class Chat extends Controller {
    protected static $chat;
--- a/app/plugins/chat/models/chat.php
+++ b/app/plugins/chat/models/chat.php
@ -16,7 +16,7 @@ namespace TheTempusProject\Models;

 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Houdini\Classes\Filters;
--- a/app/plugins/comments/models/comments.php
+++ b/app/plugins/comments/models/comments.php
@ -14,7 +14,7 @@
 namespace TheTempusProject\Models;

 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Houdini\Classes\Views;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
--- a/app/plugins/contacts/models/contact.php
+++ b/app/plugins/contacts/models/contact.php
@ -12,7 +12,7 @@
 */
 namespace TheTempusProject\Models;

-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;

--- a/app/plugins/contacts/models/phonebook.php
+++ b/app/plugins/contacts/models/phonebook.php
@ -14,7 +14,7 @@ namespace TheTempusProject\Models;

 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Houdini\Classes\Filters;
--- a/app/plugins/dashboards/models/dashboards.php
+++ b/app/plugins/dashboards/models/dashboards.php
@ -16,7 +16,7 @@ namespace TheTempusProject\Models;

 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\Plugins\Dashboards as Plugin;

--- a/app/plugins/dice/models/dicehistory.php
+++ b/app/plugins/dice/models/dicehistory.php
@ -16,7 +16,7 @@ namespace TheTempusProject\Models;

 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\Plugins\Feedback as Plugin;
 use TheTempusProject\TheTempusProject as App;
--- a/app/plugins/dnd/models/characters.php
+++ b/app/plugins/dnd/models/characters.php
@ -14,7 +14,7 @@ namespace TheTempusProject\Models;
 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Functions\Date;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Houdini\Classes\Filters;
--- a/app/plugins/dnd/models/classes.php
+++ b/app/plugins/dnd/models/classes.php
@ -11,7 +11,7 @@
 */
 namespace TheTempusProject\Models;

-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Bedrock\Classes\CustomException;
--- a/app/plugins/dnd/models/feats.php
+++ b/app/plugins/dnd/models/feats.php
@ -11,7 +11,7 @@
 */
 namespace TheTempusProject\Models;

-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Bedrock\Classes\CustomException;
--- a/app/plugins/dnd/models/gods.php
+++ b/app/plugins/dnd/models/gods.php
@ -11,7 +11,7 @@
 */
 namespace TheTempusProject\Models;

-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Bedrock\Classes\CustomException;
--- a/app/plugins/dnd/models/items.php
+++ b/app/plugins/dnd/models/items.php
@ -11,7 +11,7 @@
 */
 namespace TheTempusProject\Models;

-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Bedrock\Classes\CustomException;
--- a/app/plugins/dnd/models/languages.php
+++ b/app/plugins/dnd/models/languages.php
@ -11,7 +11,7 @@
 */
 namespace TheTempusProject\Models;

-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Bedrock\Classes\CustomException;
--- a/app/plugins/dnd/models/monsters.php
+++ b/app/plugins/dnd/models/monsters.php
@ -11,7 +11,7 @@
 */
 namespace TheTempusProject\Models;

-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Bedrock\Classes\CustomException;
--- a/app/plugins/dnd/models/races.php
+++ b/app/plugins/dnd/models/races.php
@ -11,7 +11,7 @@
 */
 namespace TheTempusProject\Models;

-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Bedrock\Classes\CustomException;
--- a/app/plugins/dnd/models/skills.php
+++ b/app/plugins/dnd/models/skills.php
@ -11,7 +11,7 @@
 */
 namespace TheTempusProject\Models;

-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Bedrock\Classes\CustomException;
--- a/app/plugins/dnd/models/sourcebooks.php
+++ b/app/plugins/dnd/models/sourcebooks.php
@ -11,7 +11,7 @@
 */
 namespace TheTempusProject\Models;

-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Bedrock\Classes\CustomException;
--- a/app/plugins/dnd/models/spells.php
+++ b/app/plugins/dnd/models/spells.php
@ -11,7 +11,7 @@
 */
 namespace TheTempusProject\Models;

-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Bedrock\Classes\CustomException;
--- a/app/plugins/dnd/models/traits.php
+++ b/app/plugins/dnd/models/traits.php
@ -11,7 +11,7 @@
 */
 namespace TheTempusProject\Models;

-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Bedrock\Classes\CustomException;
--- a/app/plugins/feedback/models/feedback.php
+++ b/app/plugins/feedback/models/feedback.php
@ -16,7 +16,7 @@ namespace TheTempusProject\Models;

 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\Plugins\Feedback as Plugin;

--- a/app/plugins/fileshare/models/upload.php
+++ b/app/plugins/fileshare/models/upload.php
@ -14,7 +14,7 @@ namespace TheTempusProject\Models;

 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Bedrock\Classes\CustomException;
--- a/app/plugins/initiativetracker/models/inithistory.php
+++ b/app/plugins/initiativetracker/models/inithistory.php
@ -16,7 +16,7 @@ namespace TheTempusProject\Models;

 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\Plugins\Feedback as Plugin;
 use TheTempusProject\TheTempusProject as App;
--- a/app/plugins/members/models/members.php
+++ b/app/plugins/members/models/members.php
@ -12,7 +12,7 @@
 */
 namespace TheTempusProject\Models;

-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Functions\Sanitize;
 use TheTempusProject\Classes\DatabaseModel;
--- a/app/plugins/members/models/membershipAssociations.php
+++ b/app/plugins/members/models/membershipAssociations.php
@ -13,7 +13,7 @@

 namespace TheTempusProject\Models;

-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Functions\Sanitize;
 use TheTempusProject\Classes\DatabaseModel;
--- a/app/plugins/members/models/membershipRecords.php
+++ b/app/plugins/members/models/membershipRecords.php
@ -12,7 +12,7 @@
 */
 namespace TheTempusProject\Models;

-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Functions\Sanitize;
 use TheTempusProject\Classes\DatabaseModel;
--- a/app/plugins/messages/models/message.php
+++ b/app/plugins/messages/models/message.php
@ -14,7 +14,7 @@ namespace TheTempusProject\Models;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\Houdini\Classes\Components;
 use TheTempusProject\Houdini\Classes\Views;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Functions\Sanitize;
 use TheTempusProject\TheTempusProject as App;
--- a/app/plugins/notes/models/notebooks.php
+++ b/app/plugins/notes/models/notebooks.php
@ -14,7 +14,7 @@ namespace TheTempusProject\Models;

 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Houdini\Classes\Filters;
--- a/app/plugins/notes/models/notes.php
+++ b/app/plugins/notes/models/notes.php
@ -14,7 +14,7 @@ namespace TheTempusProject\Models;

 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Houdini\Classes\Filters;
--- a/app/plugins/notifications/models/notification.php
+++ b/app/plugins/notifications/models/notification.php
@ -16,7 +16,7 @@ namespace TheTempusProject\Models;

 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\Plugins\Feedback as Plugin;
 use TheTempusProject\TheTempusProject as App;
--- a/app/plugins/polls/models/poll.php
+++ b/app/plugins/polls/models/poll.php
@ -1,17 +1,3 @@
-
-
-
-
-
-
-
-closeNow
-
-
-
-listSitePolls
-
-
 <?php
 /**
 * app/plugins/feedback/models/feedback.php
@ -30,7 +16,7 @@ namespace TheTempusProject\Models;

 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\Plugins\Feedback as Plugin;

@ -87,3 +73,16 @@ class Feedback extends DatabaseModel {
        return self::$db->lastId();
    }
 }
+
+
+
+
+
+
+
+
+// closeNow
+
+
+
+// listSitePolls
--- a/app/plugins/polls/models/vote.php
+++ b/app/plugins/polls/models/vote.php
@ -16,7 +16,7 @@ namespace TheTempusProject\Models;

 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\Plugins\Feedback as Plugin;

--- a/app/plugins/reviews/models/review.php
+++ b/app/plugins/reviews/models/review.php
@ -14,7 +14,7 @@ namespace TheTempusProject\Models;

 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\Plugins\Reviews as Plugin;
 use TheTempusProject\TheTempusProject as App;
--- a/app/plugins/reviews/models/reviewcategory.php
+++ b/app/plugins/reviews/models/reviewcategory.php
@ -14,7 +14,7 @@ namespace TheTempusProject\Models;

 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\Plugins\Reviews as Plugin;
 use TheTempusProject\TheTempusProject as App;
--- a/app/plugins/subscribe/models/subscribe.php
+++ b/app/plugins/subscribe/models/subscribe.php
@ -14,7 +14,7 @@ namespace TheTempusProject\Models;

 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Functions\Code;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;

 class Subscribe extends DatabaseModel {
--- a/app/plugins/suggestions/models/suggestions.php
+++ b/app/plugins/suggestions/models/suggestions.php
@ -14,7 +14,7 @@ namespace TheTempusProject\Models;

 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Classes\Config;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Bedrock\Classes\CustomException;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
--- a/app/plugins/tablefinder/models/players.php
+++ b/app/plugins/tablefinder/models/players.php
@ -14,7 +14,7 @@ namespace TheTempusProject\Models;

 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\Plugins\Tablefinder as Plugin;

--- a/app/plugins/tablefinder/models/tables.php
+++ b/app/plugins/tablefinder/models/tables.php
@ -14,7 +14,7 @@ namespace TheTempusProject\Models;

 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\Plugins\Tablefinder as Plugin;

--- a/app/plugins/testing/models/testing.php
+++ b/app/plugins/testing/models/testing.php
@ -14,7 +14,7 @@ namespace TheTempusProject\Models;

 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Houdini\Classes\Filters;
--- a/app/plugins/timers/controllers/timers.php
+++ b/app/plugins/timers/controllers/timers.php
@ -22,7 +22,7 @@ use TheTempusProject\Bedrock\Functions\Input;
 use TheTempusProject\Houdini\Classes\Issues;
 use TheTempusProject\Classes\Forms;
 use TheTempusProject\Houdini\Classes\Template;
-use TheTempusProject\Bedrock\Bedrock;
+use TheTempusProject\Bedrock\Bin\Bedrock;

 class Timers extends Controller {
    protected static $timers;
--- a/app/plugins/timers/models/timers.php
+++ b/app/plugins/timers/models/timers.php
@ -14,7 +14,7 @@ namespace TheTempusProject\Models;

 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Classes\Config;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Bedrock\Classes\CustomException;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
--- a/app/plugins/todo/models/tasklists.php
+++ b/app/plugins/todo/models/tasklists.php
@ -14,7 +14,7 @@ namespace TheTempusProject\Models;

 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Classes\Config;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Bedrock\Classes\CustomException;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\Plugins\Bugreport as Plugin;
--- a/app/plugins/todo/models/tasks.php
+++ b/app/plugins/todo/models/tasks.php
@ -14,7 +14,7 @@ namespace TheTempusProject\Models;

 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Classes\Config;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Bedrock\Classes\CustomException;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\Plugins\Bugreport as Plugin;
--- a/app/plugins/updates/models/update.php
+++ b/app/plugins/updates/models/update.php
@ -14,7 +14,7 @@ namespace TheTempusProject\Models;

 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\Plugins\Updates as Plugin;
 use TheTempusProject\TheTempusProject as App;
--- a/app/resources/controllers/example.php
+++ b/app/resources/controllers/example.php
@ -14,7 +14,7 @@ namespace TheTempusProject\Controllers;
 use TheTempusProject\Classes\Controller;
 use TheTempusProject\Houdini\Classes\Template;
 use TheTempusProject\Houdini\Classes\Views;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;

 // The new controller must extend the default controller class or some functionality will be lost.
 class Example extends Controller {
--- a/bin/autoload.php
+++ b/bin/autoload.php
@ -17,80 +17,21 @@ use TheTempusProject\Houdini\Classes\Template;
 use TheTempusProject\Houdini\Classes\Views;

 // Basic constants needed for loading files
-if ( ! defined( 'APP_SPACE' ) ) {
-    define( 'APP_SPACE', __NAMESPACE__ );
-}
-if ( ! defined( 'APP_ROOT_DIRECTORY' ) ) {
-    define( 'APP_ROOT_DIRECTORY', dirname( __DIR__ ) . DIRECTORY_SEPARATOR );
-}
-if ( ! defined( 'CONFIG_DIRECTORY' ) ) {
-    define( 'CONFIG_DIRECTORY', APP_ROOT_DIRECTORY . 'app' . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR );
-}
+define( 'APP_ROOT_DIRECTORY', dirname( __DIR__ ) . DIRECTORY_SEPARATOR );
+define( 'CONFIG_DIRECTORY', APP_ROOT_DIRECTORY . 'app' . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR );

 // App Constants
 if ( ! defined( 'TEMPUS_PROJECT_CONSTANTS_LOADED' ) ) {
    require_once CONFIG_DIRECTORY . 'constants.php';
 }

-// Hermes Constants
-if ( ! defined( 'HERMES_CONSTANTS_LOADED' ) ) {
-    if ( defined( 'HERMES_CONFIG_DIRECTORY' ) ) {
-        require_once HERMES_CONFIG_DIRECTORY . 'constants.php';
-    }
-}
-
-// Bedrock Constants
-if ( ! defined( 'BEDROCK_CONSTANTS_LOADED' ) ) {
-    if ( defined( 'BEDROCK_CONFIG_DIRECTORY' ) ) {
-        require_once BEDROCK_CONFIG_DIRECTORY . 'constants.php';
-    }
-}
-
-// Canary Constants
-if ( ! defined( 'CANARY_CONSTANTS_LOADED' ) ) {
-    if ( defined( 'CANARY_CONFIG_DIRECTORY' ) ) {
-        require_once CANARY_CONFIG_DIRECTORY . 'constants.php';
-    }
-}
-
-// Require common functions
-require_once FUNCTIONS_DIRECTORY . 'common.php';
-
 // Determine which autoloader to sue
 if ( file_exists( VENDOR_DIRECTORY . 'autoload.php' ) ) {
    // Composer Autoloader
    require_once VENDOR_DIRECTORY . 'autoload.php';
    define( 'VENDOR_AUTOLOADED', true );
 } else {
-    // Hermes Autoloader (Autoloader)
-    if ( ! defined( 'HERMES_AUTOLOADED' ) ) {
-        if ( defined( 'HERMES_ROOT_DIRECTORY' ) ) {
-            require_once HERMES_ROOT_DIRECTORY . 'bin' . DIRECTORY_SEPARATOR . 'autoload.php';
-        }
-    }
-    // Canary Autoloader (Debugging)
-    if ( ! defined( 'CANARY_AUTOLOADED' ) ) {
-        if ( defined( 'CANARY_ROOT_DIRECTORY' ) ) {
-            require_once CANARY_ROOT_DIRECTORY . 'bin' . DIRECTORY_SEPARATOR . 'autoload.php';
-        }
-    }
-    // Bedrock Autoloader (Core Functionality)
-    if ( ! defined( 'BEDROCK_AUTOLOADED' ) ) {
-        if ( defined( 'BEDROCK_ROOT_DIRECTORY' ) ) {
-            require_once BEDROCK_ROOT_DIRECTORY . 'bin' . DIRECTORY_SEPARATOR . 'autoload.php';
-        }
-    }
-    // Houdini Autoloader (Frontend Driver)
-    if ( ! defined( 'HOUDINI_AUTOLOADED' ) ) {
-        if ( defined( 'HOUDINI_ROOT_DIRECTORY' ) ) {
-            require_once HOUDINI_ROOT_DIRECTORY . 'bin' . DIRECTORY_SEPARATOR . 'autoload.php';
-        }
-    }
-    // App Autoloader
-    if ( file_exists( APP_DIRECTORY . 'autoload.php' ) ) {
-        require_once APP_DIRECTORY . 'autoload.php';
-    }
-    define( 'VENDOR_AUTOLOADED', false );
+    sideLoad();
 }

 if ( class_exists( 'TheTempusProject\Hermes\Classes\Autoloader' ) && TEMPUS_PROJECT_CONSTANTS_LOADED ) {
@ -164,7 +105,7 @@ function ttp_autoload() {
                        require_once( $currentFolder );
                        break;
                    case 'config':
-                        if (file_exists($currentFolder . 'constants.php')) {
+                        if ( file_exists( $currentFolder . 'constants.php' ) ) {
                            require_once( $currentFolder . 'constants.php' );
                        }
                        break;
@ -175,4 +116,60 @@ function ttp_autoload() {
    define('TEMPUS_PROJECT_AUTOLOADED', true);
 }

+function sideLoad() {
+    // Hermes Constants
+    if ( ! defined( 'HERMES_CONSTANTS_LOADED' ) ) {
+        if ( defined( 'HERMES_CONFIG_DIRECTORY' ) ) {
+            require_once HERMES_CONFIG_DIRECTORY . 'constants.php';
+        }
+    }
+
+    // Bedrock Constants
+    if ( ! defined( 'BEDROCK_CONSTANTS_LOADED' ) ) {
+        if ( defined( 'BEDROCK_CONFIG_DIRECTORY' ) ) {
+            require_once BEDROCK_CONFIG_DIRECTORY . 'constants.php';
+        }
+    }
+
+    // Canary Constants
+    if ( ! defined( 'CANARY_CONSTANTS_LOADED' ) ) {
+        if ( defined( 'CANARY_CONFIG_DIRECTORY' ) ) {
+            require_once CANARY_CONFIG_DIRECTORY . 'constants.php';
+        }
+    }
+
+    // Require common functions
+    require_once FUNCTIONS_DIRECTORY . 'common.php';
+
+    // Hermes Autoloader (Autoloader)
+    if ( ! defined( 'HERMES_AUTOLOADED' ) ) {
+        if ( defined( 'HERMES_ROOT_DIRECTORY' ) ) {
+            require_once HERMES_ROOT_DIRECTORY . 'bin' . DIRECTORY_SEPARATOR . 'autoload.php';
+        }
+    }
+
+    // Canary Autoloader (Debugging)
+    if ( ! defined( 'CANARY_AUTOLOADED' ) ) {
+        if ( defined( 'CANARY_ROOT_DIRECTORY' ) ) {
+            require_once CANARY_ROOT_DIRECTORY . 'bin' . DIRECTORY_SEPARATOR . 'autoload.php';
+        }
+    }
+
+    // Bedrock Autoloader (Core Functionality)
+    if ( ! defined( 'BEDROCK_AUTOLOADED' ) ) {
+        if ( defined( 'BEDROCK_ROOT_DIRECTORY' ) ) {
+            require_once BEDROCK_ROOT_DIRECTORY . 'bin' . DIRECTORY_SEPARATOR . 'autoload.php';
+        }
+    }
+
+    // Houdini Autoloader (Frontend Driver)
+    if ( ! defined( 'HOUDINI_AUTOLOADED' ) ) {
+        if ( defined( 'HOUDINI_ROOT_DIRECTORY' ) ) {
+            require_once HOUDINI_ROOT_DIRECTORY . 'bin' . DIRECTORY_SEPARATOR . 'autoload.php';
+        }
+    }
+
+    define( 'VENDOR_AUTOLOADED', false );
+}
+
 require_once 'bin/tempus_project.php';
--- a/bin/tempus_project.php
+++ b/bin/tempus_project.php
@ -13,13 +13,13 @@
 */
 namespace TheTempusProject;

-use TheTempusProject\Bedrock\Bedrock;
+use TheTempusProject\Bedrock\Bin\Bedrock;
 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Input;
 use TheTempusProject\Bedrock\Functions\Session;
 use TheTempusProject\Bedrock\Functions\Cookie;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;

 use TheTempusProject\Hermes\Functions\Redirect;
 use TheTempusProject\Hermes\Functions\Route as Routes;
--- a/composer.json
+++ b/composer.json
@ -28,16 +28,16 @@
    },
    "autoload":
    {
+        "files":
+        [
+            "app/functions/forms.php",
+            "app/functions/common.php"
+        ],
        "classmap":
        [
            "app/classes",
-            "app/functions",
            "app/models"
        ],
-        "files":
-        [
-            "app/config/constants.php"
-        ],
        "psr-4":
        {
            "TheTempusProject\\Bedrock\\": "vendor/thetempusproject/bedrock",
@ -45,6 +45,13 @@
            "TheTempusProject\\Houdini\\": "vendor/thetempusproject/houdini"
        }
    },
+    "scripts":
+    {
+        "post-root-package-install":
+        [
+            "@php -r \"file_exists('docker/.env') || copy('docker/.env.example', '.env');\""
+        ]
+    },
    "config":
    {
        "optimize-autoloader": true,
--- a/composer.lock
+++ b/composer.lock
@ -60,11 +60,11 @@
        },
        {
            "name": "thetempusproject/bedrock",
-            "version": "1.0.1",
+            "version": "1.0.5",
            "source": {
                "type": "git",
                "url": "https://git.thetempusproject.com/the-tempus-project/bedrock",
-                "reference": "570a286c1366e2f1b8705853e562fc0cb62ffae8"
+                "reference": "79f21773c66a4b87e6a172cab3da23029c2441fd"
            },
            "require": {
                "php": ">=8.1.0",
@ -101,15 +101,15 @@
                "framework",
                "mvc"
            ],
-            "time": "2024-08-09T04:39:54+00:00"
+            "time": "2024-08-09T21:18:24+00:00"
        },
        {
            "name": "thetempusproject/canary",
-            "version": "1.0.1",
+            "version": "1.0.3",
            "source": {
                "type": "git",
                "url": "https://git.thetempusproject.com/the-tempus-project/canary",
-                "reference": "7746eb4af73f3eaba040d547904a251bbdab6977"
+                "reference": "289f35cf6b0bcacc4eaba056a11906426c6068fa"
            },
            "require": {
                "php": ">=8.1.0"
@ -144,7 +144,7 @@
                "thetempusproject",
                "tools"
            ],
-            "time": "2024-08-09T04:35:45+00:00"
+            "time": "2024-08-09T21:13:37+00:00"
        },
        {
            "name": "thetempusproject/hermes",
@ -191,11 +191,11 @@
        },
        {
            "name": "thetempusproject/houdini",
-            "version": "1.0.2",
+            "version": "1.0.5",
            "source": {
                "type": "git",
                "url": "https://git.thetempusproject.com/the-tempus-project/houdini",
-                "reference": "008d7d90230f9eee87d8dbe982e55fae433e1337"
+                "reference": "cbaba96d5ee2a3038b8c8b3e34c4b834de03b8f5"
            },
            "require": {
                "php": ">=8.1.0",
@ -231,7 +231,7 @@
                "thetempusproject",
                "tools"
            ],
-            "time": "2024-08-09T04:38:04+00:00"
+            "time": "2024-08-09T21:16:21+00:00"
        },
        {
            "name": "twbs/bootstrap",
--- a/index.php
+++ b/index.php
@ -16,7 +16,7 @@ session_start();

 require_once 'bin/autoload.php';

-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Bedrock\Functions\Input;
 use TheTempusProject\Hermes\Functions\Redirect;
 use TheTempusProject\Hermes\Functions\Route;
--- a/install.php
+++ b/install.php
@ -34,7 +34,7 @@ use TheTempusProject\Houdini\Classes\Components;
 use TheTempusProject\Houdini\Classes\Template;
 use TheTempusProject\Hermes\Functions\Redirect;
 use TheTempusProject\Hermes\Functions\Route;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;

 class Install extends Controller {
    private $installer;
@ -207,6 +207,9 @@ class Install extends Controller {
                    ],
                ],
                'database' => [
+                    'dbEnabled' => [
+                        'value' => true,
+                    ],
                    'dbHost' => [
                        'value' => Input::postNull( 'dbHost' ),
                    ],
@ -254,7 +257,7 @@ class Install extends Controller {
            // Apache should have the htaccess now, and Nginx should have been configured this way out of the box
            if ( Route::testRouting() ) {
                Session::flash( 'success', 'Routing is working as expected.' );
-                $this->nextStep( 'models', true );
+                return $this->nextStep( 'models', true );
            } else {
                Issues::add( 'error', 'Could not verify url routing' );
            }
@ -291,7 +294,7 @@ class Install extends Controller {
                Issues::add( 'error', [ 'There was an error with the Installation.' => $this->installer->getErrors() ] );
            } else {
                Session::flash( 'success', [ 'Models Have been installed successfully.' => $this->installer->getErrors() ] );
-                $this->nextStep( 'plugins', true );
+                return $this->nextStep( 'plugins', true );
            }
        } elseif ( Input::exists( 'submit' ) ) {
            Issues::add( 'error', [ 'There was an error with your form.' => Check::userErrors() ] );
@ -326,7 +329,7 @@ class Install extends Controller {
                Issues::add( 'error', ['There was an error with the Installation.' => $this->installer->getErrors()] );
            } else {
                Session::flash( 'success', [ 'Plugins Have been installed successfully.' => $this->installer->getErrors() ] );
-                $this->nextStep( 'resources', true );
+                return $this->nextStep( 'resources', true );
            }
        } elseif ( Input::exists( 'submit' ) ) {
            Issues::add( 'error', ['There was an error with your form.' => Check::userErrors()] );
@ -361,7 +364,7 @@ class Install extends Controller {
                Issues::add( 'error', ['There was an error with the Installation.' => $this->installer->getErrors()] );
            } else {
                Session::flash( 'success', ['Resources have been installed successfully.' => $this->installer->getErrors()] );
-                $this->nextStep( 'user', true );
+                return $this->nextStep( 'user', true );
            }
        } elseif ( Input::exists( 'submit' ) ) {
            Issues::add( 'error', ['There was an error with your form.' => Check::userErrors()] );
Author	SHA1	Message	Date
Joey Kimsey	136e85dd14	install bugfix	2024-08-09 18:00:56 -04:00
Joey Kimsey	2fc3338d0f	poll bugfix	2024-08-09 17:58:30 -04:00
Joey Kimsey	aba39575fa	updates	2024-08-09 17:20:00 -04:00
Joey Kimsey	508c25c111	more changes to support composer usage	2024-08-09 02:24:28 -04:00
Joey Kimsey	6cf4594622	composer updates	2024-08-09 01:25:21 -04:00
Joey Kimsey	0aa1b52a6d	code fixes to support composer	2024-08-09 01:05:20 -04:00
Joey Kimsey	d48e77e78d	update install script to make docker smoother	2024-08-09 00:47:45 -04:00