composer bump

mobile-friendly ui updates
admin user-edit bugfix
file cleanup
added searchFields
add blog search
remove unused code
add maintenance mode config

.gitignore

@@ -61,4 +61,7 @@ logs/*
 .vscode/
 mail.log
 vendor/canary/logs/*
-docker/.env
+.env
+components/*
+mailhog.log
+uploads/*

.gitlab-ci.yml

@@ -0,0 +1,74 @@
+stages:
+  - prepare
+  - build
+  - test
+  - update
+  - deploy
+
+variables:
+  TIMEZONE: "America/New_York" # For the system in general
+  DATE_TIMEZONE: ${TIMEZONE} # For PHP
+
+  GIT_DEPTH: 1
+  GITLAB_API_URL: ${CI_API_V4_URL}
+  TARGET_BRANCH: ${CI_COMMIT_REF_NAME} # This is the branch chosen in the `Pipeline Schedule`
+  TARGET_REMOTE: "https://${GITLAB_USERNAME}:${GITLAB_ACCESS_TOKEN}@${CI_SERVER_HOST}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}.git"
+
+  # These could/should be overridden in an extending job:
+  UPDATE_BRANCH_PREFIX: "update_PHP_deps_" # Used for the update branch name, it will be followed by the datetime
+  GIT_USER: "DependBot" # Used for the update commit
+  GIT_EMAIL: "webmaster@thetempusproject.com" # Used for the update commit
+  GITLAB_USERNAME: "root" # Used for pushing the new branch and opening the MR
+  GITLAB_ACCESS_TOKEN: "glpat-PKEmivGtBfbz4DVPdhzk" # Used for pushing the new branch and opening the MR
+  MERGE_IF_SUCCESSFUL: "true" # Set to true, to merge automatically if the pipeline succeeds
+  SECONDS_BETWEEN_POOLING: 10 # Nbr of seconds between checking if the MR pipeline is successful, so then it will merge
+  JOB_GIT_FLAGS: ""
+  JOB_CURL_FLAGS: ""
+  JOB_COMPOSER_FLAGS: ""
+
+composer_update:
+  stage: update
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "main"'
+  image: composer:latest
+  interruptible: true # allows to stop the job if a newer pipeline starts, saving resources and allowing new jobs to start because job concurrency is limited
+  script:
+    - git ${JOB_GIT_FLAGS} fetch origin ${TARGET_BRANCH}
+    - git ${JOB_GIT_FLAGS} checkout ${TARGET_BRANCH}
+    - git reset --hard origin/main
+    - git pull --allow-unrelated-histories
+    - export DATE_TIME="$(date '+%Y%m%d%H%M%S')"
+    - export MR_BRANCH="${UPDATE_BRANCH_PREFIX}${DATE_TIME}"
+    - git ${JOB_GIT_FLAGS} checkout -b "${MR_BRANCH}"
+    - composer update ${JOB_COMPOSER_FLAGS}
+    - if [ "$(git diff)" == "" ]; then echo "No updates needed!"; exit 0; fi
+    - export TITLE="Update PHP dependencies [${DATE_TIME}]"
+    - git ${JOB_GIT_FLAGS} commit -a -m "${TITLE}"
+    - git ${JOB_GIT_FLAGS} push "${TARGET_REMOTE}" "${MR_BRANCH}"
+  artifacts:
+    paths:
+      - vendor/
+  cache:
+    key: ${CI_COMMIT_REF_SLUG}
+    paths:
+      - vendor/
+
+prepare:
+  stage: prepare
+  script:
+    - echo "Preparing environment..."
+
+build:
+  stage: build
+  script:
+    - echo "Building the project..."
+
+test:
+  stage: test
+  script:
+    - echo "Running tests..."
+
+deploy:
+  stage: deploy
+  script:
+    - echo "Deploying the project..."

LICENSE

@@ -1,6 +1,10 @@
-MIT License
+Copyright (c) 2024-present Joey Kimsey
 
-Copyright (c) 2024 Joey Kimsey
+Portions of this software are licensed as follows:
+
+* All content residing under the "app/" directory of this repository, excluding "app/plugins/"; is licensed under "Creative Commons: CC BY-SA 4.0 license".
+* All third party components incorporated into The Tempus Project Software including plugins are licensed under the original license provided by the owner of the applicable component.
+* Content outside of the above mentioned directories or restrictions above is available under the "MIT Expat" license as defined below.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,374 +1,131 @@
 # The Tempus Project
 
+_Rapid Prototyping Framework built on PHP utilizing the MVC pattern with a Bootstrap front-end_
 
-need to make a vs battle for dnd. someone makes a truly broken character, we take the base character and hand it to two people and give them some time to figure out how they would break it
+__Developer(s):__
 
-need to track points once a week
+- __Joey Kimsey__ - _Lead Developer_
-
-a huge table tracks points day to day then we add and erase the old data, or move it to historical...
-
-## Rapid Prototyping Framework
-
-### Developer(s): Joey Kimsey
 
 The aim of this project is to provide a simple and stable platform from which to easily add functionality. The goal being the ability to quickly build and test new projects with a lightweight ecosystem to help.
 
-**Notice: This code is in _still_ not production ready. This framework is provided as is, use at your own risk.**
+**Notice: This code is in _still_ not production ready. This framework is provided as is, use at your own risk.**\
 I am working very hard to ensure the system is safe and reliable enough for me to endorse its widespread use. Unfortunately, it still needs a lot of QA and improvements.
 
-Currently I am in the process of testing all the systems in preparation for the first production ready release. The beta is still on-going. If you would like to participate or stay up to date with the latest, you can find more information at: https://TheTempusProject.com/beta
+## Table of contents
+
+[[_TOC_]]
+
+## Find Us
+
+* [DockerHub](https://hub.docker.com/repositories/thetempusproject)
+* [Packagist](https://packagist.org/packages/thetempusproject/)
+* [GitLab](https://git.thetempusproject.com/the-tempus-project/thetempusproject)
+
+## Summary
+
+The Tempus Project is a PHP application utilizing the MVC pattern to serve up simple pages and APIs with minimal effort. It requires a MySQL database to function and is designed to run equally well with nginx or apache powering the webserver. Most of the core functionality is developed in house and provided through dependencies. At this time, the frontend is driven on bootstrap 3 and FontAwesome for simplicity.
 
 ## Features
 
-A User management system with groups, permissions, preferences, registration, and recovery. (All Controlled dynamically via our plugin interface)
+- A Plugin system that allows plug-and-play functionality
-A Plugin system that allows plug-and-play functionality for a huge number of features.
+- A User management system
-Compatibility with both Apache and NGINX.
+    - groups
-Built with Bootstrap with a focus on mobile compatibility.
+    - permissions
-Incredibly easy to set-up, deploy, and develop with.
+    - preferences
+    - registration and recovery
+    (All Controlled dynamically via our plugin interface)
+- Compatibility with both Apache and NGINX
+- Built with Bootstrap with a focus on mobile compatibility
+- Incredibly easy to set-up, deploy, and develop
 
 ## Installation
 
-Preferred method for installation is using composer.
+The preferred method for installation is [Composer](#composer) but special attention has been given to installation and usage [without Composer](#composer).
-
-### Manually
-
-### Docker
 
 ### Composer
 
+The simplest method to start a new project is to use composer to create a new project and automatically clone all the necessary files:
+
+#### via create-project
+
+```
+composer create-project thetempusproject/thetempusproject test-app
+```
+
+#### via clone & install
+
 1. Clone the directory to wherever you want to install the framework.
-2. Open your terminal to the directory you previously cloned the repository.
+`git clone https://git.thetempusproject.com/the-tempus-project/thetempusproject.git <test-app>`
-3. Install using composer:
+1. Open your terminal to the directory you previously cloned the repository.
+`cd <test-app>`
+1. Install using composer:
 `php composer.phar install`
-4. Open your browser and navigate to install.php (it will be in the root directory of your installation)
-5. When prompted, complete the forms and complete the process.
 
-#### Apache
+### Manually
 
-#### NGINX
+1. Clone the directory to wherever you want to install the framework.
+`git clone https://git.thetempusproject.com/the-tempus-project/thetempusproject.git <test-app>`
+1. Open your terminal to the directory you previously cloned the repository.
+`cd <test-app>/`
+1. Clone the dependency directories to the vendor/ folder.
+```
+cd vendor/
+git clone https://git.thetempusproject.com/the-tempus-project/bedrock.git bedrock
+git clone https://git.thetempusproject.com/the-tempus-project/canary.git canary
+git clone https://git.thetempusproject.com/the-tempus-project/hermes.git hermes
+git clone https://git.thetempusproject.com/the-tempus-project/houdini.git houdini
+```
 
-#### Docker-Compose
+__Note:__ The autoloader should automatically detect and use the dependencies, but they need to be sorted into the folders ans shown above.
 
-If you have any trouble with the installation, you can check out our FAQ page on the wiki for answers to common issues.
 
-If you would like a full copy of the project with all of its included dependencies you can find it at https://github.com/TheTempusProject/TempusProjectFull
+## Docker
-Please note this repository is only up to the latest _stable_ release. Please continue to use composer update to get the latest development releases.
 
-**Do not forget to remove install.php once you have finished installation!**
+To enable quick deployment and collaboration The Tempus Project is distributed with the files to build your own docker images or stack with apache or nginx The included `docker-compose.yml` will load up an entire stack including apache and nginx, as well as a MySQL server with phpmyadmin.
 
-#### Currently being developed
+You will need docker installed on your system then you can either download the latest images from DockerHud:
+
+```
+docker pull thetempusproject/ttp-apache
+docker pull thetempusproject/ttp-nginx
+```
+
+Or you can build your own images from this repository. More information can be found in the included README files:
+
+* [Apache Image](docker/ttp-apache/README.md)
+* [Nginx Image](docker/ttp-nginx/README.md)
+
+### Docker-Compose
+
+The Docker stack included here will build new versions of the nginx and apache webserver and launch them in individual containers. It will also create 2 more containers; one for php, and one for phpmyadmin.
+
+```
+docker-compose -f docker-compose.yml up --build -d  --no-cache
+```
+
+__Note:__ If you cloned the repository from git, you will need to copy the `docker/.env.example` to `.env` in the root directory and update the contents before proceeding with docker-compose.
+
+## Contributing
+
+TheTempusProject is an open source project and welcomes community contributions. Please refer to the [Contributing file](CONTRIBUTING.md) for more details.
+
+## License
+
+See the [LICENSE](LICENSE) file for licensing information as it pertains to files in this repository.
+
+## Known Issues
+
+- [ ] The blog plugin should add a welcome post during the installResources step of the installer. It doesn't work right now.
+
+## Currently being developed
 
 - [ ] Adding documentation
-- [ ] Unit tests
+- [ ] Unit testing
 
-#### Future updates
+## Future updates
 
 - [ ] Expansion of PDO to allow different database types
-- [ ] Update installer to account for updates.
+- [ ] Update installer to account for database deltas, allowing easy updating.
 - [ ] Implement uniformity in terms of error reporting, exceptions, logging.
-- [ ] The templating system has gotten too large and needs to be split into its own repo
+- [ ] I want to make an api that allows you to download and install new plugins from a centralized repository
-
+- [ ] i want plugin instalation to be compatible with composer for easier management of added plugins.
-TTP ToDo:
-
-need to integrate new plugins for some moved features
-    canary
-    comments
-    members
-    messages
-        Split inbox and outbox apart
-        split messages from usercp
-    redirects
-
-need to make sure all 'use ' statements are updated to new repo names
-    
-    namespace TempusDebugger; => namespace TheTempusProject\Canary;
-    namespace TheTempusProject\Houdini; => namespace TheTempusProject\houdini;
-    namespace TheTempusProject/TempusTool; => namespace TheTempusProject\Overwatch;
-need a mechanism for handeling config/constants.php in each plugin
-    migrate all 'secondary' constants (constants not used in the default execution of the application) to plugin folders
-
-Perform final F & R for:
-"tpc"
-
-
-
-    need better handeling around blog filters like month and day
-
-split profile from usercp
-
-
-need a way to secure the api
-need a standard way to do apis
-need a way to show parts conditionally like {@if}
-    need
-        if
-        else
-        elseif
-need a way to show something conditionally if a plugin is enabled
-    like {@enabled:comments}
-            {comments}
-            {@enabled}
-
-https://css-tricks.com/drag-and-drop-file-uploading/
-
-https://www.smashingmagazine.com/2018/01/drag-drop-file-uploader-vanilla-js/
-
-
-
-
-
-need to merge both autoloaders into the same one under bin
-need to be able to install multiple database tables for the same plugin
-
-
-rename default.js and .css to main.js/css
-fix where i moved those to the app/css and app/js folders
-
-
-
-make a new template repo/dependency
-make a new Debug repo/dependency
-Fix the plugin
-fix the console logger
-
-add the ability to include js files
-add the ability to include css files as needed
-
- chat should include a config for the refresh timer
-
-
-
-
-and better error handeling for models and plugins
-need to make a singular list function to remove or combine these:
-    listGroupsSimple
-    listPosts
-
-
-
-
-
-
-i need to move everything moderator relateed to comments
-i also need to make sure that moderators can actually moderate
-
-
-
-
-
-the get form html thing should work perfectly with the database array to create hella simple to generate forms for anything
-
-
-
-
-
-
-
-
-
-we are not doing anything with requiredPlugins
-
-
-comments and blog are being manually added in the admin dashboard, this could be a problem when they are disabled
-
-
-
-
-
-
-
-
-
-
-
-removed from blog filter
-commentCount
-
-
-
-need to address the error handler just failing to work
-
-and the exception handler picking up random errors
-
-
-need to revisit all of the form checking and make sure it is apparent to the user when and how they mess something up.
-
-
-many pages are missing descriptions, need to add them
-
-
-https://jsonapi.org/format/
-
-
-need a way for the template system to:
-    switch between the meta-header content types for the sharing info
-        xlarge
-        large
-        etc
-    need better checking around title, meta-image, and descriptions
-        prevent accidently feeding bad images or text to these fields
-    need to manages js and css includes better, and incorperate it into templating system
-
-
-
-
-
-
-
-
-
-
-
-
-the get timezone getdate gettime format functions all need to be migrated to app, stored as static vars and refactored
-in core, am i using htaccess.html or nginx.html anywhere, if not, change them to .example
-Routes -> getHost is using a terrible conditional for docker hosts, need to improve
-Need to test all the filters for the editor stuff
-need the ability for the autoloader to accept specific file name associations
-needs a require_all
-need to re-namespace all classes and functions
-some classes need to be converted to non-static
-some functions need to be converted to more static
-run from the command line
-
-initiated // is in so many controllers, i def want this removed initialized
-tempus_project.php
-    test running commands from cli
-if we move install.php to the bin, it will be unaccessible to the web server??
-    if its unaccessible except theough the index.php router, we don't need to delete it because its unaccessible again
-can i use submodules?
-errors should be able to be customized
-    if its in the app
-should add more logging, esp for admin actions
-need to add self::$pageDescription to many pages
-man, messages is hot garbage, def needs a rework
-need a mechanism to add listeners and events
-ability to restore backups of perms prefs and configs
-if your controller has no index method, you're just SOL
-    a blank page is called and no method is loaded
-Warns should be for failed checks
-add a check for having write access to the config folder and the uploads folder
-and whatever is going to be needed to the plugin downloading
-
-    some configs have been removed and need to be accounted for
-    Unused:
-    ---------------------------
-    Config::getValue('bugReports/sendEmail')
-    Config::getValue('bugReports/emailTemplate')
-    Config::getValue('feedback/sendEmail')
-    Config::getValue('feedback/emailTemplate')
-    Config::getValue('uploads/files')
-    Config::getValue('uploads/images')
-    Config::getValue('uploads/maxFileSize')
-
-
-after all changes are pushed up and available, docker needs to be tested and updated
-    when using composer, the composer page is populated and correct
-
-the config step of install should be checking the db creds
-
-
-
-// need to make notes of other standards as i go to update the contributing document
-// need to cross refrence the configs from core and ttp
-// ensure the resources folder is current
-// document, fix, and remove @TODO's where possible
-Search for cuss words, they make you look stupid
-    fuck
-    shit
-    dam
-    damm
-    damn
-    god
-    ass
-    cunt
-    bitch
-    ffs
-    wtf
-
-
-
-
-had to remove the tracking pixel that was to be used with the contacts form, this will need to be re- added in a future update
-had to remove the rest controller, its currently just unused
-
-// this can be used for the tempus project
-composer create-project laravel/laravel example-app
-
-# Release Checklist
-
-=====================
-- [] Spell check every file.
-- [] All documentation must be reviewed for accuracy.
-- [] If a new year has passed, ensure the year has been updated where applicable.
-- [] If default permissions, preferences, configs, base classes or models have been updated, update resources accordingly.
-- [] 
-
-
-
-
-
-
-
-
-
-
-
-
-
-namespace TempusDebugger; => namespace TheTempusProject\Canary;
-
-
-
-
-
-
-
-
-
-
-need to make sure a template loader can be called and still use the default template file, IE always add these CSS or JS resources.
-
-
-
-
-discord bot that shares updates on your party from the site
-maybe a summary after each session
-warning that time is coming up
-changes made to anything
-D&D news
-
-
-
-
-is it possible to store a campaigns state on the blockchain?
-
-
-
-
-keeping this as a repository for podcasts would get more people to check it out
-same for youtube
-
-people love sharing their resources, so make it EASY to find podcasts, and youtube channels, and etsy stores, and give people a place to share it with their groups
-
-try and earn commisions from this and do featured XYZ every x days or weeks or whatever
-
-have different "kinds" of dice to portray on the dice roll page
-
-maybe spinners instead of conventional die
-
-maybe weird health potions for D4's
-
-
-
-
-
-
-
-
-
-
-What is my goal here?
-
-I would like to play Dungeons and Dragons once a week with my friends. In an ideal world, I would DM this game and spend all week building tools for us to use that I then put on a website which sells memberships to other players so they can use the tools too.
-

app/classes/api_controller.php

@@ -1,8 +1,8 @@
 <?php
 /**
- * app/classes/admin_controller.php
+ * app/classes/api_controller.php
  *
- * This is the base admin controller. Every other admin controller should
+ * This is the base api controller. Every other api controller should
  * extend this class.
  *
  * @version 3.0
@@ -16,17 +16,122 @@ use TheTempusProject\Houdini\Classes\Template;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Hermes\Functions\Redirect;
 use TheTempusProject\Bedrock\Functions\Session;
+use TheTempusProject\Bedrock\Classes\Config;
+use TheTempusProject\Models\Token;
+use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Houdini\Classes\Views;
 
 class ApiController extends Controller {
-    public function __construct() {
+    protected static $canAccessApplicationApi = false;
+    protected static $canAccessUserApi = false;
+    protected static $canAccessAuthenticationApi = false;
+    protected static $authToken;
+
+    public function __construct( $secure = true ) {
+        header('Content-Type: application/json; charset=utf-8');
         parent::__construct();
-        if ( ! App::verifyApiRequest() ) {
+        Template::setTemplate( 'api' );
-            Session::flash( 'error', 'You do not have permission to view this page.' );
-            return Redirect::home();
-        }
         Template::noFollow();
         Template::noIndex();
-        Template::addHeader( 'Content-Type: application/json; charset=utf-8' );
+        $res = $this->verifyApiRequest();
-        Template::setTemplate( 'api' );
+        if ( $secure && ! $this->canUseApi() ) {
+            exit( $res );
+        }
+    }
+
+    protected function canUseApi() {
+        return ( $this->canUseUserApi() || $this->canUseAppApi() || $this->canUseAuthApi() );
+    }
+
+    protected function canUseUserApi() {
+        $apiEnabled = Config::getValue( 'api/apiAccessApp' );
+        if ( empty( $apiEnabled ) ) {
+            return false;
+        }
+        return self::$canAccessUserApi;
+    }
+
+    protected function canUseAppApi() {
+        $apiEnabled = Config::getValue( 'api/apiAccessPersonal' );
+        if ( empty( $apiEnabled ) ) {
+            return false;
+        }
+        return self::$canAccessApplicationApi;
+    }
+
+    protected function canUseAuthApi() {
+        return self::$canAccessAuthenticationApi;
+    }
+
+    public function verifyApiRequest() {
+        $tokens = new Token;
+        $secret = null;
+
+        $bearer_token = $this->getBearerToken();
+        if ( ! empty( $bearer_token ) ) {
+            $token = $tokens->findByToken( $bearer_token );
+        } else {
+            $secret = $this->getSecretToken();
+            if ( empty( $secret ) ) {
+                return Views::simpleView( 'api.response', ['response' => json_encode( [ 'error' => 'invalid secret' ], true )]);
+            }
+            $token = $tokens->findBySecret( $secret );
+        }
+        if ( empty( $token ) ) {
+            return Views::simpleView( 'api.response', ['response' => json_encode( [ 'error' => 'invalid token' ], true )]);
+        }
+        self::$authToken = $token;
+        if ( $token->expiresAt <= time() && empty( $secret ) ) {
+            return Views::simpleView( 'api.response', ['response' => json_encode( [ 'error' => 'token expired' ], true )]);
+        }
+        if ( $token->expiresAt <= time() ) {
+            self::$canAccessAuthenticationApi = true;
+            return;
+        }
+        if ( $token->token_type == 'app' ) {
+            self::$canAccessApplicationApi = true;
+            return;
+        }
+        if ( $token->token_type == 'user' ) {
+            self::$canAccessUserApi = true;
+            return;
+        }
+        return $result;
+    }
+
+    public function getSecretToken() {
+        $headers = $this->getAuthorizationHeader();
+        if ( ! empty( $headers ) ) {
+            if ( preg_match( '/Secret\s(\S+)/', $headers, $matches ) ) {
+                return $matches[1];
+            }
+        }
+        return null;
+    }
+
+    public function getBearerToken() {
+        $headers = $this->getAuthorizationHeader();
+        if ( ! empty( $headers ) ) {
+            if ( preg_match( '/Bearer\s(\S+)/', $headers, $matches ) ) {
+                return $matches[1];
+            }
+        }
+        return null;
+    }
+
+    public function getAuthorizationHeader(){
+        $headers = null;
+        if ( isset( $_SERVER['Authorization'] ) ) {
+            $headers = trim( $_SERVER["Authorization"] );
+        } elseif ( isset( $_SERVER['HTTP_AUTHORIZATION'] ) ) {
+            $headers = trim( $_SERVER["HTTP_AUTHORIZATION"] );
+        } elseif ( function_exists( 'apache_request_headers' ) ) {
+            $requestHeaders = apache_request_headers();
+            $requestHeaders = array_combine(array_map('ucwords', array_keys($requestHeaders)), array_values($requestHeaders));
+            if ( isset( $requestHeaders['Authorization'] ) ) {
+                $headers = trim( $requestHeaders['Authorization'] );
+            }
+        }
+        return $headers;
     }
 }

app/classes/config.php

@@ -1,25 +1,25 @@
 <?php
 /**
- * classes/config.php
+ * app/classes/config.php
  *
  * This class handles all the hard-coded configurations.
  *
  * @version 3.0
  * @author  Joey Kimsey <Joey@thetempusproject.com>
- * @link    https://TheTempusProject.com/Core
+ * @link    https://TheTempusProject.com
  * @license https://opensource.org/licenses/MIT [MIT LICENSE]
  */
 namespace TheTempusProject\Classes;
 
 use TheTempusProject\Houdini\Classes\Forms;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Houdini\Classes\Template;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Functions\Input;
 use TheTempusProject\Bedrock\Classes\Config as BedrockConfig;
 
 class Config extends BedrockConfig {
     public static function getFieldEditHtml( $name, $includeProtected = false ) {
-        // @todo: includeProtected is unused here
         $node = self::get( $name );
         if ( empty( $node ) ) {
             return;
@@ -28,13 +28,57 @@ class Config extends BedrockConfig {
             return;
         }
         $fieldname = str_ireplace( '/', '-', $name );
-        $html = Forms::getFormFieldHtml(
+
-            $fieldname,
+        $html = '';
-            $node['pretty'],
+        $fieldHtml = '';
-            $node['type'],
+        switch ( $node['type'] ) {
-            $node['value'],
+            case 'radio':
-        );
+            case 'bool':
-        return $html;
+            case 'boolean':
+                $fieldHtml = Forms::getSwitchHtml( $fieldname, $node['value'] );
+                break;
+            case 'select':
+                $fieldHtml = Forms::getSelectHtml( $fieldname, $options, $node['value'] );
+                break;
+            case 'block':
+                $fieldHtml = Forms::getTextBlockHtml( $fieldname, $node['value'] );
+                break;
+            case 'text':
+            case 'url':
+                $fieldHtml = Forms::getTextHtml( $fieldname, $node['value'] );
+                break;
+            case 'checkbox':
+                $fieldHtml = Forms::getCheckboxHtml( $fieldname, $node['value'] );
+                break;
+            case 'timezone':
+                $fieldHtml = Forms::getTimezoneHtml( $node['value'] );
+                break;
+            case 'file':
+                $fieldHtml = Forms::getFileHtml( $fieldname );
+                break;
+            case 'customSelect':
+                if ( empty( $options ) ) {
+                    $options = '{' . $fieldname . '-options}';
+                }
+                $fieldHtml = Forms::getSelectHtml( $fieldname, $options, $node['value'] );
+                break;
+        }
+
+        $html .= '<div class="mb-3 row">';
+        $html .= '<label for="' . $fieldname . '" class="col-lg-3 col-form-label text-end">' . $node['pretty'] . '</label>';
+        $html .= '<div class="col-lg-6">';
+        $html .= $fieldHtml;
+        $html .= '</div>';
+        if ( 'file' === $node['type'] ) {
+            $html .= '<div class="mb-3 row">';
+            $html .= '<h4 class="col-lg-3 col-form-label text-end">Current Image</h4>';
+            $html .= '<div class="col-lg-6">';
+            $html .= '<img alt="User Avatar" src="{ROOT_URL}' . $node['value'] . '" class="img-circle img-fluid p-2 avatar-125">';
+            $html .= '</div>';
+        }
+        $html .= '</div>';
+
+        return Template::parse( $html );
     }
 
     public static function getCategoryEditHtml( $category ) {
@@ -47,12 +91,12 @@ class Config extends BedrockConfig {
             Debug::warn( "Config category not found: $category" );
             return;
         }
-        $categoryHeader = '<div class="form-group"><label>' . ucfirst( $category ) . ':</label><hr></div>';
+        $categoryHeader = '<div class=""><h3 class="text-center">' . ucfirst( $category ) . ':</h3><hr>';
         foreach ( self::$config[$category] as $field => $node ) {
             $html .= self::getFieldEditHtml( $category . '/' . $field );
         }
         if ( !empty( $html ) ) {
-            $html = $categoryHeader . $html;
+            $html = $categoryHeader . $html . '</div>';
         }
         return $html;
     }

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;
@@ -34,7 +35,6 @@ class Controller extends BedrockController {
         }
         new Template;
         Template::setTemplate( 'default' );
-        Components::set( 'TOKEN', Token::generate() );
     }
 
     public function __destruct() {

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 {

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;

app/classes/forms.php

@@ -15,12 +15,20 @@
 namespace TheTempusProject\Classes;
 
 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\Models\User;
+use TheTempusProject\Classes\Forms;
+use TheTempusProject\Bedrock\Classes\Database;
 
 class Forms extends Check {
     private static $formHandlers = [];
+    private static $initialized = false;
 
     public static function check( $formName ) {
+        if ( self::$initialized !== true ) {
+            self::initHandlers();
+        }
         if ( empty( self::$formHandlers[ $formName ] ) ) {
             Debug::error( "Form not found: $formName" );
             return false;
@@ -74,4 +82,585 @@ class Forms extends Check {
         }
         return true;
     }
+
+    /**
+    * Adds these functions to the form list.
+    */
+    public function __construct() {
+        if ( self::$initialized === true ) {
+            return;
+        }
+        self::initHandlers();
+    }
+
+    private static function initHandlers() {
+        self::addHandler( 'passwordResetCode',   __CLASS__, 'passwordResetCode' );
+        self::addHandler( 'createRoute',         __CLASS__, 'createRoute' );
+        self::addHandler( 'editRoute',           __CLASS__, 'editRoute' );
+        self::addHandler( 'register',            __CLASS__, 'register' );
+        self::addHandler( 'createUser',          __CLASS__, 'createUser' );
+        self::addHandler( 'editUser',            __CLASS__, 'editUser' );
+        self::addHandler( 'login',               __CLASS__, 'login' );
+        self::addHandler( 'changeEmail',         __CLASS__, 'changeEmail' );
+        self::addHandler( 'changePassword',      __CLASS__, 'changePassword' );
+        self::addHandler( 'passwordReset',       __CLASS__, 'passwordReset' );
+        self::addHandler( 'emailConfirmation',   __CLASS__, 'emailConfirmation' );
+        self::addHandler( 'confirmationResend',  __CLASS__, 'confirmationResend' );
+        self::addHandler( 'replyMessage',        __CLASS__, 'replyMessage' );
+        self::addHandler( 'newMessage',          __CLASS__, 'newMessage' );
+        self::addHandler( 'userPrefs',           __CLASS__, 'userPrefs' );
+        self::addHandler( 'newGroup',            __CLASS__, 'newGroup' );
+        self::addHandler( 'editGroup',           __CLASS__, 'editGroup' );
+        self::addHandler( 'install',             __CLASS__, 'install' );
+        self::addHandler( 'adminCreateToken',    __CLASS__, 'adminCreateToken' );
+        self::addHandler( 'apiLogin',            __CLASS__, 'apiLogin' );
+        self::addHandler( 'updatePreference',    __CLASS__, 'updatePreference' );
+        self::addHandler( 'installStart',        __CLASS__, 'install', [ 'start' ] );
+        self::addHandler( 'installAgreement',    __CLASS__, 'install', [ 'agreement' ] );
+        self::addHandler( 'installCheck',        __CLASS__, 'install', [ 'check' ] );
+        self::addHandler( 'installConfigure',    __CLASS__, 'install', [ 'configure' ] );
+        self::addHandler( 'installRouting',      __CLASS__, 'install', [ 'routing' ] );
+        self::addHandler( 'installModels',       __CLASS__, 'install', [ 'models' ] );
+        self::addHandler( 'installPlugins',      __CLASS__, 'install', [ 'plugins' ] );
+        self::addHandler( 'installResources',    __CLASS__, 'install', [ 'resources' ] );
+        self::addHandler( 'installAdminUser',    __CLASS__, 'install', [ 'adminUser' ] );
+        self::$initialized = true;
+    }
+
+    /**
+     * Validates the installer forms.
+     *
+     * @return {bool}
+     */
+    public static function install( $page = '' ) {
+        // if ( !self::token() ) {
+        //     return false;
+        // }
+        switch ( $page ) {
+            case 'configure':
+                if ( ! Input::exists( 'submit' ) ) {
+                    return false;
+                }
+                if ( !Database::check( Input::post( 'dbHost' ), Input::post( 'dbName' ), Input::post( 'dbUsername' ), Input::post( 'dbPassword' ) ) ) {
+                    self::addUserError( 'DB connection error.' );
+                    return false;
+                }
+                return true;
+            case 'adminUser':
+                if ( !self::checkUsername( Input::post( 'newUsername' ) ) ) {
+                    self::addUserError( 'Invalid username.' );
+                    return false;
+                }
+                if ( !self::password( Input::post( 'userPassword' ) ) ) {
+                    self::addUserError( 'Invalid password.' );
+                    return false;
+                }
+                if ( Input::post( 'userPassword' ) !== Input::post( 'userPassword2' ) ) {
+                    self::addUserError( 'Passwords do not match.' );
+                    return false;
+                }
+                if ( Input::post( 'userEmail' ) !== Input::post( 'userEmail2' ) ) {
+                    self::addUserError( 'Emails do not match.' );
+                    return false;
+                }
+                return true;
+            case 'check':
+                if ( !self::uploads() ) {
+                    self::addUserError( 'Uploads are disabled.' );
+                    return false;
+                }
+                if ( !self::php() ) {
+                    self::addUserError( 'PHP version is too old.' );
+                    return false;
+                }
+                if ( !self::phpExtensions() ) {
+                    self::addUserError( 'PHP extensions are missing.' );
+                    return false;
+                }
+                if ( !self::sessions() ) {
+                    self::addUserError( 'There is an error with Sessions.' );
+                    return false;
+                }
+                if ( !self::mail() ) {
+                    self::addUserError( 'PHP mail is not enabled.' );
+                    return false;
+                }
+                if ( !self::safe() ) {
+                    self::addUserError( 'Safe mode is enabled.' );
+                    return false;
+                }
+                if ( ! Input::exists( 'submit' ) ) {
+                    return false;
+                }
+                return true;
+            case 'start':
+            case 'agreement':
+            case 'routing':
+            case 'models':
+            case 'plugins':
+            case 'resources':
+                if ( ! Input::exists( 'submit' ) ) {
+                    return false;
+                }
+                return true;
+            default:
+                return false;
+        }
+        return false;
+    }
+
+    /**
+     * Validates the password re-send form.
+     *
+     * @return {bool}
+     */
+    public static function passwordResetCode() {
+        if ( !Input::exists( 'resetCode' ) ) {
+            self::addUserError( 'Invalid resetCode.' );
+            return false;
+        }
+        if ( !self::token() ) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Validates the route creation form.
+     *
+     * @return {bool}
+     */
+    public static function createRoute() {
+        if ( !Input::exists( 'redirect_type' ) ) {
+            return false;
+        }
+        if ( 'external' == Input::post( 'redirect_type' ) && !self::url( Input::post( 'forwarded_url' ) ) ) {
+            return false;
+        }
+        if ( !self::token() ) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Validates the route edit form.
+     *
+     * @return {bool}
+     */
+    public static function editRoute() {
+        if ( !Input::exists( 'redirect_type' ) ) {
+            return false;
+        }
+        if ( 'external' == Input::post( 'redirect_type' ) && !self::url( Input::post( 'forwarded_url' ) ) ) {
+            return false;
+        }
+        if ( !self::token() ) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Validates the user creation form.
+     *
+     * @return {bool}
+     */
+    public static function createUser() {
+        $user = new User;
+        if ( !$user->checkUsername( Input::post( 'username' ) ) ) {
+            self::addUserError( 'Invalid username.' );
+            return false;
+        }
+        if ( !self::password( Input::post( 'password' ) ) ) {
+            self::addUserError( 'Invalid password.' );
+            return false;
+        }
+        if ( !self::email( Input::post( 'email' ) ) ) {
+            self::addUserError( 'Invalid Email.' );
+            return false;
+        }
+        if ( !$user->noEmailExists( Input::post( 'email' ) ) ) {
+            self::addUserError( 'A user with that email is already registered.' );
+            return false;
+        }
+        if ( Input::post( 'password' ) !== Input::post( 'password2' ) ) {
+            self::addUserError( 'Passwords do not match.' );
+            return false;
+        }
+        if ( Input::post( 'email' ) !== Input::post( 'email2' ) ) {
+            self::addUserError( 'Emails do not match.' );
+            return false;
+        }
+        if ( !Input::post( 'groupSelect' ) ) {
+            self::addUserError( 'You must select a group for the new user.' );
+            return false;
+        }
+        if ( !self::token() ) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Validates the user edit form.
+     *
+     * @return {bool}
+     */
+    public static function editUser() {
+        $user = new User;
+        if ( !$user->checkUsername( Input::post( 'username' ) ) ) {
+            self::addUserError( 'Invalid username.' );
+            return false;
+        }
+        if ( Input::exists( 'password' ) ) {
+            if ( !self::password( Input::post( 'password' ) ) ) {
+                self::addUserError( 'Invalid password.' );
+                return false;
+            }
+            if ( Input::post( 'password' ) !== Input::post( 'password2' ) ) {
+                self::addUserError( 'Passwords do not match.' );
+                return false;
+            }
+        }
+        if ( !self::email( Input::post( 'email' ) ) ) {
+            self::addUserError( 'Invalid Email.' );
+            return false;
+        }
+        if ( !Input::post( 'groupSelect' ) ) {
+            self::addUserError( 'You must select a group for the new user.' );
+            return false;
+        }
+        if ( !self::token() ) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Validates the user registration form.
+     *
+     * @return {bool}
+     */
+    public static function register() {
+        $user = new User;
+        if ( !self::checkUsername( Input::post( 'username' ) ) ) {
+            self::addUserError( 'Invalid username.' );
+            return false;
+        }
+        if ( !self::password( Input::post( 'password' ) ) ) {
+            self::addUserError( 'Invalid password.' );
+            return false;
+        }
+        if ( !self::email( Input::post( 'email' ) ) ) {
+            self::addUserError( 'Invalid Email.' );
+            return false;
+        }
+        if ( !$user->noEmailExists( Input::post( 'email' ) ) ) {
+            self::addUserError( 'A user with that email is already registered.' );
+            return false;
+        }
+        if ( Input::post( 'password' ) !== Input::post( 'password2' ) ) {
+            self::addUserError( 'Passwords do not match.' );
+            return false;
+        }
+        if ( Input::post( 'email' ) !== Input::post( 'email2' ) ) {
+            self::addUserError( 'Emails do not match.' );
+            return false;
+        }
+        if ( Input::post( 'terms' ) != '1' ) {
+            self::addUserError( 'You must agree to the terms of service.' );
+            return false;
+        }
+        if ( !self::token() ) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Validates the user login form.
+     *
+     * @return {bool}
+     */
+    public static function login() {
+        if ( !self::checkUsername( Input::post( 'username' ) ) ) {
+            self::addUserError( 'Invalid username.' );
+            return false;
+        }
+        if ( !self::password( Input::post( 'password' ) ) ) {
+            self::addUserError( 'Invalid password.' );
+            return false;
+        }
+        if ( !self::token() ) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Validates the email change form.
+     *
+     * @return {bool}
+     */
+    public static function changeEmail() {
+        if ( !self::email( Input::post( 'email' ) ) ) {
+            self::addUserError( 'Invalid Email.' );
+            return false;
+        }
+        if ( Input::post( 'email' ) !== Input::post( 'email2' ) ) {
+            self::addUserError( 'Emails do not match.' );
+            return false;
+        }
+        if ( !self::token() ) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Validates the password change form.
+     *
+     * @return {bool}
+     */
+    public static function changePassword() {
+        if ( !self::password( Input::post( 'password' ) ) ) {
+            self::addUserError( 'Invalid password.' );
+            return false;
+        }
+        if ( Input::post( 'password' ) !== Input::post( 'password2' ) ) {
+            self::addUserError( 'Passwords do not match.' );
+            return false;
+        }
+        if ( !self::token() ) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Validates the password reset form.
+     *
+     * @return {bool}
+     */
+    public static function passwordReset() {
+        if ( !self::password( Input::post( 'password' ) ) ) {
+            self::addUserError( 'Invalid password.' );
+            return false;
+        }
+        if ( Input::post( 'password' ) !== Input::post( 'password2' ) ) {
+            self::addUserError( 'Passwords do not match.' );
+            return false;
+        }
+        if ( !self::token() ) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Validates the email confirmation re-send form.
+     *
+     * @return {bool}
+     */
+    public static function emailConfirmation() {
+        if ( !Input::exists( 'confirmationCode' ) ) {
+            self::addUserError( 'No confirmation code provided.' );
+            return false;
+        }
+        if ( !self::token() ) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Validates the email confirmation re-send form.
+     *
+     * @return {bool}
+     */
+    public static function confirmationResend() {
+        if ( !Input::exists( 'resendConfirmation' ) ) {
+            self::addUserError( 'Confirmation not provided.' );
+            return false;
+        }
+        if ( !self::token() ) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Validates the reply message form.
+     *
+     * @return {bool}
+     */
+    public static function replyMessage() {
+        if ( !Input::exists( 'message' ) ) {
+            self::addUserError( 'Reply cannot be empty.' );
+            return false;
+        }
+        if ( !Input::exists( 'messageID' ) ) {
+            return false;
+        }
+        if ( !self::token() ) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Validates the new message form.
+     *
+     * @return {bool}
+     */
+    public static function newMessage() {
+        if ( !Input::exists( 'toUser' ) ) {
+            self::addUserError( 'You must specify a user to send the message to.' );
+            return false;
+        }
+        if ( !Input::exists( 'subject' ) ) {
+            self::addUserError( 'You must have a subject for your message.' );
+            return false;
+        }
+        if ( !Input::exists( 'message' ) ) {
+            self::addUserError( 'No message entered.' );
+            return false;
+        }
+        if ( !self::token() ) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Validates the user preferences form.
+     *
+     * @return {bool}
+     */
+    public static function userPrefs() {
+        // @todo make this a real check
+        if ( !Input::exists( 'timeFormat' ) ) {
+            self::addUserError( 'You must specify timeFormat' );
+            return false;
+        }
+        if ( !Input::exists( 'pageLimit' ) ) {
+            self::addUserError( 'You must specify pageLimit' );
+            return false;
+        }
+        if ( !Input::exists( 'gender' ) ) {
+            self::addUserError( 'You must specify gender' );
+            return false;
+        }
+        if ( !Input::exists( 'dateFormat' ) ) {
+            self::addUserError( 'You must specify dateFormat' );
+            return false;
+        }
+        if ( !Input::exists( 'timezone' ) ) {
+            self::addUserError( 'You must specify timezone' );
+            return false;
+        }
+        if ( !Input::exists( 'updates' ) ) {
+            self::addUserError( 'You must specify updates' );
+            return false;
+        }
+        if ( !Input::exists( 'newsletter' ) ) {
+            self::addUserError( 'You must specify newsletter' );
+            return false;
+        }
+        if ( !self::token() ) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Validates the group creation form.
+     *
+     * @return {bool}
+     */
+    public static function newGroup() {
+        if ( !Input::exists( 'name' ) ) {
+            self::addUserError( 'You must specify a name' );
+            return false;
+        }
+        if ( !self::dataTitle( Input::exists( 'name' ) ) ) {
+            self::addUserError( 'invalid group name' );
+            return false;
+        }
+        if ( !self::token() ) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Validates the group edit form.
+     *
+     * @return {bool}
+     */
+    public static function editGroup() {
+        if ( !Input::exists( 'name' ) ) {
+            self::addUserError( 'You must specify a name' );
+            return false;
+        }
+        if ( !self::dataTitle( Input::exists( 'name' ) ) ) {
+            self::addUserError( 'invalid group name' );
+            return false;
+        }
+        if ( !self::token() ) {
+            return false;
+        }
+        return true;
+    }
+
+    public static function adminCreateToken() {
+        if ( !Input::exists( 'name' ) ) {
+            self::addUserError( 'You must specify a name' );
+            return false;
+        }
+        if ( !Input::exists( 'token_type' ) ) {
+            self::addUserError( 'You must specify a token_type' );
+            return false;
+        }
+        return true;
+    }
+
+    public static function adminEditToken() {
+        if ( !Input::exists( 'name' ) ) {
+            self::addUserError( 'You must specify a name' );
+            return false;
+        }
+        if ( !Input::exists( 'token_type' ) ) {
+            self::addUserError( 'You must specify a token_type' );
+            return false;
+        }
+        return true;
+    }
+    
+    public static function apiLogin() {
+        if ( !self::checkUsername( Input::post( 'username' ) ) ) {
+            self::addUserError( 'Invalid username.' );
+            return false;
+        }
+        if ( !self::password( Input::post( 'password' ) ) ) {
+            self::addUserError( 'Invalid password.' );
+            return false;
+        }
+        return true;
+    }
+
+    public static function updatePreference() {
+        if ( !Input::exists( 'prefName' ) ) {
+            self::addUserError( 'You must specify a name' );
+            return false;
+        }
+        if ( !Input::exists( 'prefValue' ) ) {
+            self::addUserError( 'You must specify a value' );
+            return false;
+        }
+        return true;
+    }
 }

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;
@@ -266,6 +266,7 @@ class Installer {
     }
 
     public function getModelInfo( $filename, $folder = '' ) {
+        Debug::debug( 'getModelInfo filename: ' . $filename . ', folder: ' . $folder);
         $object = self::emptyModule( 'model', $folder, $filename );
 
         if ( ! class_exists( $object->class ) ) {
@@ -326,7 +327,7 @@ class Installer {
         }
 
         if ( empty( $module_data->class_object ) ) {
-            self::$errors[] = [ 'errorInfo' => 'Class not found: ' . $module_data->class ];
+            self::$errors[] = [ 'errorInfo' => 'installPlugin: class_object not found: ' . $module_data->class ];
             return false;
         }
 
@@ -363,7 +364,7 @@ class Installer {
             return false;
         }
 
-        $errors[] = [ 'errorInfo' => $module_data['name'] . " has been installed." ];
+        $errors[] = [ 'errorInfo' => $module_data['name'] . " Plugin has been installed." ];
         self::$errors = array_merge( self::$errors, $errors );
         return true;
     }
@@ -373,7 +374,7 @@ class Installer {
         $errors = [];
 
         if ( empty( $module_data->class_object ) ) {
-            self::$errors[] = [ 'errorInfo' => 'Class not found: ' . $module_data->class ];
+            self::$errors[] = [ 'errorInfo' => 'uninstallPlugin: class_object not found: ' . $module_data->class ];
             return false;
         }
 
@@ -393,7 +394,7 @@ class Installer {
         }
 
         $this->removeModule( $module_data->name, true );
-        $errors[] = [ 'errorInfo' => $module_data->name . " has been installed." ];
+        $errors[] = [ 'errorInfo' => $module_data->name . " Plugin has been uninstalled." ];
         self::$errors = array_merge( self::$errors, $errors );
         return true;
     }
@@ -408,7 +409,7 @@ class Installer {
         }
 
         if ( empty( $module_data->class_object ) ) {
-            self::$errors[] = [ 'errorInfo' => 'Class not found: ' . $module_data->class ];
+            self::$errors[] = [ 'errorInfo' => 'installModel class_object not found: ' . $module_data->class ];
             return false;
         }
 
@@ -465,7 +466,7 @@ class Installer {
             return false;
         }
 
-        $errors[] = [ 'errorInfo' => $module_data['name'] . " has been installed." ];
+        $errors[] = [ 'errorInfo' => $module_data['name'] . " model has been installed." ];
         self::$errors = array_merge( self::$errors, $errors );
         return true;
     }
@@ -475,7 +476,7 @@ class Installer {
         $errors = [];
 
         if ( empty( $module_data->class_object ) ) {
-            self::$errors[] = [ 'errorInfo' => 'Class not found: ' . $module_data->class ];
+            self::$errors[] = [ 'errorInfo' => 'uninstallModel: class_object not found: ' . $module_data->class ];
             return false;
         }
 
@@ -499,7 +500,7 @@ class Installer {
 
                 // exclude any flags we don't have a matric map for
                 if ( empty( $module_data->class_object->$matrix ) ) {
-                    Debug::warn( "$flag_type does not have a proper matrix map and cannot be installed." );
+                    Debug::warn( "$flag_type does not have a proper matrix map and cannot be uninstalled." );
                     $module_data->$flag_type = INSTALL_STATUS_NOT_FOUND;
                 }
             }
@@ -512,7 +513,7 @@ class Installer {
             return false;
         }
 
-        $errors[] = [ 'errorInfo' => $module_data->name . " has been uninstalled." ];
+        $errors[] = [ 'errorInfo' => $module_data->name . " model has been uninstalled." ];
         self::$errors = array_merge( self::$errors, $errors );
         return true;
     }

app/classes/permissions.php

@@ -11,10 +11,11 @@
  */
 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;
+use TheTempusProject\Houdini\Classes\Template;
 
 class Permissions {
     public static $permissions = false;
@@ -237,8 +238,21 @@ class Permissions {
             } else {
                 $checked = false;
             }
-            $form .= Forms::getFormFieldHtml( $name, $details['pretty'], 'checkbox', $checked );
+            $form .= self::getFieldEditHtml( $name, $checked, $details['pretty'] );
         }
         return $form;
     }
+    
+    public static function getFieldEditHtml( $name, $default, $pretty ) {
+        $fieldname = str_ireplace( '/', '-', $name );
+        $fieldHtml = Forms::getSwitchHtml( $fieldname, [ 'true', 'false' ], $default );
+        $html = '';
+        $html .= '<div class="mb-3 row">';
+        $html .= '<label for="' . $fieldname . '" class="col-lg-6 col-form-label text-end">' . $pretty . '</label>';
+        $html .= '<div class="col-lg-6">';
+        $html .= $fieldHtml;
+        $html .= '</div>';
+        $html .= '</div>';
+        return Template::parse( $html );
+    }
 }

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 {
@@ -309,7 +309,7 @@ class Plugin {
         $data = [];
         foreach( $this->resourceMatrix as $tableName => $entries ) {
             foreach ($ids as $id) {
-                $data[] = self::$db->delete( $tableName, $id );
+                $data[] = self::$db->delete( $tableName, [ 'ID', '=', $id ] );
             }
         }
         return $data;
@@ -335,9 +335,14 @@ class Plugin {
     }
 
     public function loadFooterNav() {
-        if ( !empty( $this->footer_links ) ) {
+        if ( !empty( $this->contact_footer_links ) ) {
-            foreach( $this->footer_links as $key => $link ) {
+            foreach( $this->contact_footer_links as $key => $link ) {
-                Navigation::addLink( App::FOOTER_MENU_NAME, $link );
+                Navigation::addLink( App::CONTACT_FOOTER_MENU_NAME, $link );
+            }
+        }
+        if ( !empty( $this->info_footer_links ) ) {
+            foreach( $this->info_footer_links as $key => $link ) {
+                Navigation::addLink( App::INFO_FOOTER_MENU_NAME, $link );
             }
         }
     }

app/classes/preferences.php

@@ -13,11 +13,13 @@ namespace TheTempusProject\Classes;
 
 use TheTempusProject\Houdini\Classes\Issues;
 use TheTempusProject\Houdini\Classes\Forms;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Houdini\Classes\Template;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Functions\Upload;
 use TheTempusProject\Bedrock\Functions\Input;
 use TheTempusProject\TheTempusProject as App;
+use TheTempusProject\Bedrock\Classes\Config;
 
 class Preferences {
     public static $preferences = false;
@@ -186,17 +188,101 @@ class Preferences {
     }
 
     public function getFormHtml( $populated = [] ) {
+        // dv( self::$preferences );
         $form = '';
+        // Added so i can force some sort of ordering
+        $inputTypes = [
+            'file' => [],
+            'select' => [],
+            'timezone' => [],
+            'checkbox' => [],
+            'switch' => [],
+        ];
         foreach ( self::$preferences as $name => $details ) {
             $tempPrefsArray = $this->normalizePreferenceArray( $name, $details );
             if ( isset( $populated[ $name ] ) ) {
-                $tempPrefsArray['default'] = $populated[$name];
+                $tempPrefsArray['value'] = $populated[$name];
+            } else {
+                $tempPrefsArray['value'] = $tempPrefsArray['default'];
             }
-            $form .= Forms::getFormFieldHtml( $name, $tempPrefsArray['pretty'], $tempPrefsArray['type'], $tempPrefsArray['default'], $tempPrefsArray['options'] );
+            // $form .= Forms::getFormFieldHtml( $name, $tempPrefsArray['pretty'], $tempPrefsArray['type'], $tempPrefsArray['default'], $tempPrefsArray['options'] );
+            if ( $tempPrefsArray['type'] == 'checkbox' ) {
+                $tempPrefsArray['type'] = 'switch';
+            }
+
+            if ( 'file' === $tempPrefsArray['type'] ) {
+                // dv( Config::getValue( 'uploads/images' ) );
+                if ( ! Config::getValue( 'uploads/images' ) ) {
+                    Debug::info( 'Preference hidden because uploads are disabled.' );
+                    continue;
+                }
+            }
+
+            $inputTypes[ $tempPrefsArray['type'] ][] = self::getFormFieldHtml( $name, $tempPrefsArray['pretty'], $tempPrefsArray['type'], $tempPrefsArray['value'], $tempPrefsArray['options'] );
+        }
+        foreach ( $inputTypes as $skip => $items ) {
+            $form .= implode( ' ', $items );
         }
         return $form;
     }
 
+    public static function getFormFieldHtml( $fieldname, $fieldTitle, $type, $defaultValue = '', $options = null ) {
+        $html = '';
+        switch ( $type ) {
+            case 'radio':
+            case 'bool':
+            case 'boolean':
+                $fieldHtml = Forms::getRadioHtml( $fieldname, [ 'true', 'false' ], $defaultValue );
+                break;
+            case 'select':
+                $fieldHtml = Forms::getSelectHtml( $fieldname, $options, $defaultValue );
+                break;
+            case 'customSelect':
+                if ( empty( $options ) ) {
+                    $options = '{' . $fieldname . '-options}';
+                }
+                $fieldHtml = Forms::getSelectHtml( $fieldname, $options, $defaultValue );
+                break;
+            case 'block':
+                $fieldHtml = Forms::getTextBlockHtml( $fieldname, $defaultValue );
+                break;
+            case 'text':
+            case 'url':
+                $fieldHtml = Forms::getTextHtml( $fieldname, $defaultValue );
+                break;
+            case 'checkbox':
+                $fieldHtml = Forms::getCheckboxHtml( $fieldname, $defaultValue );
+                break;
+            case 'switch':
+                $fieldHtml = Forms::getSwitchHtml( $fieldname, $defaultValue );
+                break;
+            case 'timezone':
+                $fieldHtml = Forms::getTimezoneHtml( $defaultValue );
+                break;
+            case 'file':
+                $fieldHtml = Forms::getFileHtml( $fieldname );
+                break;
+            default:
+                Debug::error( "unknown field type: $type" );
+                break;
+        }
+
+        $html .= '<div class="mb-3 row">';
+        $html .= '<label for="' . $fieldname . '" class="col-lg-6 col-form-label text-start text-lg-end">' . $fieldTitle . '</label>';
+        $html .= '<div class="col-lg-6">';
+        $html .= $fieldHtml;
+        $html .= '</div>';
+        if ( 'file' === $type ) {
+            $html .= '<div class="mb-3 row">';
+            $html .= '<h4 class="col-lg-6 col-form-label text-start text-lg-end">Current Image</h4>';
+            $html .= '<div class="col-lg-6">';
+            $html .= '<img alt="User Avatar" src="{ROOT_URL}' . $defaultValue . '" class="img-circle img-fluid p-2 avatar-125">';
+            $html .= '</div>';
+        }
+        $html .= '</div>';
+        return Template::parse( $html );
+    }
+
     public function convertFormToArray( $fillMissing = true, $defaultsOnly = true ) {
         $prefsArray = [];
         foreach ( self::$preferences as $name => $details ) {
@@ -212,12 +298,14 @@ class Preferences {
             }
             if ( 'file' == $details['type'] ) {
                 if ( Input::exists( $name ) ) {
-                    $folder = IMAGE_UPLOAD_DIRECTORY . App::$activeUser->username . DIRECTORY_SEPARATOR;
+                    $folder = UPLOAD_DIRECTORY . App::$activeUser->username . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR;
-                    if ( !Upload::image( $name, $folder ) ) {
+                    $upload = Upload::image( $name, $folder );
-                        Issues::add( 'error', [ 'There was an error with your upload.' => Check::systemErrors() ] );
+                    if ( $upload ) {
-                    } else {
                         $route = str_replace( APP_ROOT_DIRECTORY, '', $folder );
                         $prefsArray[$name] = $route . Upload::last();
+                    } else {
+                        Issues::add( 'error', [ 'There was an error with your upload.' => Check::userErrors() ] );
+                        unset( $prefsArray[$name] );
                     }
                 }
             }

app/config/constants.php

@@ -1,19 +1,17 @@
 <?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 );
-}
-// Directories
     define( 'APP_DIRECTORY',                      APP_ROOT_DIRECTORY  . 'app'               . DIRECTORY_SEPARATOR );
+// Directories
     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 );
@@ -40,11 +38,15 @@ if ( ! defined( 'CONFIG_DIRECTORY' ) ) {
 # Tempus Debugger
     define( 'CANARY_SECURE_HASH',        'd73ed7591a30f0ca7d686a0e780f0d05' );
 # Tempus Project Core
+define( 'APP_NAME',            'The Tempus Project');
+define( 'TP_DEFAULT_LOGO',            'images/logo.png');
     // Check
         define( 'MINIMUM_PHP_VERSION',            8.1);
     // Cookies
         define( 'DEFAULT_COOKIE_PREFIX',          'TP_');
     // Debug
+	
+    	define( 'CANARY_DEBUG_DIRECTORY', APP_ROOT_DIRECTORY . 'logs' . DIRECTORY_SEPARATOR  );
         define( 'CANARY_DEBUG_LEVEL_ERROR', 'error' );
         define( 'CANARY_DEBUG_LEVEL_WARN', 'warn' );
         define( 'CANARY_DEBUG_LEVEL_INFO', 'info' );
@@ -59,7 +61,9 @@ if ( ! defined( 'CONFIG_DIRECTORY' ) ) {
         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' )) {

app/controllers/admin/composer.php

@@ -59,6 +59,6 @@ class Composer extends AdminController {
             $out[] = (object) $versionsInstalled[ $name ];
         }
 
-        Views::view( 'admin.dependencies', $out );
+        Views::view( 'admin.modules.dependencies', $out );
     }
 }

app/controllers/admin/groups.php

@@ -32,8 +32,6 @@ class Groups extends AdminController {
         self::$title = 'Admin - Groups';
         self::$group = new Group;
         self::$permissions = new Permissions;
-        $view = Navigation::activePageSelect( 'nav.admin', '/admin/groups' );
-        Components::set( 'ADMINNAV', $view );
     }
 
     public function create( $data = null ) {
@@ -95,7 +93,7 @@ class Groups extends AdminController {
     }
 
     public function index( $data = null ) {
-        Views::view( 'admin.groups.list', self::$group->list() );
+        Views::view( 'admin.groups.list', self::$group->listPaginated() );
     }
 
     public function listmembers( $data = null ) {

app/controllers/admin/home.php

@@ -15,8 +15,14 @@ use TheTempusProject\Houdini\Classes\Views;
 use TheTempusProject\Houdini\Classes\Components;
 use TheTempusProject\Classes\AdminController;
 use TheTempusProject\Models\User;
-use TheTempusProject\Plugins\Comments;
+use TheTempusProject\Models\Comments;
-use TheTempusProject\Plugins\Blog;
+use TheTempusProject\Models\Posts;
+use TheTempusProject\Models\Contact;
+use TheTempusProject\Plugins\Comments as CommentPlugin;
+use TheTempusProject\Plugins\Blog as BlogPlugin;
+use TheTempusProject\Plugins\Contact as ContactPlugin;
+use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Bedrock\Functions\Input;
 
 class Home extends AdminController {
     public static $user;
@@ -29,18 +35,43 @@ class Home extends AdminController {
     }
 
     public function index() {
+        Components::set( 'commentDash', '' );
         if ( class_exists( 'TheTempusProject\Plugins\Comments' ) ) {
+            $plugin = new CommentPlugin;
+
+            if ( ! $plugin->checkEnabled() ) {
+                Debug::info( 'Comments Plugin is disabled in the control panel.' );
+            } else {
                 $comments = new Comments;
-            self::$comments = $comments->getModel();
+                $commentList = Views::simpleView( 'comments.admin.dashboard', $comments->recent( 'all', 5 ) );
-            $comments = Views::simpleView( 'comments.admin.dashboard', self::$comments->recent( 'all', 5 ) );
+                Components::set( 'commentDash', $commentList );
-            Components::set( 'commentDash', $comments );
+            }
         }
 
         if ( class_exists( 'TheTempusProject\Plugins\Blog' ) ) {
-            $blog = new Blog;
+            $plugin = new BlogPlugin;
-            self::$posts = $blog->posts;
+
-            $posts = Views::simpleView( 'blog.admin.dashboard', self::$posts->recent( 5 ) );
+            if ( ! $plugin->checkEnabled() ) {
-            Components::set( 'blogDash', $posts );
+                Debug::info( 'Blog Plugin is disabled in the control panel.' );
+                Components::set( 'blogDash', '' );
+            } else {
+                $posts = new Posts;
+                $postsList = Views::simpleView( 'blog.admin.dashboard', $posts->recent( 5 ) );
+                Components::set( 'blogDash', $postsList );
+            }
+        }
+
+        if ( class_exists( 'TheTempusProject\Plugins\Contact' ) ) {
+            $plugin = new ContactPlugin;
+
+            if ( ! $plugin->checkEnabled() ) {
+                Debug::info( 'Contact Plugin is disabled in the control panel.' );
+                Components::set( 'contactDash', '' );
+            } else {
+                $posts = new Contact;
+                $postsList = Views::simpleView( 'contact.admin.dashboard', $posts->listPaginated( 5 ) );
+                Components::set( 'contactDash', $postsList );
+            }
         }
 
         self::$user = new User;

app/controllers/admin/images.php

@@ -0,0 +1,114 @@
+<?php
+/**
+ * app/controllers/admin/tokens.php
+ *
+ * This is the admin app/user tokens controller.
+ *
+ * @version 3.0
+ * @author  Joey Kimsey <Joey@thetempusproject.com>
+ * @link    https://TheTempusProject.com
+ * @license https://opensource.org/licenses/MIT [MIT LICENSE]
+ */
+namespace TheTempusProject\Controllers\Admin;
+
+use TheTempusProject\Classes\Forms as TTPForms;
+use TheTempusProject\Houdini\Classes\Views;
+use TheTempusProject\Houdini\Classes\Issues;
+use TheTempusProject\Houdini\Classes\Navigation;
+use TheTempusProject\Houdini\Classes\Components;
+use TheTempusProject\Houdini\Classes\Forms;
+use TheTempusProject\Classes\AdminController;
+use TheTempusProject\Models\Token;
+use TheTempusProject\Bedrock\Functions\Input;
+use TheTempusProject\Bedrock\Functions\Check;
+use TheTempusProject\Hermes\Functions\Redirect;
+use TheTempusProject\Bedrock\Functions\Session;
+
+class Images extends AdminController {
+
+    public function __construct() {
+        parent::__construct();
+        self::$title = 'Admin - Images';
+    }
+
+    public function create() {
+        if ( Input::exists( 'submit' ) ) {
+            if ( !TTPForms::check( 'addImage' ) ) {
+                Issues::add( 'error', [ 'There was an error with your image.' => Check::userErrors() ] );
+            }
+
+            if ( Input::exists( 'folder' ) ) {
+                $folder = Input::post('folder');
+            } else {
+                // IMAGE_DIRECTORY
+                $folder = UPLOAD_DIRECTORY . App::$activeUser->username . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR;
+            }
+
+            $upload = Upload::image( 'upload', $folder );
+
+            if ( $upload ) {
+                $route = str_replace( APP_ROOT_DIRECTORY, '', $folder );
+                $out = $route . Upload::last();
+            } else {
+                Debug::error( 'There was an error with your upload.');
+                Issues::add( 'error', [ 'There was an error with your upload.' => Check::userErrors() ] );
+            }
+
+
+
+
+
+
+
+
+
+            // if ( self::$token->create(
+            //     Input::post( 'name' ),
+            //     Input::post( 'notes' ),
+            //     Input::post( 'token_type' )
+            // ) ) {
+            //     Session::flash( 'success', 'Token Created' );
+            //     Redirect::to( 'admin/images' );
+            // }
+
+
+        }
+        Views::view( 'admin.images.create' );
+    }
+
+    public function delete( $id = null ) {
+        if ( self::$token->delete( [ $id ] ) ) {
+            Session::flash( 'success', 'Token deleted.' );
+        }
+        Redirect::to( 'admin/images' );
+    }
+
+    public function edit( $id = null ) {
+        $token = self::$token->findById( $id );
+        if ( Input::exists( 'submit' ) ) {
+            if ( !TTPForms::check( 'adminEditToken' ) ) {
+                Issues::add( 'error', [ 'There was an error with your token.' => Check::userErrors() ] );
+            } else {
+                if ( self::$token->update(
+                    $id,
+                    Input::post( 'name' ),
+                    Input::post( 'notes' ),
+                    Input::post( 'token_type' )
+                ) ) {
+                    Session::flash( 'success', 'Token Updated' );
+                    Redirect::to( 'admin/images' );
+                }
+            }
+        }
+        Forms::selectOption( $token->token_type );
+        return Views::view( 'admin.images.edit', $token );
+    }
+
+    public function index() {
+        return Views::view( 'admin.images.list', self::$token->listPaginated() );
+    }
+
+    public function view( $id = null ) {
+        return Views::view( 'admin.images.view', self::$token->findById( $id ) );
+    }
+}

app/controllers/admin/plugins.php

@@ -30,8 +30,6 @@ class Plugins extends AdminController {
         self::$title = 'Admin - Installed Plugins';
         $this->installer = new Installer;
         $this->plugins = $this->installer->getAvailablePlugins();
-        $view = Navigation::activePageSelect( 'nav.admin', '/admin/plugins' );
-        Components::set( 'ADMINNAV', $view );
     }
 
     public function index() {
@@ -39,7 +37,12 @@ class Plugins extends AdminController {
     }
 
     public function disable( $name = null ) {
+        if ( empty( $name ) ) {
+            Session::flash( 'error', 'Unknown Plugin.' );
+            Redirect::to( 'admin/plugins' );
+        }
         Components::set( 'PLUGIN', $name );
+        self::$title = 'Admin - Disable ' . $name;
         if ( !Input::exists( 'installHash' ) ) {
             return Views::view( 'admin.modules.plugins.disable' );
         }
@@ -52,11 +55,16 @@ class Plugins extends AdminController {
     }
 
     public function enable( $name = null ) {
+        if ( empty( $name ) ) {
+            Session::flash( 'error', 'Unknown Plugin.' );
+            Redirect::to( 'admin/plugins' );
+        }
         Components::set( 'PLUGIN', $name );
+        self::$title = 'Admin - Enable ' . $name;
         if ( !Input::exists( 'installHash' ) ) {
             return Views::view( 'admin.modules.plugins.enable' );
         }
-        if ( !Plugin::enable( $name ) ) {
+        if ( ! Plugin::enable( $name ) ) {
             Session::flash( 'error', 'There was an error enabling the plugin.' );
         } else {
             Session::flash( 'success', 'Plugin has been enabled.' );
@@ -71,6 +79,7 @@ class Plugins extends AdminController {
         }
         $name = strtolower( $name );
         Components::set( 'PLUGIN', $name );
+        self::$title = 'Admin - Install ' . $name;
         if ( ! Input::exists( 'installHash' ) ) {
             return Views::view( 'admin.modules.plugins.install' );
         }
@@ -95,6 +104,7 @@ class Plugins extends AdminController {
         }
         $name = strtolower($name);
         Components::set( 'PLUGIN', $name );
+        self::$title = 'Admin - Uninstall ' . $name;
 
         if ( !Input::exists( 'uninstallHash' ) ) {
             return Views::view( 'admin.modules.plugins.uninstall' );

app/controllers/admin/routes.php

@@ -11,7 +11,7 @@
  */
 namespace TheTempusProject\Controllers\Admin;
 
-use TheTempusProject\TTPForms;
+use TheTempusProject\Classes\Forms as TTPForms;
 use TheTempusProject\Houdini\Classes\Views;
 use TheTempusProject\Houdini\Classes\Issues;
 use TheTempusProject\Houdini\Classes\Navigation;
@@ -31,15 +31,18 @@ class Routes extends AdminController {
         parent::__construct();
         self::$title = 'Admin - Redirects';
         self::$routes = new RoutesClass;
-        $view = Navigation::activePageSelect( 'nav.admin', '/admin/routes' );
-        Components::set( 'ADMINNAV', $view );
     }
 
     public function create() {
-        if ( Input::exists( 'redirect_type' ) ) {
+        if ( ! Input::exists( 'redirect_type' ) ) {
+            return Views::view( 'admin.routes.create' );
+        }
+        
         if ( !TTPForms::check( 'createRoute' ) ) {
             Issues::add( 'error', [ 'There was an error with your route.' => Check::userErrors() ] );
+            return Views::view( 'admin.routes.create' );
         }
+
         if ( self::$routes->create(
             Input::post( 'original_url' ),
             Input::post( 'forwarded_url' ),
@@ -49,7 +52,8 @@ class Routes extends AdminController {
             Session::flash( 'success', 'Route Created' );
             Redirect::to( 'admin/routes' );
         }
-        }
+
+        Issues::add( 'error', 'There was an unknown error saving your redirect.' );
         Views::view( 'admin.routes.create' );
     }
 
@@ -88,7 +92,7 @@ class Routes extends AdminController {
     }
 
     public function index() {
-        return Views::view( 'admin.routes.list', self::$routes->list() );
+        return Views::view( 'admin.routes.list', self::$routes->listPaginated() );
     }
 
     public function view( $id = null ) {

app/controllers/admin/send_mail.php

@@ -1,8 +1,8 @@
 <?php
 /**
- * app/controllers/admin/contact.php
+ * app/controllers/admin/send_mail.php
  *
- * This is the admin contact controller. The only real use is to send out emails to the various lists.
+ * This is the admin email controller. The only real use is to send out emails to the various lists.
  *
  * @version 3.0
  * @author  Joey Kimsey <Joey@thetempusproject.com>
@@ -18,19 +18,34 @@ use TheTempusProject\Houdini\Classes\Issues;
 use TheTempusProject\Houdini\Classes\Views;
 use TheTempusProject\Models\User;
 use TheTempusProject\Models\Subscribe;
+use TheTempusProject\Plugins\Subscribe as Plugin;
 
-class Contact extends AdminController {
+class SendMail extends AdminController {
     public static $user;
     public static $subscribe;
 
     public function __construct() {
         parent::__construct();
-        self::$title = 'Admin - Contact';
+        self::$title = 'Admin - Send Mail';
         self::$user = new User;
+
+        if ( class_exists( 'TheTempusProject\Plugins\Subscribe' ) ) {
+            $plugin = new Plugin;
+            if ( ! $plugin->checkEnabled() ) {
+                Issues::add( 'notice', 'Subscriptions are disabled so those feature will be unavailable.' );
+            } else {
                 self::$subscribe = new Subscribe;
             }
+        } else {
+            Issues::add( 'notice', 'Subscriptions plugin is not installed so those feature will be unavailable.' );
+        }
+    }
 
     private function emailSubscribers( $params ) {
+        if ( empty( self::$subscribe ) ) {
+            Issues::add( 'error', 'Subscriptions plugin is unavailable' );
+            return;
+        }
         $list = self::$subscribe->list();
         if ( empty( $list ) ) {
             Issues::add( 'error', 'No subscribers found' );

app/controllers/admin/tokens.php

@@ -0,0 +1,88 @@
+<?php
+/**
+ * app/controllers/admin/tokens.php
+ *
+ * This is the admin app/user tokens controller.
+ *
+ * @version 3.0
+ * @author  Joey Kimsey <Joey@thetempusproject.com>
+ * @link    https://TheTempusProject.com
+ * @license https://opensource.org/licenses/MIT [MIT LICENSE]
+ */
+namespace TheTempusProject\Controllers\Admin;
+
+use TheTempusProject\Classes\Forms as TTPForms;
+use TheTempusProject\Houdini\Classes\Views;
+use TheTempusProject\Houdini\Classes\Issues;
+use TheTempusProject\Houdini\Classes\Navigation;
+use TheTempusProject\Houdini\Classes\Components;
+use TheTempusProject\Houdini\Classes\Forms;
+use TheTempusProject\Classes\AdminController;
+use TheTempusProject\Models\Token;
+use TheTempusProject\Bedrock\Functions\Input;
+use TheTempusProject\Bedrock\Functions\Check;
+use TheTempusProject\Hermes\Functions\Redirect;
+use TheTempusProject\Bedrock\Functions\Session;
+
+class Tokens extends AdminController {
+    public static $token;
+
+    public function __construct() {
+        parent::__construct();
+        self::$title = 'Admin - Tokens';
+        self::$token = new Token;
+    }
+
+    public function create() {
+        if ( Input::exists( 'submit' ) ) {
+            if ( !TTPForms::check( 'adminCreateToken' ) ) {
+                Issues::add( 'error', [ 'There was an error with your token.' => Check::userErrors() ] );
+            }
+            if ( self::$token->create(
+                Input::post( 'name' ),
+                Input::post( 'notes' ),
+                Input::post( 'token_type' )
+            ) ) {
+                Session::flash( 'success', 'Token Created' );
+                Redirect::to( 'admin/tokens' );
+            }
+        }
+        Views::view( 'admin.tokens.create' );
+    }
+
+    public function delete( $id = null ) {
+        if ( self::$token->delete( [ $id ] ) ) {
+            Session::flash( 'success', 'Token deleted.' );
+        }
+        Redirect::to( 'admin/tokens' );
+    }
+
+    public function edit( $id = null ) {
+        $token = self::$token->findById( $id );
+        if ( Input::exists( 'submit' ) ) {
+            if ( !TTPForms::check( 'adminEditToken' ) ) {
+                Issues::add( 'error', [ 'There was an error with your token.' => Check::userErrors() ] );
+            } else {
+                if ( self::$token->update(
+                    $id,
+                    Input::post( 'name' ),
+                    Input::post( 'notes' ),
+                    Input::post( 'token_type' )
+                ) ) {
+                    Session::flash( 'success', 'Token Updated' );
+                    Redirect::to( 'admin/tokens' );
+                }
+            }
+        }
+        Forms::selectOption( $token->token_type );
+        return Views::view( 'admin.tokens.edit', $token );
+    }
+
+    public function index() {
+        return Views::view( 'admin.tokens.list', self::$token->listPaginated() );
+    }
+
+    public function view( $id = null ) {
+        return Views::view( 'admin.tokens.view', self::$token->findById( $id ) );
+    }
+}

app/controllers/admin/users.php

@@ -26,6 +26,8 @@ use TheTempusProject\Classes\AdminController;
 use TheTempusProject\Models\User;
 use TheTempusProject\Models\Group;
 use TheTempusProject\TheTempusProject as App;
+use TheTempusProject\Houdini\Classes\Template;
+use TheTempusProject\Bedrock\Functions\Upload;
 
 class Users extends AdminController {
     public static $user;
@@ -36,8 +38,6 @@ class Users extends AdminController {
         self::$title = 'Admin - Users';
         self::$user = new User;
         self::$group = new Group;
-        $view = Navigation::activePageSelect( 'nav.admin', '/admin/users' );
-        Components::set( 'ADMINNAV', $view );
     }
 
     public function create() {
@@ -63,8 +63,11 @@ class Users extends AdminController {
                 }
             }
         }
-
+        $select = Forms::getSelectHtml(
-        $select = Forms::getFormFieldHtml( 'groupSelect', 'User Group', 'select', Config::getValue( 'group/defaultGroup' ), self::$group->listGroupsSimple() );
+            'groupSelect',
+            self::$group->listGroupsSimple(),
+            Config::getValue( 'group/defaultGroup' ),
+        );
         Components::set( 'groupSelect', $select );
         Views::view( 'admin.users.create' );
     }
@@ -102,7 +105,7 @@ class Users extends AdminController {
         }
 
         if ( Input::exists( 'submit' ) ) {
-            if ( !FormChecker::check( 'editUser' ) ) {
+            if ( ! FormChecker::check( 'editUser' ) ) {
                 Issues::add( 'error', [ 'There was an error with your request.' => Check::userErrors() ] );
             } else {
                 $fields = [
@@ -110,6 +113,25 @@ class Users extends AdminController {
                     'email' => Input::post( 'email' ),
                     'userGroup' => Input::post( 'groupSelect' ),
                 ];
+
+                if ( Input::exists( 'avatar' ) ) {
+                    $folder = UPLOAD_DIRECTORY . $userData->username . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR;
+                    $upload = Upload::image( 'avatar', $folder );
+                    if ( $upload ) {
+                        $route = str_replace( APP_ROOT_DIRECTORY, '', $folder );
+                        $prefs = [];
+                        $prefs['avatar'] = $route . Upload::last();
+                        
+                        self::$user->updatePrefs( $prefs, $userData->ID );
+                    } else {
+                        Issues::add( 'error', [ 'There was an error with your avatar.' => Check::userErrors() ] );
+                    }
+                }
+
+                if ( Input::exists( 'password' ) ) {
+                    $fields['password'] = Hash::make( Input::post( 'password' ) );
+                }
+
                 if ( Input::exists( 'confirmed' ) ) {
                     $fields['confirmed'] = 1;
                 } else {
@@ -117,6 +139,7 @@ class Users extends AdminController {
                         $fields['confirmationCode'] = Code::genConfirmation();
                     }
                 }
+
                 if ( self::$user->update( $userData->ID, $fields ) ) {
                     Issues::add( 'success', 'User Updated.' );
                     return $this->index();
@@ -132,15 +155,21 @@ class Users extends AdminController {
             $userGroup = $userData->userGroup;
         }
         Forms::selectRadio( 'confirmed', $userData->confirmed );
-        $avatar = Forms::getFormFieldHtml( 'avatar', 'User Avatar', 'file', $avatarLocation );
+
-        $select = Forms::getFormFieldHtml( 'groupSelect', 'User Group', 'select', $userGroup, self::$group->listGroupsSimple() );
+        $avatar = $this->getAvatar( 'avatar', $avatarLocation );
         Components::set( 'AvatarSettings', $avatar );
+        
+        $select = Forms::getSelectHtml(
+            'groupSelect',
+            self::$group->listGroupsSimple(),
+            $userGroup,
+        );
         Components::set( 'groupSelect', $select );
         Views::view( 'admin.users.edit', $userData );
     }
 
     public function index() {
-        Views::view( 'admin.users.list', self::$user->userList() );
+        Views::view( 'admin.users.list', self::$user->listPaginated() );
     }
 
     public function view( $id = null ) {
@@ -153,4 +182,28 @@ class Users extends AdminController {
         }
         $this->index();
     }
+    
+    private function getAvatar( $name, $value ) {
+        $fieldname = str_ireplace( '/', '-', $name );
+
+        $html = '';
+        $fieldHtml = '';
+        $fieldHtml = Forms::getFileHtml( $fieldname );
+
+        $html .= '<div class="mb-3 row">';
+        $html .= '    <label for="' . $fieldname . '" class="col-lg-6 col-form-label text-end">' . ucfirst( $fieldname ) . '</label>';
+        $html .= '    <div class="col-lg-2">';
+        $html .= '        ' . $fieldHtml;
+        $html .= '    </div>';
+        $html .= '</div>';
+
+        $html .= '<div class="mb-3 row">';
+        $html .= '    <h4 class="col-lg-6 col-form-label text-end">Current Image</h4>';
+        $html .= '    <div class="col-lg-2">';
+        $html .= '        <img alt="User Avatar" src="{ROOT_URL}' . $value . '" class="img-circle img-fluid p-2 avatar-125">';
+        $html .= '    </div>';
+        $html .= '</div>';
+
+        return Template::parse( $html );
+    }
 }

app/controllers/alpha.php

@@ -1,35 +0,0 @@
-<?php
-/**
- * app/controllers/alpha.php
- *
- * This is the friends and family alpha controller.
- *
- * @version 3.0
- * @author  Joey Kimsey <Joey@thetempusproject.com>
- * @link    https://TheTempusProject.com
- * @license https://opensource.org/licenses/MIT [MIT LICENSE]
- */
-namespace TheTempusProject\Controllers;
-
-use TheTempusProject\Classes\Controller;
-use TheTempusProject\Houdini\Classes\Views;
-
-class Alpha extends Controller {
-    public function index() {
-        self::$title = 'Friends and Family Alpha';
-        self::$pageDescription = 'The Tempus Project friends and family alpha has begun. Please join me and take part in bringing a dream to reality.';
-        Views::view( 'alpha.index' );
-    }
-
-    public function crashcourse() {
-        self::$title = 'Friends and Family Crash-Course';
-        self::$pageDescription = 'The Tempus Project runs not only this site, but it can be used and deployed for any number of sites. This crash course is intended to give you all the knowledge you will need to start building your own applications powered by The Tempus Project.';
-        Views::view( 'alpha.crashcourse' );
-    }
-
-    public function certification() {
-        self::$title = 'Friends and Family Certification';
-        self::$pageDescription = 'The Tempus Project runs not only this site, but it can be used and deployed for any number of sites. This certification course is intended to give experienced users all the information they will need to start building your own applications powered by The Tempus Project.';
-        Views::view( 'alpha.certification' );
-    }
-}

app/controllers/api/auth.php

@@ -0,0 +1,38 @@
+<?php
+/**
+ * app/controllers/api/auth.php
+ *
+ * This is the api authentication controller.
+ *
+ * @version 3.0
+ * @author  Joey Kimsey <Joey@thetempusproject.com>
+ * @link    https://TheTempusProject.com
+ * @license https://opensource.org/licenses/MIT [MIT LICENSE]
+ */
+namespace TheTempusProject\Controllers\Api;
+
+use TheTempusProject\Models\User;
+use TheTempusProject\Classes\ApiController;
+use TheTempusProject\Houdini\Classes\Views;
+use TheTempusProject\Models\Token;
+
+class Auth extends ApiController {
+    public static $tokens;
+
+    public function __construct() {
+        parent::__construct();
+        self::$tokens = new Token;
+    }
+
+    public function refresh() {
+        $token = self::$tokens->refresh( self::$authToken->ID );
+        if ( empty( $token ) ) {
+            $responseType = 'error';
+            $response = 'IRDK';
+        } else {
+            $responseType = 'token';
+            $response = $token;
+        }
+        Views::view( 'api.response', ['response' => json_encode( [ $responseType => $response ], true )]);
+    }
+}

app/controllers/api/login.php

@@ -0,0 +1,50 @@
+<?php
+/**
+ * app/controllers/api/auth.php
+ *
+ * This is the api authentication controller.
+ *
+ * @version 3.0
+ * @author  Joey Kimsey <Joey@thetempusproject.com>
+ * @link    https://TheTempusProject.com
+ * @license https://opensource.org/licenses/MIT [MIT LICENSE]
+ */
+namespace TheTempusProject\Controllers\Api;
+
+use TheTempusProject\Classes\ApiController;
+use TheTempusProject\Houdini\Classes\Views;
+use TheTempusProject\Models\Token;
+use TheTempusProject\Models\User;
+use TheTempusProject\Houdini\Classes\Template;
+use TheTempusProject\Classes\Forms;
+use TheTempusProject\Bedrock\Functions\Input;
+
+class Login extends ApiController {
+    public static $tokens;
+    public static $user;
+
+    public function __construct() {
+        parent::__construct( false );
+        self::$tokens = new Token;
+        self::$user = new User;
+        Template::addHeader( 'Access-Control-Allow-Origin: *' );
+        Template::addHeader( 'Content-Type: application/json; charset=utf-8' );
+    }
+
+    public function index() {
+        if ( ! Forms::check( 'apiLogin' ) ) {
+            $responseType = 'error';
+            $response = 'malformed input';
+            return Views::view( 'api.response', ['response' => json_encode( [ $responseType => $response ], true )]);
+        }
+        $user = self::$user->authorize( Input::post( 'username' ), Input::post( 'password' ) );
+        if ( ! $user ) {
+            $responseType = 'error';
+            $response = 'bad credentials';
+            return Views::view( 'api.response', ['response' => json_encode( [ $responseType => $response ], true )]);
+        }
+        $responseType = 'token';
+        $token = self::$tokens->findOrCreateUserToken( $user->ID, true );
+        return Views::view( 'api.response', ['response' => json_encode( [ $responseType => $token ], true )]);
+    }
+}

app/controllers/api/users.php

@@ -30,7 +30,7 @@ class Users extends ApiController {
             $response = 'No user found.';
         } else {
             $responseType = 'data';
-            $response = $user;
+            $response = $user->ID;
         }
         Views::view( 'api.response', ['response' => json_encode( [ $responseType => $response ], true )]);
     }

app/controllers/home.php

@@ -27,26 +27,26 @@ use TheTempusProject\TheTempusProject as App;
 class Home extends Controller {
     public function index() {
         self::$title = '{SITENAME}';
-        self::$pageDescription = 'This is the homepage of your new Tempus Project Installation. Thank you for installing. find more info at https://thetempusproject.com';
+        self::$pageDescription = '{SITENAME} is here to provide you a better, faster, and easier - way to create and manage your own web applications.';
         Views::view( 'index' );
     }
 
     public function login() {
         self::$title = 'Portal - {SITENAME}';
-        self::$pageDescription = 'Please log in to use {SITENAME} member features.';
+        self::$pageDescription = 'Please log in to access all of the great features {SITENAME} has to offer.';
         if ( App::$isLoggedIn ) {
             return Issues::add( 'notice', 'You are already logged in. Please <a href="' . Routes::getAddress() . 'home/logout">click here</a> to log out.' );
         }
         if ( !Input::exists() ) {
-            return Views::view( 'login' );
+            return Views::view( 'auth.login' );
         }
         if ( !Forms::check( 'login' ) ) {
             Issues::add( 'error', [ 'There was an error with your login.' => Check::userErrors() ] );
-            return Views::view( 'login' );
+            return Views::view( 'auth.login' );
         }
         if ( !self::$user->logIn( Input::post( 'username' ), Input::post( 'password' ), Input::post( 'remember' ) ) ) {
             Issues::add( 'error', 'Username or password was incorrect.' );
-            return Views::view( 'login' );
+            return Views::view( 'auth.login' );
         }
         Session::flash( 'success', 'You have been logged in.' );
         if ( Input::exists( 'rurl' ) ) {
@@ -69,7 +69,7 @@ class Home extends Controller {
 
     public function profile( $id = null ) {
         self::$title = 'User Profile - {SITENAME}';
-        self::$pageDescription = 'User Profiles for {SITENAME}';
+        self::$pageDescription = 'User Profile - {SITENAME}';
         if ( !App::$isLoggedIn ) {
             return Issues::add( 'notice', 'You must be logged in to view this page.' );
         }
@@ -79,23 +79,31 @@ class Home extends Controller {
         }
         self::$title = $user->username . '\'s Profile - {SITENAME}';
         self::$pageDescription = 'User Profile for ' . $user->username . ' - {SITENAME}';
-        Views::view( 'profile', $user );
+        Views::view( 'profilePage', $user );
     }
 
     public function terms() {
         self::$title = 'Terms and Conditions - {SITENAME}';
         self::$pageDescription = '{SITENAME} Terms and Conditions of use. Please use {SITENAME} safely.';
-        Components::set( 'TERMS', Views::simpleView( 'terms' ) );
+        Components::set( 'TERMS', Views::simpleView( 'auth.terms' ) );
-        Views::raw( '<div class="terms-page">{TERMS}</div>' );
+        Views::view( 'termsPage' );
     }
 
-    public function hashtag( $id = null ) {
+    public function about() {
-        self::$title = 'HashTag - {SITENAME}';
+        self::$title = 'About - {SITENAME}';
-        self::$pageDescription = 'HashTags for {SITENAME}';
+        self::$pageDescription = '{SITENAME} was started by a developer with years of industry experience which has lead to a refined no-nonsense tool for everyone. Find out more about us here.';
-        if ( !App::$isLoggedIn ) {
+        Views::view( 'about' );
-            return Issues::add( 'notice', 'You must be logged in to view this page.' );
     }
-        // this should look up comments and blog posts with the hashtag in them
+
-        Views::view( 'hashtags' );
+    public function privacy() {
+        self::$title = 'Privacy Policy - {SITENAME}';
+        self::$pageDescription = 'At {SITENAME} you privacy is very important to us. On this page you can find a detailed outline of all the information we collect and how its used.';
+        Views::view( 'privacy' );
+    }
+
+    public function faq() {
+        self::$title = 'Frequently Asked Questions - {SITENAME}';
+        self::$pageDescription = 'Many times, we aren\'t the first to ask why or how something works. Here you will find a list of {SITENAME} commonly asked questions and our best answers.' ;
+        Views::view( 'faq' );
     }
 }

app/controllers/plugins.php

@@ -1,3 +0,0 @@
-<?php
-// the idea is that this will be info pages for the plugin various/info
-?>

app/controllers/register.php

@@ -24,37 +24,44 @@ use TheTempusProject\Houdini\Classes\Views;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Classes\Controller;
 use TheTempusProject\Classes\Forms;
+use TheTempusProject\Bedrock\Classes\Config;
 
 class Register extends Controller {
     public function confirm( $code = null ) {
+        Template::noIndex();
         self::$title = 'Confirm Email';
         if ( !isset( $code ) && !Input::exists( 'confirmationCode' ) ) {
-            return Views::view( 'email.confirmation' );
+            return Views::view( 'auth.confirmation' );
         }
         if ( Forms::check( 'emailConfirmation' ) ) {
             $code = Input::post( 'confirmationCode' );
         }
         if ( !self::$user->confirm( $code ) ) {
             Issues::add( 'error', 'There was an error confirming your account, please try again.' );
-            return Views::view( 'email.confirmation' );
+            return Views::view( 'auth.confirmation' );
         }
         Session::flash( 'success', 'You have successfully confirmed your email address.' );
         Redirect::to( 'home/index' );
     }
 
     public function index() {
-        self::$title = 'Register';
+        self::$title = '{SITENAME} Sign Up';
-        self::$pageDescription = 'Many features of the site are disabled or even hidden from unregistered users. On this page you can sign up for an account to access all the app has to offer.';
+        self::$pageDescription = 'Many features of {SITENAME} are disabled or hidden from unregistered users. On this page you can sign up for an account to access all the app has to offer.';
-        Components::set( 'TERMS', Views::simpleView( 'terms' ) );
+
+        if ( ! Config::getValue( 'main/registrationEnabled' ) ) {
+            return Issues::add( 'notice', 'The site administrator has disable the ability to register a new account.' );
+        }
+
+        Components::set( 'TERMS', Views::simpleView( 'auth.terms' ) );
         if ( App::$isLoggedIn ) {
             return Issues::add( 'notice', 'You are currently logged in.' );
         }
         if ( !Input::exists() ) {
-            return Views::view( 'register' );
+            return Views::view( 'auth.register' );
         }
         if ( !Forms::check( 'register' ) ) {
             Issues::add( 'error', [ 'There was an error with your registration.' => Check::userErrors() ] );
-            return Views::view( 'register' );
+            return Views::view( 'auth.register' );
         }
         self::$user->create( [
             'username' => Input::post( 'username' ),
@@ -73,7 +80,7 @@ class Register extends Controller {
         self::$title = 'Recover Account - {SITENAME}';
         Template::noIndex();
         if ( !Input::exists() ) {
-            return Views::view( 'forgot' );
+            return Views::view( 'auth.forgot' );
         }
         if ( Check::email( Input::post( 'entry' ) ) && self::$user->findByEmail( Input::post( 'entry' ) ) ) {
             $userData = self::$user->data();
@@ -89,48 +96,50 @@ class Register extends Controller {
             Redirect::to( 'home/login' );
         }
         Issues::add( 'error', 'User not found.' );
-        Views::view( 'forgot' );
+        Views::view( 'auth.forgot' );
     }
 
     public function resend() {
         self::$title = 'Resend Confirmation';
+        Template::noIndex();
         if ( !App::$isLoggedIn ) {
             return Issues::add( 'notice', 'Please log in to resend your confirmation email.' );
         }
-        if ( App::$activeUser->data()->confirmed == '1' ) {
+        if ( App::$activeUser->confirmed == '1' ) {
             return Issues::add( 'notice', 'Your account has already been confirmed.' );
         }
         if ( !Forms::check( 'confirmationResend' ) ) {
-            return Views::view( 'email.confirmation_resend' );
+            return Views::view( 'auth.confirmation_resend' );
         }
-        Email::send( App::$activeUser->data()->email, 'confirmation', App::$activeUser->data()->confirmationCode, [ 'template' => true ] );
+        Email::send( App::$activeUser->email, 'confirmation', App::$activeUser->confirmationCode, [ 'template' => true ] );
         Session::flash( 'success', 'Your confirmation email has been sent to the email for your account.' );
         Redirect::to( 'home/index' );
     }
 
     public function reset( $code = null ) {
         self::$title = 'Password Reset';
+        Template::noIndex();
         if ( !isset( $code ) && !Input::exists( 'resetCode' ) ) {
-            Issues::add( 'error', 'No reset code provided.' );
+            Issues::add( 'info', 'Please provide a reset code.' );
-            return Views::view( 'password_reset_code' );
+            return Views::view( 'auth.password_reset_code' );
         }
         if ( Input::exists( 'resetCode' ) ) {
-            if ( Forms::check( 'password_reset_code' ) ) {
+            if ( Forms::check( 'passwordResetCode' ) ) {
                 $code = Input::post( 'resetCode' );
             }
         }
-        if ( !self::$user->checkCode( $code ) ) {
+        if ( ! self::$user->checkCode( $code ) ) {
             Issues::add( 'error', 'There was an error with your reset code. Please try again.' );
-            return Views::view( 'password_reset_code' );
+            return Views::view( 'auth.password_reset_code' );
-        }
-        if ( !Input::exists() ) {
-            return Views::view( 'password_reset' );
-        }
-        if ( !Forms::check( 'passwordReset' ) ) {
-            Issues::add( 'error', [ 'There was an error with your request.' => Check::userErrors() ] );
-            return Views::view( 'password_reset' );
         }
         Components::set( 'resetCode', $code );
+        if ( ! Input::exists('password') ) {
+            return Views::view( 'auth.password_reset' );
+        }
+        if ( ! Forms::check( 'passwordReset' ) ) {
+            Issues::add( 'error', [ 'There was an error with your request.' => Check::userErrors() ] );
+            return Views::view( 'auth.password_reset' );
+        }
         self::$user->changePassword( $code, Input::post( 'password' ) );
         Email::send( self::$user->data()->email, 'passwordChange', null, [ 'template' => true ] );
         Session::flash( 'success', 'Your Password has been changed, please use your new password to log in.' );

app/controllers/usercp.php

@@ -36,13 +36,14 @@ class Usercp extends Controller {
             Redirect::home();
         }
         Template::noIndex();
-        Navigation::activePageSelect( 'nav.usercp', null, true );
     }
 
     public function email() {
         self::$title = 'Email Settings';
+        $menu = Views::simpleView( 'nav.usercp', App::$userCPlinks );
+        Navigation::activePageSelect( $menu, null, true, true );
         if ( App::$activeUser->confirmed != '1' ) {
-            return Issues::add( 'notice', 'You need to confirm your email address before you can make modifications. If you would like to resend that confirmation link, please <a href="{BASE}register/resend">click here</a>', true );
+            return Issues::add( 'notice', 'You need to confirm your email address before you can make modifications. If you would like to resend that confirmation link, please <a href="/register/resend">click here</a>', true );
         }
         if ( !Input::exists() ) {
             return Views::view( 'user_cp.email_change' );
@@ -67,11 +68,15 @@ class Usercp extends Controller {
 
     public function index() {
         self::$title = 'User Control Panel';
-        Views::view( 'profile', App::$activeUser );
+        $menu = Views::simpleView( 'nav.usercp', App::$userCPlinks );
+        Navigation::activePageSelect( $menu, null, true, true );
+        Views::view( 'user_cp.profile', App::$activeUser );
     }
 
     public function password() {
         self::$title = 'Password Settings';
+        $menu = Views::simpleView( 'nav.usercp', App::$userCPlinks );
+        Navigation::activePageSelect( $menu, null, true, true );
         if ( !Input::exists() ) {
             return Views::view( 'user_cp.password_change' );
         }
@@ -93,8 +98,10 @@ class Usercp extends Controller {
 
     public function settings() {
         self::$title = 'Preferences';
+        $menu = Views::simpleView( 'nav.usercp', App::$userCPlinks );
+        Navigation::activePageSelect( $menu, null, true, true );
         $prefs = new Preferences;
-        $fields = App::$activePrefs;
+        $userPrefs = App::$activePrefs;
         if ( Input::exists( 'submit' ) ) {
             $fields = $prefs->convertFormToArray( true, false );
             // @TODO  now i may need to rework the form checker to work with this....
@@ -103,9 +110,48 @@ class Usercp extends Controller {
             // }
             self::$user->updatePrefs( $fields, App::$activeUser->ID );
             Issues::add( 'success', 'Your preferences have been updated.' );
+            // if the image upload fails, need to fall back on original
+            if ( empty( $fields['avatar'] ) ) {
+                $fields['avatar'] = $userPrefs['avatar'];
+            }
+        } else {
+            $fields = $userPrefs;
         }
         Components::set( 'AVATAR_SETTINGS', $fields['avatar'] );
         Components::set( 'PREFERENCES_FORM', $prefs->getFormHtml( $fields ) );
         Views::view( 'user_cp.settings', App::$activeUser );
     }
+
+    public function updatePref() {
+        Template::setTemplate( 'api' );
+        if ( ! App::$isLoggedIn ) {
+            return Views::view( 'api.response', ['response' => json_encode( [ 'error' => 'Not Logged In' ], true )]);
+        }
+        if ( ! Forms::check( 'updatePreference' ) ) {
+            return Views::view( 'api.response', ['response' => json_encode( [ 'error' => Check::userErrors() ], true )]);
+        }
+        $name = Input::post( 'prefName' );
+        $value = Input::post('prefValue' );
+
+        if ( 'false' === $value ) {
+            $value = false;
+        } elseif ( 'true' === $value ) {
+            $value = true;
+        }
+
+        if ( empty( Preferences::get( $name ) ) ) {
+            return Views::view( 'api.response', ['response' => json_encode( [ 'error' => 'Unknown Preference' ], true )]);
+        }
+
+        $prefs = new Preferences;
+        $fields1 = $prefs->convertFormToArray( true, false );
+        $fields3 = $fields1;
+
+        if ( isset( $fields1[ $name ] ) ) {
+            $fields3[ $name ] = $value;
+        }
+        $result = self::$user->updatePrefs( $fields3, App::$activeUser->ID );
+
+        return Views::view( 'api.response', ['response' => json_encode( $result, true )]);
+    }
 }

app/css/main-dark.css

@@ -0,0 +1,158 @@
+/**
+ * app/css/main-dark.css
+ *
+ * This file provides dark mode styles to override existing Bootstrap 5 base styles.
+ *
+ * @version 3.0-dark
+ * @author  Joey Kimsey <Joey@thetempusproject.com>
+ * @link    https://TheTempusProject.com
+ * @license https://opensource.org/licenses/MIT [MIT LICENSE]
+ */
+
+.context-main-border {
+    border-color: #f5f5f5!important;
+}
+
+.context-main-bg {
+    background-color: #2c2c2c;
+}
+.context-second-bg {
+    background-color: #383838;
+}
+.context-third-bg {
+    background-color: #3a3a3a;
+}
+.context-other-bg {
+    background-color: #1e1e1e;
+}
+
+.context-main {
+    color: #fff;
+}
+
+
+
+.bg-default {
+    background-color: #2c2c2c;
+}
+hr {
+    color: #f5f5f5;
+}
+
+
+
+
+.bg-none,.bg-warning {
+    color: #000 !important; 
+}
+.accordion-button:not(.collapsed) {
+    color: #f5f5f5;
+    background-color: var(--bs-accordion-dark-active-bg);
+}
+body {
+    background-image: linear-gradient(180deg, #2c2c2c, #1e1e1e 100px, #1e1e1e);
+    color: #f5f5f5;
+}
+
+/**
+ * Install Terms
+ */
+.install-terms {
+    border: 1px solid #555;
+    background: #3a3a3a;
+}
+.install-terms p,
+.install-terms li {
+    color: #dcdcdc;
+}
+.install-terms h3 {
+    color: #ffffff;
+}
+.install-terms h4 {
+    color: #eaeaea;
+}
+.install-terms strong {
+    color: #ffffff;
+}
+
+/**
+ * Terms Page
+ */
+.terms-page {
+    border: 1px solid #555;
+    background: #3a3a3a;
+}
+.terms-page p,
+.terms-page li {
+    color: #dcdcdc;
+}
+.terms-page h3 {
+    color: #ffffff;
+}
+.terms-page h4 {
+    color: #eaeaea;
+}
+.terms-page strong {
+    color: #ffffff;
+}
+
+/**
+ * Terms
+ */
+.terms {
+    border: 1px solid #555;
+    background: #3a3a3a;
+}
+.terms p,
+.terms li {
+    color: #dcdcdc;
+}
+.terms h3 {
+    color: #ffffff;
+}
+.terms h4 {
+    color: #eaeaea;
+}
+.terms strong {
+    color: #ffffff;
+}
+
+/**
+ * Form Control
+ */
+.form-control-dark:focus {
+    border-color: #1e90ff;
+    box-shadow: 0 0 0 .25rem rgba(30, 144, 255, .5);
+}
+
+/**
+ * Example Divider
+ */
+.b-example-divider {
+    background-color: rgba(255, 255, 255, .1);
+}
+
+/**
+ * Text Shadows
+ */
+.text-shadow-1 {
+    text-shadow: 0 .125rem .25rem rgba(255, 255, 255, .25);
+}
+.text-shadow-2 {
+    text-shadow: 0 .25rem .5rem rgba(255, 255, 255, .25);
+}
+.text-shadow-3 {
+    text-shadow: 0 .5rem 1.5rem rgba(255, 255, 255, .25);
+}
+
+.form-control {
+    background-color: #1f1f1f;
+    color: #e0e0e0;
+}
+
+.form-control:focus {
+    color: #e0e0e0;
+    border-color: #1e90ff;
+    background-color: #1f1f1f;
+    box-shadow: 0 0 0 .25rem rgba(30, 144, 255, .5);
+}

app/css/main.css

@@ -8,21 +8,103 @@
  * @link    https://TheTempusProject.com
  * @license https://opensource.org/licenses/MIT [MIT LICENSE]
  */
+
+.context-main-border {
+    border-color: #1e1e1e!important;
+}
+
+.context-main-bg {
+    background-color: #f7f7f7;
+    /* background-color: #b1b; */
+}
+.context-second-bg {
+    background-color: #eaeaea;
+    /* background-color: #b1b; */
+}
+.context-third-bg {
+    background-color: #ccc;
+    /* background-color: #b1b; */
+}
+
+.context-main {
+    color: #000;
+}
+
+
+.nav-link.active {
+    font-weight: bold; /* Make the text bold */
+}
+
+hr {
+    color: #000;
+}
+
+/* Base styles for the switch container */
+.material-switch {
+    position: relative;
+    display: inline-block;
+    width: 50px;
+    height: 25px;
+}
+
+/* Hide the default checkbox */
+.material-switch input {
+    opacity: 0;
+    width: 0;
+    height: 0;
+}
+
+/* Style the label as the switch */
+.material-switch .label-default {
+    position: absolute;
+    cursor: pointer;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: var(--switch-off-bg, #ccc);
+    border-radius: 25px;
+    transition: background-color 0.3s ease-in-out;
+}
+
+/* Style the toggle circle (slider) */
+.material-switch .label-default::before {
+    content: '';
+    position: absolute;
+    height: 20px;
+    width: 20px;
+    border-radius: 50%;
+    background-color: var(--switch-slider-bg, #fff);
+    bottom: 2.5px;
+    left: 5px;
+    transition: transform 0.3s ease-in-out;
+    box-shadow: 0 2px 4px #00000033;
+}
+
+/* Change background color when checked */
+.material-switch input:checked + .label-default {
+    background-color: var(--switch-on-bg, #555); /* Bootstrap primary color */
+}
+
+/* Move the slider when checked */
+.material-switch input:checked + .label-default::before {
+    transform: translateX(25px); /* Adjust based on switch width */
+}
+
 html {
     font-family: 'Open Sans', sans-serif;
     position: relative;
     min-height: 100%;
 }
-body {
-    margin-top: 100px;
-}
 pre {
     white-space: pre-wrap;
 }
+
+body {
+    background-color: #e4e4e4;
+    /* background-image: linear-gradient(180deg, #eee, #fff 100px, #fff); */
+}
 @media ( min-width: 768px ) {
-    body {
-        margin-top: 75px;
-    }
     .main {
         padding-right: 40px;
         padding-left: 40px;
@@ -31,546 +113,9 @@ pre {
         padding-right: 225px;
         padding-left: 0;
     }
-    .side-nav {
+    .bd-placeholder-img-lg {
-        right: 0;
+        font-size: 3.5rem;
-        left: auto;
     }
-    .side-nav {
-        position: fixed;
-        top: 51px;
-        left: 225px;
-        width: 225px;
-        margin-left: -225px;
-        border: none;
-        border-radius: 0;
-        overflow-y: auto;
-        background-color: #222;
-        bottom: 53px;
-        overflow-x: hidden;
-        padding-bottom: 10px;
-    }
-    .side-nav>li>a {
-        width: 225px;
-    }
-    .side-nav li a:hover,
-    .side-nav li a:focus {
-        outline: none;
-        background-color: #000 !important;
-    }
-}
-
-/**
- * Other
- */
-.custom-nav {
-    display: relative;
-    float: right;
-}
-.navbar-form-alt {
-    margin-top: 10px;
-    margin-bottom: 10px;
-}
-.bars {
-    display: block;
-    width: 60px;
-    height: 3px;
-    background-color: #333;
-    box-shadow: 0 5px 0 #333, 0 10px 0 #333;
-}
-.slide-text-bg {
-    opacity: 0.6;
-}
-.avatar-125 {
-    height: 125px;
-    width: 125px;
-}
-.full {
-    width: 100%;
-}
-.gap {
-    height: 30px;
-    width: 100%;
-    clear: both;
-    display: block;
-}
-.supportLi h4 {
-    font-size: 20px;
-    font-weight: lighter;
-    line-height: normal;
-    margin-bottom: 0 !important;
-    padding-bottom: 0;
-}
-.bg-gray {
-    background-image: -moz-linear-gradient( center bottom, #BBBBBB 0%, #F0F0F0 100% );
-    box-shadow: 0 1px 0 #B4B3B3;
-}
-.payments {
-    font-size: 1.5em;
-}
-.UI-buffer {
-    padding-top: 35px;
-    height: auto;
-    border-bottom: 1px solid #CCCCCC;
-}
-.avatar {
-    max-width: 33px;
-}
-.UI-page-buffer {
-    padding-top: 30px;
-    position: relative;
-    height: auto;
-    border-bottom: 1px solid #CCCCCC;
-}
-.main {
-    padding: 20px;
-    padding-bottom: 75px;
-}
-.user-row {
-    margin-bottom: 14px;
-}
-.user-row:last-child {
-    margin-bottom: 0;
-}
-.dropdown-user {
-    margin: 13px 0;
-    padding: 5px;
-    height: 100%;
-}
-.dropdown-user:hover {
-    cursor: pointer;
-}
-.table-user-information>tbody>tr {
-    border-top: 1px solid rgb( 221, 221, 221 );
-}
-.table-user-information>tbody>tr:first-child {
-    border-top: 0;
-}
-.table-user-information>tbody>tr>td {
-    border-top: 0;
-}
-.top-pad {
-    margin-top: 70px;
-}
-.foot-pad {
-    padding-bottom: 0;
-    /* padding-bottom: 261px; */
-}
-.dynamic-footer-padding {
-    padding-bottom: var(--footer-height);
-}
-.footer-head .navbar-toggle {
-    display: inline-block;
-    float: none;
-}
-.avatar-round-40 {
-    height: 40px;
-    width: 40px;
-}
-.sticky-foot-head {
-    z-index: 10;
-    position: fixed;
-    bottom: 51px;
-    width: 100%;
-    background: #EDEFF1;
-    border-bottom: 1px solid #CCCCCC;
-    border-top: 1px solid #DDDDDD;
-}
-.sticky-foot {
-    background-color: #000;
-    position: fixed;
-    bottom: 0;
-    width: 100%;
-}
-.sticky-copy {
-    z-index: 10;
-    padding-top: 10px;
-    padding-bottom: 10px;
-    height: 50px;
-    background: #E3E3E3;
-    border-bottom: 1px solid #CCCCCC;
-    border-top: 1px solid #DDDDDD;
-}
-
-/**
- * Main Carousel
- */
-.main-text {
-    padding-bottom: 0px;
-    padding-top: 0px;
-    top: 10px;
-    bottom: auto;
-    z-index: 10;
-    width: auto;
-    color: #FFF;
-}
-.btn-min-block {
-    min-width: 170px;
-    line-height: 26px;
-}
-.btn-clear {
-    color: #FFF;
-    background-color: transparent;
-    border-color: #FFF;
-    margin-right: 15px;
-}
-.btn-clear:hover {
-    color: #000;
-    background-color: #FFF;
-}
-#carousel-example-generic {
-    margin-bottom: 30px;
-}
-.col-centered {
-    float: none;
-    margin: 0 auto;
-}
-
-/**
- * Top Navigation
- */
-.top-nav {
-    padding: 0 15px;
-}
-.top-nav>li {
-    display: inline-block;
-    float: left;
-}
-.top-nav>li>a {
-    padding-top: 15px;
-    padding-bottom: 15px;
-    line-height: 20px;
-    color: #999;
-}
-.top-nav>li>a:hover,
-.top-nav>li>a:focus,
-.top-nav>.open>a,
-.top-nav>.open>a:hover,
-.top-nav>.open>a:focus {
-    color: #fff;
-    background-color: #000;
-}
-.top-nav>.open>.dropdown-menu {
-    float: left;
-    position: absolute;
-    margin-top: 0;
-    border: 1px solid rgba( 0, 0, 0, .15 );
-    border-top-left-radius: 0;
-    border-top-right-radius: 0;
-    background-color: #fff;
-    -webkit-box-shadow: 0 6px 12px rgba( 0, 0, 0, .175 );
-    box-shadow: 0 6px 12px rgba( 0, 0, 0, .175 );
-}
-.top-nav>.open>.dropdown-menu>li>a {
-    white-space: normal;
-}
-
-/**
- * Messages Dropdown
- */
-ul.message-dropdown {
-    padding: 0;
-    max-height: 250px;
-    overflow-x: hidden;
-    overflow-y: auto;
-}
-li.message-header {
-    margin: 5px 0;
-    border-bottom: 1px solid rgba( 0, 0, 0, .15 );
-}
-li.message-preview {
-    width: 275px;
-    border-bottom: 1px solid rgba( 0, 0, 0, .15 );
-}
-li.message-preview>a {
-    padding-top: 15px;
-    padding-bottom: 15px;
-}
-li.message-footer {
-    margin: 5px 0;
-}
-ul.alert-dropdown {
-    width: 200px;
-}
-
-/**
- * Widget
- */
-.widget .list-group {
-    margin-bottom: 0;
-}
-.widget .panel-title {
-    display: inline
-}
-.widget .label {
-    float: right;
-}
-.widget li.list-group-item {
-    border-radius: 0;
-    border: 0;
-    border-top: 1px solid #ddd;
-}
-.widget li.list-group-item:hover {
-    background-color: rgba( 86, 61, 124, .1 );
-}
-.widget .mic-info {
-    color: #666666;
-    font-size: 11px;
-}
-.widget .action {
-    margin-top: 5px;
-}
-.widget .comment-text {
-    font-size: 12px;
-}
-.widget .btn-block {
-    border-top-left-radius: 0px;
-    border-top-right-radius: 0px;
-}
-
-/**
- * Signin Form
- */
-.form-signin {
-    max-width: 330px;
-    padding: 15px;
-    margin: 0 auto;
-}
-.form-signin .form-signin-heading,
-.form-signin .checkbox {
-    margin-bottom: 10px;
-}
-.form-signin .checkbox {
-    font-weight: normal;
-}
-.form-signin .form-control {
-    position: relative;
-    height: auto;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-    padding: 10px;
-    font-size: 16px;
-}
-.form-signin .form-control:focus {
-    z-index: 2;
-}
-.form-signin input[type="text"] {
-    margin-bottom: -1px;
-    border-bottom-right-radius: 0;
-    border-bottom-left-radius: 0;
-}
-.form-signin input[type="password"] {
-    margin-bottom: 10px;
-    border-top-left-radius: 0;
-    border-top-right-radius: 0;
-}
-
-/**
- * Footer and Copyright
- */
-.copy {
-    z-index: 10;
-    padding-top: 10px;
-    padding-bottom: 10px;
-    position: absolute;
-    bottom: 0;
-    width: 100%;
-    height: 50px;
-    background: #E3E3E3;
-    border-bottom: 1px solid #CCCCCC;
-    border-top: 1px solid #DDDDDD;
-}
-.footer-head {
-    z-index: 10;
-    position: absolute;
-    bottom: 51px;
-    width: 100%;
-    background: #EDEFF1;
-    border-bottom: 1px solid #CCCCCC;
-    border-top: 1px solid #DDDDDD;
-}
-.footer-head p {
-    margin: 0;
-}
-.footer-head img {
-    max-width: 100%;
-}
-.footer-head h3 {
-    border-bottom: 1px solid #BAC1C8;
-    color: #54697E;
-    font-size: 18px;
-    font-weight: 600;
-    line-height: 27px;
-    padding: 5px 0 10px;
-    text-transform: uppercase;
-}
-.footer-head ul {
-    font-size: 13px;
-    list-style-type: none;
-    margin-left: 0;
-    padding-left: 0;
-    margin-top: 15px;
-    color: #7F8C8D;
-}
-.footer-head ul li a {
-    padding: 0 0 5px 0;
-    display: inline-block;
-}
-.footer-head a {
-    color: #78828D
-}
-
-/**
- * Side Navigation
- */
-.side-nav>li>ul {
-    padding: 0;
-}
-.side-nav>li>ul>li>a {
-    display: block;
-    padding: 10px 15px 10px 38px;
-    text-decoration: none;
-    color: #999;
-}
-.side-nav>li>ul>li>a:hover {
-    color: #fff;
-}
-.side-nav .active > a {
-    color: #fff;
-    background-color: #080808;
-}
-.side-nav .active > a:hover {
-    color: #fff;
-    background-color: #080808;
-}
-
-/**
- * Social
- */
-.social {
-    margin-top: 75px;
-    bottom: 0;
-}
-.content {
-    position: absolute;
-}
-.social span {
-    background: none repeat scroll 0 0 #B5B5B5;
-    border: 2px solid #B5B5B5;
-    -webkit-border-radius: 50%;
-    -moz-border-radius: 50%;
-    -o-border-radius: 50%;
-    -ms-border-radius: 50%;
-    border-radius: 50%;
-    float: center;
-    height: 36px;
-    line-height: 36px;
-    margin: 0 8px 0 0;
-    padding: 0;
-    text-align: center;
-    width: 41px;
-    transition: all 0.5s ease 0s;
-    -moz-transition: all 0.5s ease 0s;
-    -webkit-transition: all 0.5s ease 0s;
-    -ms-transition: all 0.5s ease 0s;
-    -o-transition: all 0.5s ease 0s;
-}
-.social span:hover {
-    transform: scale( 1.15 ) rotate( 360deg) ;
-    -webkit-transform: scale( 1.1 ) rotate( 360deg) ;
-    -moz-transform: scale( 1.1 ) rotate( 360deg) ;
-    -ms-transform: scale( 1.1 ) rotate( 360deg) ;
-    -o-transform: scale( 1.1 ) rotate( 360deg) ;
-}
-.social span a {
-    color: #EDEFF1;
-}
-.social span:hover {
-    border: 2px solid #2c3e50;
-    background: #2c3e50;
-}
-.social span a i {
-    font-size: 16px;
-    margin: 0 0 0 5px;
-    color: #EDEFF1 !important;
-}
-
-/**
- * Newsletter Box
- */
-.newsletter-box input#appendedInputButton {
-    background: #FFFFFF;
-    display: inline-block;
-    float: center;
-    height: 30px;
-    clear: both;
-    width: 100%;
-}
-.newsletter-box .btn {
-    border: medium none;
-    -webkit-border-radius: 3px;
-    -moz-border-radius: 3px;
-    -o-border-radius: 3px;
-    -ms-border-radius: 3px;
-    border-radius: 3px;
-    display: inline-block;
-    height: 40px;
-    padding: 0;
-    width: 100%;
-    color: #fff;
-}
-.newsletter-box {
-    overflow: hidden;
-}
-
-/**
- * Colored Badges
- */
-.badge {
-    padding: 1px 9px 2px;
-    font-size: 12.025px;
-    font-weight: bold;
-    white-space: nowrap;
-    color: #ffffff;
-    background-color: #999999;
-    -webkit-border-radius: 9px;
-    -moz-border-radius: 9px;
-    border-radius: 9px;
-}
-.badge:hover {
-    color: #ffffff;
-    text-decoration: none;
-    cursor: pointer;
-}
-.badge-error {
-    background-color: #b94a48;
-}
-.badge-error:hover {
-    background-color: #953b39;
-}
-.badge-warning {
-    background-color: #f89406;
-}
-.badge-warning:hover {
-    background-color: #c67605;
-}
-.badge-success {
-    background-color: #468847;
-}
-.badge-success:hover {
-    background-color: #356635;
-}
-.badge-info {
-    background-color: #3a87ad;
-}
-.badge-info:hover {
-    background-color: #2d6987;
-}
-.badge-inverse {
-    background-color: #333333;
-}
-.badge-inverse:hover {
-    background-color: #1a1a1a;
 }
 
 /**
@@ -658,12 +203,120 @@ ul.alert-dropdown {
 .terms strong {
     color: #000;
 }
-
+.pricing-header {
-
+    max-width: 700px;
-.navbar-header {
+}
-    margin-right: 75px;
+.pricing-container {
+    max-width: 960px;
+}
+.bd-placeholder-img {
+    font-size: 1.125rem;
+    text-anchor: middle;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    user-select: none;
+}
+.b-example-vr {
+    flex-shrink: 0;
+    width: 1.5rem;
+    height: 100vh;
+}
+.bi {
+    vertical-align: -.125em;
+    fill: currentColor;
+}
+.form-control-dark {
+    border-color: var(--bs-gray);
+}
+.form-control-dark:focus {
+    border-color: #fff;
+    box-shadow: 0 0 0 .25rem rgba(255, 255, 255, .25);
+}
+.text-small {
+    font-size: 85%;
+}
+.dropdown-toggle {
+    outline: 0;
+}
+.b-example-divider {
+    height: 3rem;
+    background-color: rgba(0, 0, 0, .1);
+    border: solid rgba(0, 0, 0, .15);
+    border-width: 1px 0;
+    box-shadow: inset 0 .5em 1.5em rgba(0, 0, 0, .1), inset 0 .125em .5em rgba(0, 0, 0, .15);
+}
+.b-example-vr {
+    flex-shrink: 0;
+    width: 1.5rem;
+    height: 100vh;
+}
+.nav-scroller {
+    position: relative;
+    z-index: 2;
+    height: 2.75rem;
+    overflow-y: hidden;
+}
+.nav-scroller .nav {
+    display: flex;
+    flex-wrap: nowrap;
+    padding-bottom: 1rem;
+    margin-top: -1px;
+    overflow-x: auto;
+    text-align: center;
+    white-space: nowrap;
+    -webkit-overflow-scrolling: touch;
+}
+.b-example-vr {
+    flex-shrink: 0;
+    width: 1.5rem;
+    height: 100vh;
+}
+.feature-icon {
+    width: 4rem;
+    height: 4rem;
+    border-radius: .75rem;
+}
+.icon-link > .bi {
+    margin-top: .125rem;
+    margin-left: .125rem;
+    fill: currentcolor;
+    transition: transform .25s ease-in-out;
+}
+.icon-link:hover > .bi {
+    transform: translate(.25rem);
+}
+.icon-square {
+    width: 3rem;
+    height: 3rem;
+    border-radius: .75rem;
+}
+.text-shadow-1 {
+    text-shadow: 0 .125rem .25rem rgba(0, 0, 0, .25);
+}
+.text-shadow-2 {
+    text-shadow: 0 .25rem .5rem rgba(0, 0, 0, .25);
+}
+.text-shadow-3 {
+    text-shadow: 0 .5rem 1.5rem rgba(0, 0, 0, .25);
+}
+.card-cover {
+    background-repeat: no-repeat;
+    background-position: center center;
+    background-size: cover;
+}
+.feature-icon-small {
+    width: 3rem;
+    height: 3rem;
 }
 
-.pagination {
+.gradient-custom-2 {
-    padding-left: 75px;
+    /* fallback for old browsers */
+    background: #fccb90;
+    
+    /* Chrome 10-25, Safari 5.1-6 */
+    background: -webkit-linear-gradient(to right, #2c2c2c, #1e1e1e, #1e1e1e);
+    
+    /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */
+    background: linear-gradient(to right, #2c2c2c, #1e1e1e, #1e1e1e);
 }
+

app/css/wysiwyg.css

@@ -1,218 +0,0 @@
-/**
- * app/css/wysiwyg.css
- *
- * This file is for the wysiwyg editor's css.
- *
- * @version 3.0
- * @author  Joey Kimsey <Joey@thetempusproject.com>
- * @link    https://TheTempusProject.com
- * @license https://opensource.org/licenses/MIT [MIT LICENSE]
- */
-body {
-  margin: 0;
-  height: 100vh;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  font-family: 'Helvetica Neue', 'Helvetica', arial, sans-serif;
-}
-
-/* WYSIWYG Editor */
-.wp-webdeasy-comment-editor {
-  width: 40rem;
-  min-height: 18rem;
-  box-shadow: 0 0 4px 1px rgba(0, 0, 0, 0.3);
-  border-top: 6px solid #4a4a4a;
-  border-radius: 3px;
-  margin: 2rem 0;
-  
-  .toolbar {
-    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2);
-    
-    .line {
-      display: flex;
-      border-bottom: 1px solid #e2e2e2;
-      
-      &:last-child {
-        border-bottom: none;
-      }
-      
-      .box {
-        display: flex;
-        border-left: 1px solid #e2e2e2; 
-        
-        .editor-btn {
-          display: block;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          position: relative;
-          transition: .2s ease all;
-
-          &:hover, &.active {
-            background-color: #e1e1e1;
-            cursor: pointer;
-          }
-          
-          &.icon img {
-            width: 15px;
-            padding: 9px;
-            box-sizing: content-box;
-          }
-          
-          &.icon.smaller img {
-            width: 16px;
-          }
-          
-          &.has-submenu {
-            width: 20px;
-            padding: 0 10px;
-            
-            &::after {
-              content: '';
-              width: 6px;
-              height: 6px;
-              position: absolute;
-              background-image: url(https://img.icons8.com/ios-glyphs/30/000000/chevron-down.png);
-              background-repeat: no-repeat;
-              background-size: cover;
-              background-position: center;
-              right: 4px;
-            }
-            
-            .submenu {
-              display: none;
-              position: absolute;
-              top: 34px;
-              left: -1px;
-              z-index: 10;
-              background-color: #FFF;
-              border: 1px solid #b5b5b5;
-              border-top: none;
-              
-              .btn {
-                width: 39px;
-              }
-              
-              &:hover {
-                display: block;
-              }
-            }
-            
-            &:hover .submenu {
-              display: block;
-            }
-          }
-        }  
-      }
-    }
-  }
-  
-  .content-area {
-    padding: 15px 12px;
-    line-height: 1.5;
-    
-    .visuell-view {
-      outline: none;
-      min-height: 12rem;
-      
-      p {
-        margin: 12px 0;
-      } 
-    }
-    
-    .html-view {
-      outline: none;
-      display: none;
-      width: 100%;
-      height: 200px;
-      border: none;
-      resize: none;
-    }
-  }
-}
-
-
-/* Modal */
-.modal {
-  z-index: 40;
-  display: none;
-  
-  .modal-wrapper {
-    background-color: #FFF;
-    padding: 1rem;
-    position: fixed;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    width: 20rem;
-    min-height: 10rem;
-    z-index: 41;
-    
-    .close {
-      position: absolute;
-      top: 1rem;
-      right: 1rem;
-      cursor: pointer;
-    }
-    
-    .modal-content {
-      flex-direction: column;
-      
-      h3 {
-        margin-top: 0;
-      }
-        
-      input {
-        margin: 1rem 0;
-        padding: .5rem;
-      }
-      
-      input[type="text"] {
-        width: calc(100% - 1rem);
-      }
-      
-      .row {
-        
-        label {
-          margin-left: .5rem;
-        }
-      }
-      
-      button {
-        background-color: #D2434F;
-        border: 0;
-        color: #FFF;
-        padding: .5rem 1.2rem;
-        cursor: pointer;
-      } 
-    }
-  }
-  
-  .modal-bg {
-    position: fixed;
-    background-color: rgba(0, 0, 0, .3);
-    width: 100vw;
-    height: 100vh;
-    top: 0;
-    left: 0;
-  }
-}
-
-/* Codepen Footer */
-footer {
-  position: fixed;
-  bottom: 0;
-  display: flex;
-  
-  p {
-    margin: 0.5rem 1rem;
-    font-size: 12px;
-  }
-  
-  a {
-    text-decoration: none;
-    font-weight: bold;
-    color: #000;
-  }
-}

app/functions/common.php

@@ -89,3 +89,31 @@ function iv( $variable ) {
     echo var_export( $variable, true );
     echo '</pre>';
 }
+
+function generateToken(): string {
+    return bin2hex(random_bytes(32)); // Generates a 64-character hexadecimal token
+}
+
+function generateRandomString( $length = 10 ) {
+    $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+    $charactersLength = strlen( $characters );
+    $randomString = '';
+    for ($i = 0; $i < $length; $i++) {
+        $randomString .= $characters[random_int(0, $charactersLength - 1)];
+    }
+    return $randomString;
+}
+
+function generateUuidV4(): string {
+    // Generate 16 random bytes
+    $data = random_bytes(16);
+
+    // Set the version to 4 -> random (bits 12-15 of time_hi_and_version)
+    $data[6] = chr((ord($data[6]) & 0x0f) | 0x40);
+
+    // Set the variant to RFC 4122 -> (bits 6-7 of clock_seq_hi_and_reserved)
+    $data[8] = chr((ord($data[8]) & 0x3f) | 0x80);
+
+    // Convert to hexadecimal and format as a UUID
+    return vsprintf('%s%s-%s-%s-%s-%s%s%s', str_split(bin2hex($data), 4));
+}

app/functions/forms.php

@@ -1,542 +0,0 @@
-<?php
-/**
- * app/functions/forms.php
- *
- * This class is used in conjunction with TheTempusProject\Bedrock\Classes\Check
- * to house complete form verification. You can utilize the error reporting
- * to easily define exactly what feedback you would like to give.
- *
- * @version 3.0
- * @author  Joey Kimsey <Joey@thetempusproject.com>
- * @link    https://TheTempusProject.com
- * @license https://opensource.org/licenses/MIT [MIT LICENSE]
- */
-namespace TheTempusProject;
-
-use TheTempusProject\Bedrock\Functions\Input;
-use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Models\User;
-use TheTempusProject\Classes\Forms;
-use TheTempusProject\Bedrock\Classes\Database;
-
-class TTPForms extends Forms {
-    /**
-     * Adds these functions to the form list.
-     */
-    public function __construct() {
-        self::addHandler( 'passwordResetCode',   __CLASS__, 'passwordResetCode' );
-        self::addHandler( 'createRoute',         __CLASS__, 'createRoute' );
-        self::addHandler( 'editRoute',           __CLASS__, 'editRoute' );
-        self::addHandler( 'register',            __CLASS__, 'register' );
-        self::addHandler( 'createUser',          __CLASS__, 'createUser' );
-        self::addHandler( 'editUser',            __CLASS__, 'editUser' );
-        self::addHandler( 'login',               __CLASS__, 'login' );
-        self::addHandler( 'changeEmail',         __CLASS__, 'changeEmail' );
-        self::addHandler( 'changePassword',      __CLASS__, 'changePassword' );
-        self::addHandler( 'passwordReset',       __CLASS__, 'passwordReset' );
-        self::addHandler( 'emailConfirmation',   __CLASS__, 'emailConfirmation' );
-        self::addHandler( 'confirmationResend',  __CLASS__, 'confirmationResend' );
-        self::addHandler( 'replyMessage',        __CLASS__, 'replyMessage' );
-        self::addHandler( 'newMessage',          __CLASS__, 'newMessage' );
-        self::addHandler( 'userPrefs',           __CLASS__, 'userPrefs' );
-        self::addHandler( 'newGroup',            __CLASS__, 'newGroup' );
-        self::addHandler( 'editGroup',           __CLASS__, 'editGroup' );
-        self::addHandler( 'install',             __CLASS__, 'install' );
-        self::addHandler( 'installStart',        __CLASS__, 'install', [ 'start' ] );
-        self::addHandler( 'installAgreement',    __CLASS__, 'install', [ 'agreement' ] );
-        self::addHandler( 'installCheck',        __CLASS__, 'install', [ 'check' ] );
-        self::addHandler( 'installConfigure',    __CLASS__, 'install', [ 'configure' ] );
-        self::addHandler( 'installRouting',      __CLASS__, 'install', [ 'routing' ] );
-        self::addHandler( 'installModels',       __CLASS__, 'install', [ 'models' ] );
-        self::addHandler( 'installPlugins',      __CLASS__, 'install', [ 'plugins' ] );
-        self::addHandler( 'installResources',    __CLASS__, 'install', [ 'resources' ] );
-        self::addHandler( 'installAdminUser',    __CLASS__, 'install', [ 'adminUser' ] );
-    }
-
-    /**
-     * Validates the installer forms.
-     *
-     * @return {bool}
-     */
-    public static function install( $page = '' ) {
-        // if ( !self::token() ) {
-        //     return false;
-        // }
-        switch ( $page ) {
-            case 'configure':
-                if ( ! Input::exists( 'submit' ) ) {
-                    return false;
-                }
-                if ( !Database::check( Input::post( 'dbHost' ), Input::post( 'dbName' ), Input::post( 'dbUsername' ), Input::post( 'dbPassword' ) ) ) {
-                    self::addUserError( 'DB connection error.' );
-                    return false;
-                }
-                return true;
-            case 'adminUser':
-                if ( !self::checkUsername( Input::post( 'newUsername' ) ) ) {
-                    self::addUserError( 'Invalid username.' );
-                    return false;
-                }
-                if ( !self::password( Input::post( 'userPassword' ) ) ) {
-                    self::addUserError( 'Invalid password.' );
-                    return false;
-                }
-                if ( Input::post( 'userPassword' ) !== Input::post( 'userPassword2' ) ) {
-                    self::addUserError( 'Passwords do not match.' );
-                    return false;
-                }
-                if ( Input::post( 'userEmail' ) !== Input::post( 'userEmail2' ) ) {
-                    self::addUserError( 'Emails do not match.' );
-                    return false;
-                }
-                return true;
-            case 'check':
-                if ( !self::uploads() ) {
-                    self::addUserError( 'Uploads are disabled.' );
-                    return false;
-                }
-                if ( !self::php() ) {
-                    self::addUserError( 'PHP version is too old.' );
-                    return false;
-                }
-                if ( !self::phpExtensions() ) {
-                    self::addUserError( 'PHP extensions are missing.' );
-                    return false;
-                }
-                if ( !self::sessions() ) {
-                    self::addUserError( 'There is an error with Sessions.' );
-                    return false;
-                }
-                if ( !self::mail() ) {
-                    self::addUserError( 'PHP mail is not enabled.' );
-                    return false;
-                }
-                if ( !self::safe() ) {
-                    self::addUserError( 'Safe mode is enabled.' );
-                    return false;
-                }
-                if ( ! Input::exists( 'submit' ) ) {
-                    return false;
-                }
-                return true;
-            case 'start':
-            case 'agreement':
-            case 'routing':
-            case 'models':
-            case 'plugins':
-            case 'resources':
-                if ( ! Input::exists( 'submit' ) ) {
-                    return false;
-                }
-                return true;
-            default:
-                return false;
-        }
-        return false;
-    }
-
-    /**
-     * Validates the password re-send form.
-     *
-     * @return {bool}
-     */
-    public static function passwordResetCode() {
-        if ( !self::token() ) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Validates the route creation form.
-     *
-     * @return {bool}
-     */
-    public static function createRoute() {
-        if ( !Input::exists( 'redirect_type' ) ) {
-            return false;
-        }
-        if ( 'external' == Input::post( 'redirect_type' ) && !self::url( Input::post( 'forwarded_url' ) ) ) {
-            return false;
-        }
-        if ( !self::token() ) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Validates the route edit form.
-     *
-     * @return {bool}
-     */
-    public static function editRoute() {
-        if ( !Input::exists( 'redirect_type' ) ) {
-            return false;
-        }
-        if ( 'external' == Input::post( 'redirect_type' ) && !self::url( Input::post( 'forwarded_url' ) ) ) {
-            return false;
-        }
-        if ( !self::token() ) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Validates the user creation form.
-     *
-     * @return {bool}
-     */
-    public static function createUser() {
-        $user = new User;
-        if ( !$user->checkUsername( Input::post( 'username' ) ) ) {
-            self::addUserError( 'Invalid username.' );
-            return false;
-        }
-        if ( !self::password( Input::post( 'password' ) ) ) {
-            self::addUserError( 'Invalid password.' );
-            return false;
-        }
-        if ( !self::email( Input::post( 'email' ) ) ) {
-            self::addUserError( 'Invalid Email.' );
-            return false;
-        }
-        if ( !$user->noEmailExists( Input::post( 'email' ) ) ) {
-            self::addUserError( 'A user with that email is already registered.' );
-            return false;
-        }
-        if ( Input::post( 'password' ) !== Input::post( 'password2' ) ) {
-            self::addUserError( 'Passwords do not match.' );
-            return false;
-        }
-        if ( Input::post( 'email' ) !== Input::post( 'email2' ) ) {
-            self::addUserError( 'Emails do not match.' );
-            return false;
-        }
-        if ( !Input::post( 'groupSelect' ) ) {
-            self::addUserError( 'You must select a group for the new user.' );
-            return false;
-        }
-        if ( !self::token() ) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Validates the user edit form.
-     *
-     * @return {bool}
-     */
-    public static function editUser() {
-        $user = new User;
-        if ( !$user->checkUsername( Input::post( 'username' ) ) ) {
-            self::addUserError( 'Invalid username.' );
-            return false;
-        }
-        if ( Input::exists( 'password' ) ) {
-            if ( !self::password( Input::post( 'password' ) ) ) {
-                self::addUserError( 'Invalid password.' );
-                return false;
-            }
-            if ( Input::post( 'password' ) !== Input::post( 'password2' ) ) {
-                self::addUserError( 'Passwords do not match.' );
-                return false;
-            }
-        }
-        if ( !self::email( Input::post( 'email' ) ) ) {
-            self::addUserError( 'Invalid Email.' );
-            return false;
-        }
-        if ( !Input::post( 'groupSelect' ) ) {
-            self::addUserError( 'You must select a group for the new user.' );
-            return false;
-        }
-        if ( !self::token() ) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Validates the user registration form.
-     *
-     * @return {bool}
-     */
-    public static function register() {
-        $user = new User;
-        if ( !self::checkUsername( Input::post( 'username' ) ) ) {
-            self::addUserError( 'Invalid username.' );
-            return false;
-        }
-        if ( !self::password( Input::post( 'password' ) ) ) {
-            self::addUserError( 'Invalid password.' );
-            return false;
-        }
-        if ( !self::email( Input::post( 'email' ) ) ) {
-            self::addUserError( 'Invalid Email.' );
-            return false;
-        }
-        if ( !$user->noEmailExists( Input::post( 'email' ) ) ) {
-            self::addUserError( 'A user with that email is already registered.' );
-            return false;
-        }
-        if ( Input::post( 'password' ) !== Input::post( 'password2' ) ) {
-            self::addUserError( 'Passwords do not match.' );
-            return false;
-        }
-        if ( Input::post( 'email' ) !== Input::post( 'email2' ) ) {
-            self::addUserError( 'Emails do not match.' );
-            return false;
-        }
-        if ( Input::post( 'terms' ) != '1' ) {
-            self::addUserError( 'You must agree to the terms of service.' );
-            return false;
-        }
-        if ( !self::token() ) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Validates the user login form.
-     *
-     * @return {bool}
-     */
-    public static function login() {
-        if ( !self::checkUsername( Input::post( 'username' ) ) ) {
-            self::addUserError( 'Invalid username.' );
-            return false;
-        }
-        if ( !self::password( Input::post( 'password' ) ) ) {
-            self::addUserError( 'Invalid password.' );
-            return false;
-        }
-        if ( !self::token() ) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Validates the email change form.
-     *
-     * @return {bool}
-     */
-    public static function changeEmail() {
-        if ( !self::email( Input::post( 'email' ) ) ) {
-            self::addUserError( 'Invalid Email.' );
-            return false;
-        }
-        if ( Input::post( 'email' ) !== Input::post( 'email2' ) ) {
-            self::addUserError( 'Emails do not match.' );
-            return false;
-        }
-        if ( !self::token() ) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Validates the password change form.
-     *
-     * @return {bool}
-     */
-    public static function changePassword() {
-        if ( !self::password( Input::post( 'password' ) ) ) {
-            self::addUserError( 'Invalid password.' );
-            return false;
-        }
-        if ( Input::post( 'password' ) !== Input::post( 'password2' ) ) {
-            self::addUserError( 'Passwords do not match.' );
-            return false;
-        }
-        if ( !self::token() ) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Validates the password reset form.
-     *
-     * @return {bool}
-     */
-    public static function passwordReset() {
-        if ( !self::password( Input::post( 'password' ) ) ) {
-            self::addUserError( 'Invalid password.' );
-            return false;
-        }
-        if ( Input::post( 'password' ) !== Input::post( 'password2' ) ) {
-            self::addUserError( 'Passwords do not match.' );
-            return false;
-        }
-        if ( !self::token() ) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Validates the email confirmation re-send form.
-     *
-     * @return {bool}
-     */
-    public static function emailConfirmation() {
-        if ( !Input::exists( 'confirmationCode' ) ) {
-            self::addUserError( 'No confirmation code provided.' );
-            return false;
-        }
-        if ( !self::token() ) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Validates the email confirmation re-send form.
-     *
-     * @return {bool}
-     */
-    public static function confirmationResend() {
-        if ( !Input::exists( 'resendConfirmation' ) ) {
-            self::addUserError( 'Confirmation not provided.' );
-            return false;
-        }
-        if ( !self::token() ) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Validates the reply message form.
-     *
-     * @return {bool}
-     */
-    public static function replyMessage() {
-        if ( !Input::exists( 'message' ) ) {
-            self::addUserError( 'Reply cannot be empty.' );
-            return false;
-        }
-        if ( !Input::exists( 'messageID' ) ) {
-            return false;
-        }
-        if ( !self::token() ) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Validates the new message form.
-     *
-     * @return {bool}
-     */
-    public static function newMessage() {
-        if ( !Input::exists( 'toUser' ) ) {
-            self::addUserError( 'You must specify a user to send the message to.' );
-            return false;
-        }
-        if ( !Input::exists( 'subject' ) ) {
-            self::addUserError( 'You must have a subject for your message.' );
-            return false;
-        }
-        if ( !Input::exists( 'message' ) ) {
-            self::addUserError( 'No message entered.' );
-            return false;
-        }
-        if ( !self::token() ) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Validates the user preferences form.
-     *
-     * @return {bool}
-     */
-    public static function userPrefs() {
-        // @todo make this a real check
-        if ( !Input::exists( 'timeFormat' ) ) {
-            self::addUserError( 'You must specify timeFormat' );
-            return false;
-        }
-        if ( !Input::exists( 'pageLimit' ) ) {
-            self::addUserError( 'You must specify pageLimit' );
-            return false;
-        }
-        if ( !Input::exists( 'gender' ) ) {
-            self::addUserError( 'You must specify gender' );
-            return false;
-        }
-        if ( !Input::exists( 'dateFormat' ) ) {
-            self::addUserError( 'You must specify dateFormat' );
-            return false;
-        }
-        if ( !Input::exists( 'timezone' ) ) {
-            self::addUserError( 'You must specify timezone' );
-            return false;
-        }
-        if ( !Input::exists( 'updates' ) ) {
-            self::addUserError( 'You must specify updates' );
-            return false;
-        }
-        if ( !Input::exists( 'newsletter' ) ) {
-            self::addUserError( 'You must specify newsletter' );
-            return false;
-        }
-        if ( !self::token() ) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Validates the group creation form.
-     *
-     * @return {bool}
-     */
-    public static function newGroup() {
-        if ( !Input::exists( 'name' ) ) {
-            self::addUserError( 'You must specify a name' );
-            return false;
-        }
-        if ( !self::dataTitle( Input::exists( 'name' ) ) ) {
-            self::addUserError( 'invalid group name' );
-            return false;
-        }
-        if ( !self::token() ) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Validates the group edit form.
-     *
-     * @return {bool}
-     */
-    public static function editGroup() {
-        if ( !Input::exists( 'name' ) ) {
-            self::addUserError( 'You must specify a name' );
-            return false;
-        }
-        if ( !self::dataTitle( Input::exists( 'name' ) ) ) {
-            self::addUserError( 'invalid group name' );
-            return false;
-        }
-        if ( !self::token() ) {
-            return false;
-        }
-        return true;
-    }
-}
-
-new TTPForms;

app/js/main.js

@@ -27,15 +27,6 @@ function checkAll(ele) {
     }
 }
 
-function copyAll( ele ) {
-    var eleName = '#' + ele;
-    var text = $( eleName ).text();
-    text = text.replaceAll( "''", "\n" ).trim();
-    text = text.substring( 1, text.length - 1 );
-    navigator.clipboard.writeText( text );
-    console.log( '#' + ele );
-}
-
 function insertTag( box, tag ) {
     var Field = document.getElementById( box );
     var currentPos = cursorPos( Field );
@@ -69,6 +60,26 @@ function getRandomInt(min, max) {
     return Math.floor(Math.random() * (maxFloored - minCeiled) + minCeiled);
 }
 
+function copyElementText( id ) {
+    const inputElement = document.getElementById( id );
+    const textToCopy = inputElement.value;
+
+    if (navigator.clipboard && navigator.clipboard.writeText) {
+        navigator.clipboard.writeText(textToCopy)
+            .then(() => alert('Copied to clipboard!'))
+            .catch((err) => console.error('Failed to copy: ', err));
+    } else {
+        // Fallback for older browsers
+        inputElement.select();
+        try {
+            document.execCommand('copy');
+            alert('Copied to clipboard!');
+        } catch (err) {
+            console.error('Failed to copy: ', err);
+        }
+    }
+}
+
 $(document).ready(function() {
     $('select').each(function() {
         var selectedValue = $(this).attr('value');
@@ -83,29 +94,96 @@ $(document).ready(function() {
     });
 });
 
-// with the dynamic footer, you need to adjust the content padding to make sure the footer doesn't overlap the content
+document.addEventListener('DOMContentLoaded', function () {
-window.onload = function () {
+    const ttpDarkmode = document.getElementById('dark-mode-pref');
-    function updateFooterPadding() {
+    const toggleButton = document.getElementById('dark-mode-toggle');
-        var footer = document.querySelector('footer');
+    const enableButton = document.getElementById('dark-mode-toggle-button');
-        var container = document.querySelector('.container-fluid.top-pad');
+    const darkModeStylesheet = document.getElementById('dark-mode-stylesheet');
-        if ( ! container ) {
+    let currentState = '';
-            return;
+
+    // Check if dark mode is set by ttp
+    if ( ttpDarkmode ) {
+        if ( 'true' == ttpDarkmode.value ) {
+            currentState = 'enabled';
+        }
+        if ( 'false' == ttpDarkmode.value ) {
+            currentState = 'disabled';
         }
-        // footer has no height but its children do!
-        var footerHeight = Array.from(footer.children).reduce((totalHeight, child) => {
-            return totalHeight + child.offsetHeight;
-        }, 0);
-
-        footerHeight += 20; // Add 20px for padding
-
-        // console.error(footerHeight);
-
-        container.style.setProperty('--footer-height', footerHeight + 'px');
     }
 
-    // Update padding on initial load
+    // Check if dark mode is set in localStorage
-    updateFooterPadding();
+    if ( '' == currentState ) {
+        if ( localStorage.getItem('darkMode') === 'enabled' ) {
+            currentState = 'enabled';
+        }
+    }
 
-    // Update padding on window resize
+    // Update current button states
-    window.addEventListener('resize', updateFooterPadding);
+    if ( 'enabled' == currentState ) {
-};
+        darkModeStylesheet.disabled = false;
+
+        if ( toggleButton ) {
+            toggleButton.checked = true;
+        }
+      
+        if ( enableButton ) {
+            enableButton.innerText = 'Disable Now';
+        }
+    }
+
+    // Style striped table elements
+    document.querySelectorAll('.table-striped').forEach((table) => {
+        if ( 'enabled' == currentState ) {
+            table.classList.add('table-dark');
+        } else {
+            table.classList.add('table-light')
+        }
+    });
+
+    if ( enableButton ) {
+        enableButton.addEventListener('click', function () {
+            if ( darkModeStylesheet.disabled ) {
+                darkModeStylesheet.disabled = false;
+                localStorage.setItem('darkMode', 'enabled');
+                enableButton.innerText = 'Disable Now';
+            } else {
+                darkModeStylesheet.disabled = true;
+                localStorage.setItem('darkMode', 'disabled');
+                enableButton.innerText = 'Enable Now';
+            }
+        });
+    }
+
+    if ( toggleButton ) {
+        toggleButton.addEventListener('click', function () {
+            if (darkModeStylesheet.disabled) {
+                toggleDarkModePref( true );
+                darkModeStylesheet.disabled = false;
+                localStorage.setItem('darkMode', 'enabled');
+            } else {
+                toggleDarkModePref( false );
+                darkModeStylesheet.disabled = true;
+                localStorage.setItem('darkMode', 'disabled');
+            }
+        
+            document.querySelectorAll('.table-striped').forEach((table) => {
+                if (localStorage.getItem('darkMode') === 'enabled') {
+                    table.classList.add('table-dark');
+                    table.classList.remove('table-light');
+                } else {
+                    table.classList.add('table-light');
+                    table.classList.remove('table-dark');
+                }
+            });
+        });
+    }
+
+    function toggleDarkModePref( value ) {
+        var fields = {};
+        fields.prefName = 'darkMode';
+        fields.prefValue = value;
+        $.post( '/usercp/updatePref', fields ).done(function(response) {
+            // alert('Timer updated successfully!');
+        });
+    }
+});

app/js/wysiwyg.js

@@ -1,233 +0,0 @@
-/**
- * app/js/wysiwyg.js
- *
- * This is css used in the debuging console.
- *
- * @version 3.0
- * @author  Joey Kimsey <Joey@thetempusproject.com>
- * @link    https://TheTempusProject.com
- * @license https://opensource.org/licenses/MIT [MIT LICENSE]
- */
-// define vars
-const editor = document.getElementsByClassName('wp-webdeasy-comment-editor')[0];
-const toolbar = editor.getElementsByClassName('toolbar')[0];
-const buttons = toolbar.querySelectorAll('.editor-btn:not(.has-submenu)');
-const contentArea = editor.getElementsByClassName('content-area')[0];
-const visuellView = contentArea.getElementsByClassName('visuell-view')[0];
-const htmlView = contentArea.getElementsByClassName('html-view')[0];
-const modal = document.getElementsByClassName('modal')[0];
-
-// add active tag event
-document.addEventListener('selectionchange', selectionChange);
-
-// add paste event
-visuellView.addEventListener('paste', pasteEvent);
-
-// add paragraph tag on new line
-contentArea.addEventListener('keypress', addParagraphTag);
-
-// add toolbar button actions
-for(let i = 0; i < buttons.length; i++) {
-  let button = buttons[i];
-  
-  button.addEventListener('click', function(e) {
-    let action = this.dataset.action;
-    
-    switch(action) {
-      case 'toggle-view':
-        execCodeAction(this, editor);
-        break;
-      case 'createLink':
-        execLinkAction();
-        break;
-      default:
-        execDefaultAction(action);
-    }
-    
-  });
-}
-
-/** 
- * This function toggles between visual and html view
- */
-function execCodeAction(button, editor) {
-
-  if(button.classList.contains('active')) { // show visuell view
-    visuellView.innerHTML = htmlView.value;
-    htmlView.style.display = 'none';
-    visuellView.style.display = 'block';
-
-    button.classList.remove('active');     
-  } else {  // show html view
-    htmlView.innerText = visuellView.innerHTML;
-    visuellView.style.display = 'none';
-    htmlView.style.display = 'block';
-
-    button.classList.add('active'); 
-  }
-}
-
-/**
- * This function adds a link to the current selection
- */
-function execLinkAction() {  
-  modal.style.display = 'block';
-  let selection = saveSelection();
-
-  let submit = modal.querySelectorAll('button.done')[0];
-  let close = modal.querySelectorAll('.close')[0];
-  
-  // done button active => add link
-  submit.addEventListener('click', function(e) {
-    e.preventDefault();
-    let newTabCheckbox = modal.querySelectorAll('#new-tab')[0];
-    let linkInput = modal.querySelectorAll('#linkValue')[0];
-    let linkValue = linkInput.value;
-    let newTab = newTabCheckbox.checked;    
-    
-    restoreSelection(selection);
-    
-    if(window.getSelection().toString()) {
-      let a = document.createElement('a');
-      a.href = linkValue;
-      if(newTab) a.target = '_blank';
-      window.getSelection().getRangeAt(0).surroundContents(a);
-    }
-
-    modal.style.display = 'none';
-    linkInput.value = '';
-    
-    // deregister modal events
-    submit.removeEventListener('click', arguments.callee);
-    close.removeEventListener('click', arguments.callee);
-  });  
-  
-  // close modal on X click
-  close.addEventListener('click', function(e) {
-    e.preventDefault();
-    let linkInput = modal.querySelectorAll('#linkValue')[0];
-    
-    modal.style.display = 'none';
-    linkInput.value = '';
-    
-    // deregister modal events
-    submit.removeEventListener('click', arguments.callee);
-    close.removeEventListener('click', arguments.callee);
-  });
-}
-
-/**
- * This function executes all 'normal' actions
- */
-function execDefaultAction(action) {
-  document.execCommand(action, false);
-}
-
-/**
- * Saves the current selection
- */
-function saveSelection() {
-    if(window.getSelection) {
-        sel = window.getSelection();
-        if(sel.getRangeAt && sel.rangeCount) {
-            let ranges = [];
-            for(var i = 0, len = sel.rangeCount; i < len; ++i) {
-                ranges.push(sel.getRangeAt(i));
-            }
-            return ranges;
-        }
-    } else if (document.selection && document.selection.createRange) {
-        return document.selection.createRange();
-    }
-    return null;
-}
-
-/**
- *  Loads a saved selection
- */
-function restoreSelection(savedSel) {
-    if(savedSel) {
-        if(window.getSelection) {
-            sel = window.getSelection();
-            sel.removeAllRanges();
-            for(var i = 0, len = savedSel.length; i < len; ++i) {
-                sel.addRange(savedSel[i]);
-            }
-        } else if(document.selection && savedSel.select) {
-            savedSel.select();
-        }
-    }
-}
-
-/**
- * Sets the current selected format buttons active/inactive
- */ 
-function selectionChange(e) {
-  
-  for(let i = 0; i < buttons.length; i++) {
-    let button = buttons[i];
-    
-    // don't remove active class on code toggle button
-    if(button.dataset.action === 'toggle-view') continue;
-    
-    button.classList.remove('active');
-  }
-  
-  if(!childOf(window.getSelection().anchorNode.parentNode, editor)) return false;
-  
-  parentTagActive(window.getSelection().anchorNode.parentNode);
-}
-
-/**
- * Checks if the passed child has the passed parent
- */
-function childOf(child, parent) {
-  return parent.contains(child);
-}
-
-/**
- * Sets the tag active that is responsible for the current element
- */
-function parentTagActive(elem) {
-  if(!elem ||!elem.classList || elem.classList.contains('visuell-view')) return false;
-  
-  let toolbarButton;
-  
-  // active by tag names
-  let tagName = elem.tagName.toLowerCase();
-  toolbarButton = document.querySelectorAll(`.toolbar .editor-btn[data-tag-name="${tagName}"]`)[0];
-  if(toolbarButton) {
-    toolbarButton.classList.add('active');
-  }
-  
-  // active by text-align
-  let textAlign = elem.style.textAlign;
-  toolbarButton = document.querySelectorAll(`.toolbar .editor-btn[data-style="textAlign:${textAlign}"]`)[0];
-  if(toolbarButton) {
-    toolbarButton.classList.add('active');
-  }
-  
-  return parentTagActive(elem.parentNode);
-}
-
-/**
- * Handles the paste event and removes all HTML tags
- */
-function pasteEvent(e) {
-  e.preventDefault();
-  
-  let text = (e.originalEvent || e).clipboardData.getData('text/plain');
-  document.execCommand('insertHTML', false, text);
-}
-
-/**
- * This functions adds a paragraph tag when the enter key is pressed
- */
-function addParagraphTag(evt) {
-  if (evt.keyCode == '13') {
-    
-    // don't add a p tag on list item
-    if(window.getSelection().anchorNode.parentNode.tagName === 'LI') return;
-    document.execCommand('formatBlock', false, 'p');
-  }
-}

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;
@@ -31,13 +31,16 @@ class Group extends DatabaseModel {
         'defaultGroup' => [
             'type' => 'customSelect',
             'pretty' => 'The Default Group for new registrations.',
-            'default' => 5,
+            'default' => 4,
         ],
     ];
     public $databaseMatrix = [
         [ 'name', 'varchar', '32' ],
         [ 'permissions', 'text', '' ],
     ];
+    public $searchFields = [
+        'name',
+    ];
     public $permissionMatrix = [
         'adminAccess' => [
             'pretty' => 'Access Administrator Areas',

app/models/log.php

@@ -13,10 +13,10 @@ namespace TheTempusProject\Models;
 
 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Classes\Config;
-use TheTempusProject\Bedrock\Classes\CustomException;
+use TheTempusProject\Canary\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';
@@ -46,6 +46,9 @@ class Log extends DatabaseModel {
         [ 'source', 'varchar', '64' ],
         [ 'action', 'text', '' ],
     ];
+    public $searchFields = [
+        'source',
+    ];
 
     /**
      * The model constructor.
@@ -87,7 +90,7 @@ class Log extends DatabaseModel {
     }
 
     public function list( $filter = null ) {
-        $logData = self::$db->getPaginated( $this->tableName, [ 'source', '=', $filter ] );
+        $logData = self::$db->get( $this->tableName, [ 'source', '=', $filter ] );
         if ( !$logData->count() ) {
             return false;
         }

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 {
@@ -24,6 +24,9 @@ class Routes extends DatabaseModel {
         [ 'original_url', 'varchar', '32' ],
         [ 'forwarded_url', 'text', '' ],
     ];
+    public $searchFields = [
+        'nickname',
+    ];
     public $resourceMatrix = [
         [
             'original_url' => 'fb',
@@ -72,7 +75,7 @@ class Routes extends DatabaseModel {
             return false;
         }
         if ( !Check::simpleName( $nickname ) ) {
-            Debug::warn( 'Invalid route nickname: ' . $name );
+            Debug::warn( 'Invalid route nickname: ' . $nickname );
             return false;
         }
         if ( 'external' == $type && !Check::url( $forwarded_url ) ) {
@@ -128,7 +131,7 @@ class Routes extends DatabaseModel {
         }
         $routeData = self::$db->get( $this->tableName, [ 'nickname', '=', $name ] );
         if ( !$routeData->count() ) {
-            Debug::warn( "Could not find a group named: $name" );
+            Debug::info( "Routes:findByName: Could not find a route named: $name" );
             return false;
         }
         return $this->filter( $routeData->first() );
@@ -137,7 +140,7 @@ class Routes extends DatabaseModel {
     public function findByOriginalUrl( $url ) {
         $routeData = self::$db->get( $this->tableName, [ 'original_url', '=', $url ] );
         if ( !$routeData->count() ) {
-            Debug::warn( "Could not find route by original url: $url" );
+            Debug::info( "Routes:findByOriginalUrl: Could not find route by original url: $url" );
             return false;
         }
         return $this->filter( $routeData->first() );
@@ -145,12 +148,12 @@ class Routes extends DatabaseModel {
 
     public function findByforwardedUrl( $url ) {
         if ( !Check::url( $url ) ) {
-            Debug::warn( "Invalid forwarded_url: $url" );
+            Debug::warn( "Routes:findByforwardedUrl: Invalid forwarded_url: $url" );
             return false;
         }
         $routeData = self::$db->get( $this->tableName, [ 'forwarded_url', '=', $url ] );
         if ( !$routeData->count() ) {
-            Debug::warn( "Could not find route by forwarded url: $url" );
+            Debug::info( "Routes:findByforwardedUrl: Could not find route by forwarded url: $url" );
             return false;
         }
         return $this->filter( $routeData->first() );

app/models/sessions.php

@@ -16,10 +16,11 @@ 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;
+use TheTempusProject\Classes\Config;
 use TheTempusProject\TheTempusProject as App;
 
 class Sessions extends DatabaseModel {
@@ -35,6 +36,9 @@ class Sessions extends DatabaseModel {
         [ 'username', 'varchar', '20' ],
         [ 'token', 'varchar', '120' ],
     ];
+    public $searchFields = [
+        'username',
+    ];
     public static $activeSession = false;
 
     /**
@@ -56,9 +60,11 @@ class Sessions extends DatabaseModel {
         $user = new User;
         // @todo lets put this on some sort of realistic checking regime other than check everything every time
         if ( $sessionID == false ) {
+            Debug::log( 'sessionID false' );
             return false;
         }
         if ( !Check::id( $sessionID ) ) {
+            Debug::log( 'sessionID not id' );
             return false;
         }
         $data = self::$db->get( $this->tableName, [ 'ID', '=', $sessionID ] );
@@ -115,12 +121,12 @@ class Sessions extends DatabaseModel {
     public function checkCookie( $cookieToken, $create = false ) {
         $user = new User;
         if ( $cookieToken === false ) {
+            Debug::info( 'cookieToken false' );
             return false;
         }
         $data = self::$db->get( $this->tableName, [ 'token', '=', $cookieToken ] );
         if ( !$data->count() ) {
             Debug::info( 'sessions->checkCookie - Session token not found.' );
-
             return false;
         }
         $session = $data->first();
@@ -145,22 +151,6 @@ class Sessions extends DatabaseModel {
         return true;
     }
 
-    public function checkToken( $apiToken, $create = false ) {
-        $user = new User;
-        if ( $apiToken === false ) {
-            return false;
-        }
-        $result = $user->findByToken( $apiToken );
-        if ( $result === false ) {
-            Debug::info( 'sessions->checkToken - could not find user by token.' );
-            return false;
-        }
-        if ( $create ) {
-            return $this->newSession( null, false, false, $result->ID );
-        }
-        return true;
-    }
-
     /**
      * Creates a new session from the data provided. The
      * expiration time is optional and will be set to the
@@ -171,9 +161,10 @@ class Sessions extends DatabaseModel {
      * @return {bool}
      */
     public function newSession( $expire = null, $override = false, $remember = false, $userID = null ) {
-        if ( ! isset( $expire ) ) {
+        if ( empty( $expire ) ) {
             // default Session Expiration is 24 hours
-            $expire = ( time() + ( 3600 * 24 ) );
+            $expireLimit = Config::getValue( 'main/loginTimer' );
+            $expire = ( time() + $expireLimit );
             Debug::log( 'Using default expiration time' );
         }
         $lastPage = App::getUrl();

app/models/token.php

@@ -0,0 +1,207 @@
+<?php
+/**
+ * app/models/token.php
+ *
+ * This class is used for the manipulation of the tokens database table.
+ *
+ * @version 3.0
+ * @author  Joey Kimsey <Joey@thetempusproject.com>
+ * @link    https://TheTempusProject.com
+ * @license https://opensource.org/licenses/MIT [MIT LICENSE]
+ */
+namespace TheTempusProject\Models;
+
+use TheTempusProject\Bedrock\Functions\Check;
+use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Classes\DatabaseModel;
+use TheTempusProject\Bedrock\Classes\Config;
+use TheTempusProject\TheTempusProject as App;
+
+class Token extends DatabaseModel {
+    public $tableName = 'tokens';
+    public $modelVersion = '1.0';
+    public $configName = 'api';
+    public $databaseMatrix = [
+        [ 'name', 'varchar', '128' ],
+        [ 'token_type', 'varchar', '8' ],
+        [ 'notes', 'text', '' ],
+        [ 'token', 'varchar', '64' ],
+        [ 'secret', 'varchar', '256' ],
+        [ 'createdAt', 'int', '10' ],
+        [ 'createdBy', 'int', '10' ],
+        [ 'expiresAt', 'int', '10' ],
+    ];
+    public $searchFields = [
+        'name',
+        'token',
+    ];
+    public $permissionMatrix = [
+        'addAppToken' => [
+            'pretty' => 'Add Application Tokens',
+            'default' => false,
+        ],
+        'addAppToken' => [
+            'pretty' => 'Add Personal Tokens',
+            'default' => false,
+        ],
+    ];
+    public $configMatrix = [
+        'apiAccessApp' => [
+            'type' => 'radio',
+            'pretty' => 'Enable Api Access for Personal Tokens.',
+            'default' => true,
+        ],
+        'apiAccessPersonal' => [
+            'type' => 'radio',
+            'pretty' => 'Enable Api Access for Personal Tokens.',
+            'default' => true,
+        ],
+        'AppAccessTokenExpiration' => [
+            'type' => 'text',
+            'pretty' => 'How long before app tokens expire (in seconds)',
+            'default' => 2592000,
+        ],
+        'UserAccessTokenExpiration' => [
+            'type' => 'text',
+            'pretty' => 'How long before user tokens expire (in seconds)',
+            'default' => 604800,
+        ],
+    ];
+
+    public function create( $name, $note, $token_type = 'app' ) {
+        if ( 'app' == $token_type ) {
+            $expiration = Config::getValue( 'api/AppAccessTokenExpiration' );
+            if ( empty( $expiration ) ) {
+                $expiration = $this->configMatrix['AppAccessTokenExpiration']['default'];
+            }
+        } else {
+            $expiration = Config::getValue( 'api/UserAccessTokenExpiration' );
+            if ( empty( $expiration ) ) {
+                $expiration = $this->configMatrix['UserAccessTokenExpiration']['default'];
+            }
+        }
+        $expireTime = time() + $expiration;
+        
+        $fields = [
+            'name' => $name,
+            'notes' => $note,
+            'token_type' => $token_type,
+            'createdBy' => App::$activeUser->ID,
+            'createdAt' => time(),
+            'expiresAt' => $expireTime,
+            'token' => generateToken(),
+            'secret' => generateRandomString(256),
+        ];
+        if ( self::$db->insert( $this->tableName, $fields ) ) {
+            return true;
+        }
+        return false;
+    }
+
+    public function findOrCreateUserToken( $user_id, $refresh = false ) {
+        $test = $this->findUserToken( $user_id );
+        if ( ! empty( $test ) ) {
+            if ( ! empty( $refresh ) ) {
+                $token = $this->refresh( $test->ID, 'user' );
+            } else {
+                $token = $test->token;
+            }
+            return $token;
+        }
+
+        $expiration = Config::getValue( 'api/UserAccessTokenExpiration' );
+        if ( empty( $expiration ) ) {
+            $expiration = $this->configMatrix['UserAccessTokenExpiration']['default'];
+        }
+        $expireTime = time() + $expiration;
+        $token = generateToken();
+        $fields = [
+            'name' => 'Browser Token',
+            'notes' => 'findOrCreateUserToken',
+            'token_type' => 'user',
+            'createdBy' => $user_id,
+            'createdAt' => time(),
+            'expiresAt' => $expireTime,
+            'token' => $token,
+            'secret' => generateRandomString(256),
+        ];
+        if ( self::$db->insert( $this->tableName, $fields ) ) {
+            return $token;
+        }
+        return false;
+    }
+
+    public function update( $id, $name, $note, $token_type = 'app' ) {
+        $fields = [
+            'name' => $name,
+            'notes' => $note,
+            'token_type' => $token_type,
+        ];
+        if ( self::$db->update( $this->tableName, $id, $fields ) ) {
+            return true;
+        }
+        return false;
+    }
+    
+    public function refresh( $id, $token_type = 'app' ) {
+        if ( 'app' == $token_type ) {
+            $expiration = Config::getValue( 'api/AppAccessTokenExpiration' );
+            if ( empty( $expiration ) ) {
+                $expiration = $this->configMatrix['AppAccessTokenExpiration']['default'];
+            }
+        } else {
+            $expiration = Config::getValue( 'api/UserAccessTokenExpiration' );
+            if ( empty( $expiration ) ) {
+                $expiration = $this->configMatrix['UserAccessTokenExpiration']['default'];
+            }
+        }
+        $expireTime = time() + $expiration;
+        $token = generateToken();
+        
+        $fields = [
+            'expiresAt' => $expireTime,
+            'token' => $token,
+        ];
+        if ( self::$db->update( $this->tableName, $id, $fields ) ) {
+            return $token;
+        }
+        return false;
+    }
+
+    public function findByforwardedUrl( $url ) {
+        if ( !Check::url( $url ) ) {
+            Debug::warn( "Invalid forwarded_url: $url" );
+            return false;
+        }
+        $routeData = self::$db->get( $this->tableName, [ 'forwarded_url', '=', $url ] );
+        if ( !$routeData->count() ) {
+            Debug::warn( "Could not find route by forwarded url: $url" );
+            return false;
+        }
+        return $this->filter( $routeData->first() );
+    }
+
+    public function findByToken( $token ) {
+        $data = self::$db->get( $this->tableName, [ 'token', '=', $token ] );
+        if ( ! $data->count() ) {
+            return false;
+        }
+        return $data->first();
+    }
+
+    public function findBySecret( $secret ) {
+        $data = self::$db->get( $this->tableName, [ 'secret', '=', $secret ] );
+        if ( ! $data->count() ) {
+            return false;
+        }
+        return $data->first();
+    }
+    
+    public function findUserToken( $user_id ) {
+        $data = self::$db->get( $this->tableName, [ 'createdBy', '=', $user_id, 'AND', 'token_type', '=', 'user' ] );
+        if ( ! $data->count() ) {
+            return false;
+        }
+        return $data->first();
+    }
+}

app/models/user.php

@@ -16,12 +16,12 @@
 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;
 use TheTempusProject\Bedrock\Classes\Config;
-use TheTempusProject\Bedrock\Classes\CustomException;
+use TheTempusProject\Canary\Classes\CustomException;
 use TheTempusProject\Classes\Email;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\Classes\Preferences;
@@ -43,7 +43,9 @@ class User extends DatabaseModel {
         [ 'name', 'varchar', '20' ],
         [ 'confirmationCode', 'varchar', '80' ],
         [ 'prefs', 'text', '' ],
-        [ 'auth_token', 'text', '' ],
+    ];
+    public $searchFields = [
+        'username',
     ];
     public $permissionMatrix = [
         'uploadImages' => [
@@ -122,6 +124,11 @@ class User extends DatabaseModel {
                 '50',
             ],
         ],
+        'darkMode' => [
+            'pretty' => 'Enable Dark-Mode viewing',
+            'type' => 'checkbox',
+            'default' => 'false',
+        ],
     ];
     protected static $avatars;
     protected static $preferences;
@@ -424,7 +431,7 @@ class User extends DatabaseModel {
         if ( ! empty( $filter ) ) {
             switch ( $filter ) {
                 case 'newsletter':
-                    $data = self::$db->search( $this->tableName, 'prefs', 'newsletter":"true' );
+                    $data = self::$db->searchColumn( $this->tableName, 'prefs', 'newsletter":"true' );
                     break;
                 default:
                     $data = self::$db->get( $this->tableName, '*' );
@@ -447,7 +454,7 @@ class User extends DatabaseModel {
      */
     public function recent( $limit = null ) {
         if ( empty( $limit ) ) {
-            $data = self::$db->getpaginated( $this->tableName, '*' );
+            $data = self::$db->get( $this->tableName, '*' );
         } else {
             $data = self::$db->get( $this->tableName, [ 'ID', '>', '0' ], 'ID', 'DESC', [ 0, $limit ] );
         }
@@ -542,6 +549,7 @@ class User extends DatabaseModel {
             $instance->prefs = json_decode( $instance->prefs, true );
             $instance->gender = $instance->prefs['gender'];
             $instance->avatar = $instance->prefs['avatar'];
+            $instance->usernamePretty = \ucfirst( $instance->username );
             $out[] = $instance;
             if ( !empty( $end ) ) {
                 $out = $out[0];
@@ -655,7 +663,7 @@ class User extends DatabaseModel {
         }
         if ( !self::$db->update( $this->tableName, $id, $fields ) ) {
             new CustomException( 'userUpdate' );
-            Debug::error( "User: $id not updated: $fields" );
+            Debug::error( "User: $id not updated: " . var_export( $fields, true ) );
             return false;
         }
         return true;
@@ -682,6 +690,10 @@ class User extends DatabaseModel {
             Debug::error( "User: $id not updated." );
             return false;
         }
+        if ( $id === App::$activeUser->ID ) {
+            $userData = $this->get( $id );
+            App::$activeUser = $userData;
+        }
         return true;
     }
 
@@ -694,33 +706,45 @@ class User extends DatabaseModel {
         return $this->data;
     }
 
-    public function findByToken( $token ) {
+    public function authorize( $username, $password ) {
-        $data = self::$db->get( $this->tableName, [ 'auth_token', '=', $token ] );
+        if ( !isset( self::$log ) ) {
-        if ( ! $data->count() ) {
+            self::$log = new Log;
+        }
+        if ( !$this->get( $username ) ) {
+            self::$log->login( 0, "API: User not found: $username" );
             return false;
         }
-        return $data->first();
+        // login attempts protection.
-    }
+        $timeLimit = ( time() - 3600 );
-
+        $limit = Config::getValue( 'main/loginLimit' );
-    public function addAccessToken( $id, $length = 64 ) {
+        $user = $this->data();
-        if ( ! Check::id( $id ) ) {
+        if ( $limit > 0 ) {
+            $limitCheck = self::$db->get(
+                'logs',
+                [
+                    'source', '=', 'login',
+                    'AND',
+                    'userID', '=', $user->ID,
+                    'AND',
+                    'time', '>=', $timeLimit,
+                    'AND',
+                    'action', '!=', 'pass',
+                ]
+            );
+            if ( $limitCheck->count() >= $limit ) {
+                self::$log->login( $user->ID, 'API: Too many failed attempts.' );
                 return false;
             }
-        $fields = [ 'auth_token' => $this->generateRandomString( $length ) ];
+        }
-        if ( !self::$db->update( $this->tableName, $id, $fields ) ) {
+        if ( !Check::password( $password ) ) {
-            Debug::error( "User: $id not updated." );
+            self::$log->login( $user->ID, 'API: Invalid Password.' );
             return false;
         }
-        return true;
+        if ( !Hash::check( $password, $user->password ) ) {
+            self::$log->login( $user->ID, 'API: Wrong Password.' );
+            return false;
         }
-
+        self::$log->login( $this->data()->ID, 'API: pass' );
-    private function generateRandomString( $length = 10 ) {
+        return $user;
-        $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
-        $charactersLength = strlen( $characters );
-        $randomString = '';
-        for ($i = 0; $i < $length; $i++) {
-            $randomString .= $characters[random_int(0, $charactersLength - 1)];
-        }
-        return $randomString;
     }
 }

app/plugins/blog/controllers/admin/blog.php

@@ -20,18 +20,15 @@ use TheTempusProject\Houdini\Classes\Navigation;
 use TheTempusProject\Houdini\Classes\Components;
 use TheTempusProject\Classes\AdminController;
 use TheTempusProject\Classes\Forms;
-use TheTempusProject\Plugins\Blog as BlogPlugin;
+use TheTempusProject\Models\Posts;
 
 class Blog extends AdminController {
     public static $posts;
 
     public function __construct() {
         parent::__construct();
-        $blog = new BlogPlugin;
+        self::$posts = new Posts;
-        self::$posts = $blog->posts;
         self::$title = 'Admin - Blog';
-        $view = Navigation::activePageSelect( 'nav.admin', '/admin/blog' );
-        Components::set( 'ADMINNAV', $view );
     }
 
     public function index( $data = null ) {
@@ -47,7 +44,7 @@ class Blog extends AdminController {
             return $this->index();
         }
         
-        $result = self::$posts->newPost( Input::post( 'title' ), Input::post( 'blogPost' ), Input::post( 'submit' ) );
+        $result = self::$posts->newPost( Input::post( 'title' ), Input::post( 'blogPost' ), Input::post( 'slug' ), Input::post( 'submit' ) );
         if ( $result ) {
             Issues::add( 'success', 'Your post has been created.' );
             return $this->index();
@@ -68,7 +65,7 @@ class Blog extends AdminController {
             Issues::add( 'error', [ 'There was an error with your form.' => Check::userErrors() ] );
             return $this->index();
         }
-        if ( self::$posts->updatePost( $data, Input::post( 'title' ), Input::post( 'blogPost' ), Input::post( 'submit' ) ) === true ) {
+        if ( self::$posts->updatePost( $data, Input::post( 'title' ), Input::post( 'blogPost' ), Input::post( 'slug' ), Input::post( 'submit' ) ) === true ) {
             Issues::add( 'success', 'Post Updated.' );
             return $this->index();
         }

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;
@@ -27,17 +27,16 @@ use TheTempusProject\Plugins\Blog as BlogPlugin;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Plugins\Comments;
 use TheTempusProject\Models\Comments as CommentsModel;
+use TheTempusProject\Models\Posts as PostsModel;
 
 class Blog extends Controller {
     protected static $blog;
-    protected static $comments;
     protected static $posts;
 
     public function __construct() {
         parent::__construct();
         Template::setTemplate( 'blog' );
-        $blog = new BlogPlugin;
+        self::$posts =  new PostsModel;
-        self::$posts = $blog->posts;
     }
 
     public function index() {
@@ -57,39 +56,46 @@ class Blog extends Controller {
 
     public function comments( $sub = null, $data = null ) {
         Debug::log( 'Controller initiated: ' . __METHOD__ . '.' );
-        if ( empty( self::$comments ) ) {
+
-            self::$comments = new CommentsModel;
-        }
-        $plugin = new Comments;
         if ( empty( $sub ) || empty( $data ) ) {
-            Session::flash( 'error', 'Whoops, try again.' );
+            Issues::add( 'error', 'There was an issue with your request. Please check the url and try again.' );
-            Redirect::to( 'blog' );
+            return $this->index();
         }
+
+        if ( class_exists( 'TheTempusProject\Plugins\Comments' ) ) {
+            $plugin = new Comments;
+            if ( ! $plugin->checkEnabled() ) {
+                Issues::add( 'error', 'Comments are disabled.' );
+                return $this->index();
+            }
+            $comments = new CommentsModel;
+        } else {
+            Debug::info( 'error', 'Comments plugin missing.' );
+            return $this->index();
+        }
+
         switch ( $sub ) {
             case 'post':
                 $content = self::$posts->findById( (int) $data );
                 if ( empty( $content ) ) {
-                    Session::flash( 'error', 'Unknown Post.' );
+                    Issues::add( 'error', 'Unknown Content.' );
-                    Redirect::to( 'blog' );
+                    return $this->index();
                 }
                 return $plugin->formPost( self::$posts->tableName, $content, 'blog/post/' );
-                return self::$comments->formPost( 'blog', $content, 'blog/post/' );
             case 'edit':
-                $content = self::$comments->findById( $data );
+                $content = $comments->findById( $data );
                 if ( empty( $content ) ) {
-                    Session::flash( 'error', 'Unknown Comment.' );
+                    Issues::add( 'error', 'Unknown Comment.' );
-                    Redirect::to( 'blog' );
+                    return $this->index();
                 }
                 return $plugin->formEdit( self::$posts->tableName, $content, 'blog/post/' );
-                return self::$comments->formEdit( 'blog', $content, 'blog/post/' );
             case 'delete':
-                $content = self::$comments->findById( $data );
+                $content = $comments->findById( $data );
                 if ( empty( $content ) ) {
-                    Session::flash( 'error', 'Unknown Comment.' );
+                    Issues::add( 'error', 'Unknown Comment.' );
-                    Redirect::to( 'blog' );
+                    return $this->index();
                 }
                 return $plugin->formDelete( self::$posts->tableName, $content, 'blog/post/' );
-                return self::$comments->formDelete( 'blog', $content, 'blog/post/' );
         }
     }
 
@@ -98,29 +104,39 @@ class Blog extends Controller {
             return $this->index();
         }
         $post = self::$posts->findById( $id );
+        if ( empty( $post ) ) {
+            $post = self::$posts->findBySlug( $id );
             if ( empty( $post ) ) {
                 return $this->index();
             }
-        if ( empty( self::$comments ) ) {
-            self::$comments = new CommentsModel;
         }
         Debug::log( 'Controller initiated: ' . __METHOD__ . '.' );
         self::$title = 'Blog Post';
-        // I removed this once because i didn't realize.
+
-        // this triggers the comment post controller method when the comment form is submitted on the post viewing page
         if ( Input::exists( 'contentId' ) ) {
             $this->comments( 'post', Input::post( 'contentId' ) );
         }
+
         Components::set( 'CONTENT_ID', $id );
-        Components::set( 'COMMENT_TYPE', 'blog' );
+        Components::set( 'COMMENT_TYPE', self::$posts->tableName );
+        Components::set( 'NEWCOMMENT', '' );
+        Components::set( 'count', '0' );
+        Components::set( 'COMMENTS', '' );
+
+        if ( class_exists( 'TheTempusProject\Plugins\Comments' ) ) {
+            $plugin = new Comments;
+            if ( $plugin->checkEnabled() ) {
+                $comments = new CommentsModel;
                 if ( App::$isLoggedIn ) {
                     Components::set( 'NEWCOMMENT', Views::simpleView( 'comments.create' ) );
                 } else {
                     Components::set( 'NEWCOMMENT', '' );
                 }
-        $post = self::$posts->findById( $id );
+                Components::set( 'count', $comments->count( self::$posts->tableName, $post->ID ) );
-        Components::set( 'count', self::$comments->count( self::$posts->tableName, $post->ID ) );
+                Components::set( 'COMMENTS', Views::simpleView( 'comments.list', $comments->display( 10, self::$posts->tableName, $post->ID ) ) );
-        Components::set( 'COMMENTS', Views::simpleView( 'comments.list', self::$comments->display( 10, self::$posts->tableName, $post->ID ) ) );
+            }
+        }
+
         self::$title .= ' - ' . $post->title;
         self::$pageDescription = strip_tags( $post->contentSummaryNoLink );
         Views::view( 'blog.post', $post );
@@ -155,4 +171,16 @@ class Blog extends Controller {
         self::$pageDescription = '{SITENAME} blog posts easily and conveniently sorted by years.';
         Views::view( 'blog.list', self::$posts->byYear( $year ) );
     }
+
+    public function search() {
+        $results = [];
+        if ( Input::exists( 'submit' ) ) {
+            $dbResults = self::$posts->search( Input::post('searchTerm') );
+            if ( ! empty( $dbResults ) ) {
+                $results = $dbResults;
+            }
+        }
+        Components::set( 'searchResults', Views::simpleView( 'blog.list', $results ) );
+        Views::view( 'blog.searchResults' );
+    }
 }

app/plugins/blog/models/posts.php

@@ -12,16 +12,24 @@
  */
 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;
 use TheTempusProject\TheTempusProject as App;
-use TheTempusProject\Bedrock\Classes\CustomException;
+use TheTempusProject\Canary\Classes\CustomException;
 use TheTempusProject\Houdini\Classes\Filters;
+use TheTempusProject\Plugins\Comments as CommentPlugin;
+use TheTempusProject\Models\Comments;
 
 class Posts extends DatabaseModel {
     public $tableName = 'posts';
+    public $searchFields = [
+        'title',
+        'slug',
+        'content',
+    ];
+    public static $comments = false;
 
     public $databaseMatrix = [
         [ 'author', 'int', '11' ],
@@ -29,25 +37,21 @@ class Posts extends DatabaseModel {
         [ 'edited', 'int', '10' ],
         [ 'draft', 'int', '1' ],
         [ 'title', 'varchar', '86' ],
+        [ 'slug', 'varchar', '64' ],
         [ 'content', 'text', '' ],
     ];
 
-    public $resourceMatrix = [
-        [
-            'title' => 'Welcome',
-            'content' => '<p>This is just a simple message to say thank you for installing The Tempus Project. If you have any questions you can find everything through our website <a href="https://TheTempusProject.com">here</a>.</p>',
-            'author' => 1,
-            'created' => '{time}',
-            'edited' => '{time}',
-            'draft' => 0,
-        ],
-    ];
-
     public function __construct() {
         parent::__construct();
+        if ( class_exists( 'TheTempusProject\Plugins\Comments' ) ) {
+            $comments = new CommentPlugin;
+            if ( $comments->checkEnabled() ) {
+                self::$comments = new Comments;
+            }
+        }
     }
 
-    public function newPost( $title, $post, $draft ) {
+    public function newPost( $title, $post, $slug, $draft ) {
         if ( !Check::dataTitle( $title ) ) {
             Debug::info( 'modelBlog: illegal title.' );
 
@@ -61,6 +65,7 @@ class Posts extends DatabaseModel {
         $fields = [
             'author' => App::$activeUser->ID,
             'draft' => $draft,
+            'slug' => $slug,
             'created' => time(),
             'edited' => time(),
             'content' => Sanitize::rich( $post ),
@@ -75,7 +80,7 @@ class Posts extends DatabaseModel {
         return true;
     }
 
-    public function updatePost( $id, $title, $content, $draft ) {
+    public function updatePost( $id, $title, $content, $slug, $draft ) {
         if ( empty( self::$log ) ) {
             self::$log = new Log;
         }
@@ -96,6 +101,7 @@ class Posts extends DatabaseModel {
         }
         $fields = [
             'draft' => $draft,
+            'slug' => $slug,
             'edited' => time(),
             'content' => Sanitize::rich( $content ),
             'title' => $title,
@@ -133,36 +139,49 @@ class Posts extends DatabaseModel {
             }
             $draft = '';
             $authorName = self::$user->getUsername( $instance->author );
-            $cleanPost = Sanitize::contentShort( $instance->content );
+
-            $postSpace = explode( ' ', $cleanPost );
+            // Summarize
-            $postLine = explode( "\n", $cleanPost );
+            if ( ! empty( $instance->slug ) ) {
-            // summary by words: 100
+                $identifier = $instance->slug;
-            $spaceSummary = implode( ' ', array_splice( $postSpace, 0, 100 ) );
+            } else {
-            // summary by lines: 5
+                $identifier = $instance->ID;
-            $lineSummary = implode( "\n", array_splice( $postLine, 0, 5 ) );
+            }
-            if ( strlen( $spaceSummary ) < strlen( $lineSummary ) ) {
+
-                $contentSummary = $spaceSummary;
+            $cleanPost = Sanitize::contentShort( $instance->content );
-                if ( count( $postSpace, 1 ) <= 100 ) {
+            // By Word
-                    $contentSummaryNoLink = $contentSummary;
+            $wordsArray = explode( ' ', $cleanPost );
-                    $contentSummary .= '... <a href="{ROOT_URL}blog/post/' . $instance->ID . '">Read More</a>';
+            $wordSummary = implode( ' ', array_splice( $wordsArray, 0, 100 ) );
-                }
+            // By Line
+            $linesArray = explode( "\n", $cleanPost );
+            $lineSummary = implode( "\n", array_splice( $linesArray, 0, 5 ) );
+
+            if ( strlen( $wordSummary ) < strlen( $lineSummary ) ) {
+                $contentSummaryNoLink = $wordSummary;
+                $contentSummary = $wordSummary . '... <a href="{ROOT_URL}blog/post/' . $identifier . '" class="text-decoration-none">Read More</a>';
             } else {
-                // @todo: need to refine this after testing
                 $contentSummaryNoLink = $lineSummary;
-                $contentSummary = $lineSummary . '... <a href="{ROOT_URL}blog/post/' . $instance->ID . '">Read More</a>';
+                $contentSummary = $lineSummary . '... <a href="{ROOT_URL}blog/post/' . $identifier . '" class="text-decoration-none">Read More</a>';
+            }
+
+            $instance->contentSummaryNoLink = $contentSummaryNoLink;
+            $instance->contentSummary = $contentSummary;
+
+            if ( isset( $params['stripHtml'] ) && $params['stripHtml'] === true ) {
+                $instance->contentSummary = strip_tags( $instance->content );
             }
             if ( $instance->draft != '0' ) {
                 $draft = ' <b>Draft</b>';
             }
             $instance->isDraft = $draft;
-            $instance->authorName = $authorName;
+            $instance->authorName = \ucfirst( $authorName );
-            $instance->contentSummaryNoLink = $contentSummaryNoLink;
+            if ( self::$comments !== false ) {
-            $instance->contentSummary = $contentSummary;
+                $instance->commentCount = self::$comments->count( 'blog', $instance->ID );
-            if ( isset( $params['stripHtml'] ) && $params['stripHtml'] === true ) {
+            } else {
-                $instance->contentSummary = strip_tags( $instance->content );
+                $instance->commentCount = 0;
             }
             $instance->content = Filters::applyOne( 'mentions.0', $instance->content, true );
             $instance->content = Filters::applyOne( 'hashtags.0', $instance->content, true );
+
             $out[] = $instance;
             if ( !empty( $end ) ) {
                 $out = $out[0];
@@ -220,9 +239,9 @@ class Posts extends DatabaseModel {
             $whereClause = '*';
         }
         if ( empty( $limit ) ) {
-            $postData = self::$db->getPaginated( $this->tableName, $whereClause );
+            $postData = self::$db->get( $this->tableName, $whereClause );
         } else {
-            $postData = self::$db->getPaginated( $this->tableName, $whereClause, 'ID', 'DESC', [0, $limit] );
+            $postData = self::$db->get( $this->tableName, $whereClause, 'ID', 'DESC', [0, $limit] );
         }
         if ( !$postData->count() ) {
             Debug::info( 'No Blog posts found.' );
@@ -238,7 +257,7 @@ class Posts extends DatabaseModel {
         } else {
             $whereClause = ['draft', '=', '0'];
         }
-        $postData = self::$db->getPaginated( $this->tableName, $whereClause );
+        $postData = self::$db->get( $this->tableName, $whereClause );
         if ( !$postData->count() ) {
             Debug::info( 'No Blog posts found.' );
 
@@ -262,7 +281,7 @@ class Posts extends DatabaseModel {
         $firstDayUnix = date( 'U', strtotime( "first day of $year" ) );
         $lastDayUnix = date( 'U', strtotime( "last day of $year" ) );
         $whereClause = array_merge( $whereClause, ['created', '<=', $lastDayUnix, 'AND', 'created', '>=', $firstDayUnix] );
-        $postData = self::$db->getPaginated( $this->tableName, $whereClause );
+        $postData = self::$db->get( $this->tableName, $whereClause );
         if ( !$postData->count() ) {
             Debug::info( 'No Blog posts found.' );
 
@@ -281,7 +300,7 @@ class Posts extends DatabaseModel {
             $whereClause = ['draft', '=', '0', 'AND'];
         }
         $whereClause = array_merge( $whereClause, ['author' => $ID] );
-        $postData = self::$db->getPaginated( $this->tableName, $whereClause );
+        $postData = self::$db->get( $this->tableName, $whereClause );
         if ( !$postData->count() ) {
             Debug::info( 'No Blog posts found.' );
 
@@ -290,6 +309,22 @@ class Posts extends DatabaseModel {
         return $this->filter( $postData->results() );
     }
 
+    public function findBySlug( $slug, $includeDraft = false ) {
+        $whereClause = [];
+        if ( $includeDraft !== true ) {
+            $whereClause = ['draft', '=', '0', 'AND'];
+        }
+
+        $whereClause = array_merge( $whereClause, ['slug', '=', $slug] );
+
+        $postData = self::$db->get( $this->tableName, $whereClause );
+        if ( !$postData->count() ) {
+            Debug::info( 'No Blog posts found.' );
+            return false;
+        }
+        return $this->filter( $postData->first() );
+    }
+
     public function byMonth( $month, $year = 0, $includeDraft = false ) {
         if ( 0 === $year ) {
             $year = date( 'Y' );
@@ -310,7 +345,7 @@ class Posts extends DatabaseModel {
         $month = date( 'F', $firstDayUnix );
         $lastDayUnix = date( 'U', strtotime( "last day of $month $year" ) );
         $whereClause = array_merge( $whereClause, ['created', '<=', $lastDayUnix, 'AND', 'created', '>=', $firstDayUnix] );
-        $postData = self::$db->getPaginated( $this->tableName, $whereClause );
+        $postData = self::$db->get( $this->tableName, $whereClause );
         if ( !$postData->count() ) {
             Debug::info( 'No Blog posts found.' );
 

app/plugins/blog/plugin.php

@@ -12,12 +12,7 @@
  */
 namespace TheTempusProject\Plugins;
 
-use ReflectionClass;
-use TheTempusProject\Classes\Installer;
-use TheTempusProject\Houdini\Classes\Navigation;
 use TheTempusProject\Classes\Plugin;
-use TheTempusProject\Models\Posts;
-use TheTempusProject\TheTempusProject as App;
 
 class Blog extends Plugin {
     public $pluginName = 'TP Blog';
@@ -28,20 +23,27 @@ class Blog extends Plugin {
     public $pluginDescription = 'A simple plugin to add a blog to your installation.';
     public $admin_links = [
         [
-            'text' => '<i class="glyphicon glyphicon-text-size"></i> Blog',
+            'text' => '<i class="fa fa-fw fa-font"></i> Blog',
             'url' => '{ROOT_URL}admin/blog',
         ],
     ];
-    public $footer_links = [
+    public $info_footer_links = [
         [
             'text' => 'Blog',
             'url' => '{ROOT_URL}blog/index',
         ],
     ];
-    public $posts;
+    public $resourceMatrix = [
-
+        'posts' => [
-    public function __construct( $load = false ) {
+            [
-        $this->posts = new Posts;
+                'title' => 'Welcome',
-        parent::__construct( $load );
+                'slug' => 'welcome',
-    }
+                'content' => '<p>This is just a simple message to say thank you for installing The Tempus Project. If you have any questions you can find everything through our website <a href="https://TheTempusProject.com">here</a>.</p>',
+                'author' => 1,
+                'created' => '{time}',
+                'edited' => '{time}',
+                'draft' => 0,
+            ],
+        ],
+    ];
 }

app/plugins/blog/templates/blog.inc.php

@@ -12,7 +12,7 @@
  */
 namespace TheTempusProject\Templates;
 
-use TheTempusProject\Plugins\Blog;
+use TheTempusProject\Models\Posts;
 use TheTempusProject\Houdini\Classes\Components;
 use TheTempusProject\Houdini\Classes\Navigation;
 use TheTempusProject\Houdini\Classes\Views;
@@ -25,10 +25,12 @@ class BlogLoader extends DefaultLoader {
      * needed by this template.
      */
     public function __construct() {
-        $blog = new Blog;
+        $posts = new Posts;
-        $posts = $blog->posts;
+        Components::set('SIDEBAR', Views::simpleView('blog.widgets.recent', $posts->recent(5)));
-        Components::set('SIDEBAR', Views::simpleView('blog.sidebar', $posts->recent(5)));
+        Components::set('SIDEBAR2', Views::simpleView('blog.widgets.archive', $posts->archive()));
-        Components::set('SIDEBAR2', Views::simpleView('blog.sidebar2', $posts->archive()));
+        Components::set('SIDEBARABOUT', Views::simpleView('blog.widgets.about'));
+        Components::set('SIDEBARSEARCH', Views::simpleView('blog.widgets.search'));
+        Components::set('BLOGFEATURES', '');
         Navigation::setCrumbComponent( 'BLOG_BREADCRUMBS', Input::get( 'url' ) );
         Components::set( 'BLOG_TEMPLATE_URL', Template::parse( '{ROOT_URL}app/plugins/comments/' ) );
         $this->addCss( '<link rel="stylesheet" href="{BLOG_TEMPLATE_URL}css/comments.css">' );

app/plugins/blog/templates/blog.tpl

@@ -10,10 +10,10 @@
      * @license https://opensource.org/licenses/MIT [MIT LICENSE]
     -->
     <head>
-        <meta charset="utf-8">
+        <meta charset="UTF-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta property="og:url" content="{CURRENT_URL}">
-        <meta name='twitter:card' content='summary' />
+        <meta name='twitter:card' content='summary_large_image'>
         <title>{TITLE}</title>
         <meta itemprop="name" content="{TITLE}">
         <meta name="twitter:title" content="{TITLE}">
@@ -28,84 +28,110 @@
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <meta name="author" content="The Tempus Project">
         {ROBOT}
-        <link rel="alternate" hreflang="en-us" href="alternateURL">
         <link rel="icon" href="{ROOT_URL}images/favicon.ico">
         <!-- Required CSS -->
-        <link rel="stylesheet" href="{FONT_AWESOME_URL}font-awesome.min.css" crossorigin="anonymous">
+    	<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.7.1/css/all.min.css" crossorigin="anonymous" referrerpolicy="no-referrer">
-        <link rel="stylesheet" href="{BOOTSTRAP_CDN}css/bootstrap-theme.min.css" crossorigin="anonymous">
         <link rel="stylesheet" href="{BOOTSTRAP_CDN}css/bootstrap.min.css" crossorigin="anonymous">
         <!-- RSS -->
-        <link rel="alternate" href="{ROOT_URL}blog/rss" title="{TITLE} Feed" type="application/rss+xml" />
+        <link rel="alternate" href="{ROOT_URL}blog/rss" title="{TITLE} Feed" type="application/rss+xml">
         <!-- Custom styles for this template -->
         {TEMPLATE_CSS_INCLUDES}
     </head>
     <body>
-        <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+		<!-- Navigation -->
-            <!--Brand and toggle should get grouped for better mobile display -->
+        <header class="p-3 text-bg-dark">
-            <div class="navbar-header">
+            <div class="container">
-                <a href="{ROOT_URL}" class="navbar-brand">{SITENAME}</a>
+                <div class="d-flex align-items-center position-relative">
-                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse" style="">
+                    <!-- Navbar Toggler (Left) -->
-                    <span class="sr-only">Toggle navigation</span>
+        
-                    <span class="icon-bar"></span>
+                    <!-- Centered Logo (Now inside normal document flow) -->
-                    <span class="icon-bar"></span>
+                    <a href="/" class="d-flex align-items-center text-white text-decoration-none d-md-none mx-auto">
-                    <span class="icon-bar"></span>
+                        <img src="{ROOT_URL}{LOGO}" width="40" height="32" alt="{SITENAME} Logo" class="bi">
+                    </a>
+        
+                    <!-- Logo (Normal Position for Large Screens) -->
+                    <a href="/" class="d-flex align-items-center text-white text-decoration-none d-none d-md-flex">
+                        <img src="{ROOT_URL}{LOGO}" width="40" height="32" alt="{SITENAME} Logo" class="bi">
+                    </a>
+        
+                    <div class="navbar-expand-md flex-grow-1">
+                        <div class="collapse navbar-collapse d-md-flex" id="mainMenu">
+                            <!-- Centered Navigation -->
+                            <div class="d-none d-md-block d-flex justify-content-center w-100 position-absolute start-50 translate-middle-x">
+                                {topNavLeft}
+                            </div>
+                            <div class="d-flex justify-content-center flex-grow-1 d-md-none">
+                                {topNavLeft}
+                            </div>
+        
+                            <!-- Right-Side Content (Push to End) -->
+                            <div class="d-flex flex-row justify-content-center align-items-center mt-3 mt-md-0 ms-md-auto">
+                                {topNavRight}
+                            </div>
+                        </div> <!-- End Collapse -->
+                    </div> <!-- End Navbar Expand -->
+                    
+                    <button class="me-3 d-md-none btn btn-md btn-outline-light" type="button" data-bs-toggle="collapse" data-bs-target="#mainMenu" aria-controls="mainMenu" aria-expanded="false" aria-label="Toggle navigation">
+                        <i class="fa fa-bars"></i>
                     </button>
                 </div>
-            <div class="container-fluid">
-                <div class="collapse navbar-collapse navbar-ex1-collapse">
-                    {topNavLeft}
-                    <div class="navbar-right">
-                        <ul class="nav navbar-nav">
-                            {topNavRight}
-                        </ul>
             </div>
-                </div>
+        </header>
-            </div>
+        <div class="d-flex flex-column min-vh-100">
-        </nav>
+            <div class="flex-container flex-grow-1">
-        <div class="container-fluid">
-            <div class="foot-pad">
                 {ISSUES}
+                <div class="container pt-4">
                     <div class="row">
-                    <div class="container">
                         {ERROR}
                         {NOTICE}
                         {SUCCESS}
+                        {INFO}
                     </div>
                 </div>
                 {/ISSUES}
-                <div class="row">
+
+			    <!-- Leading Content -->
                 <div class="container">
-                        <div class="page-header">
+                    {BLOGFEATURES}
-                            <h1 class="blog-title">{SITENAME} Blog</h1>
                 </div>
-                        <div class="row">
+
-                            <div class="col-sm-8 blog-main">
+                <div class="pt-4">
-                                {BLOG_BREADCRUMBS}
+                    <div class="container">
+                        <h3 class="pb-4 mb-4 fst-italic border-bottom context-main-border">
+                            {SITENAME} Blog
+                        </h3>
+                        <div class="d-md-flex g-5">
+			                <!-- Main Content -->
+                            <div class="col-12 col-md-8">
                                 {CONTENT}
                             </div>
-                            <!-- /.blog-main -->
+			                <!-- Sidebar Content -->
-                            <div class="col-sm-3 col-sm-offset-1 blog-sidebar">
+                            <div class="col-12 col-md-4">
-                                <div class="sidebar-module">
+                                <div class="position-sticky" style="top: 2rem;">
+                                    <div class="ps-md-2 ps-lg-5">
+                                        {SIDEBARABOUT}
+                                    </div>
+                                    <div class="ps-md-2 ps-lg-5">
+                                        {SIDEBARSEARCH}
+                                    </div>
+                                    <div class="ps-md-2 ps-lg-5">
                                         {SIDEBAR}
                                     </div>
-                                <div class="sidebar-module">
+                                    <div class="ps-md-2 ps-lg-5">
                                         {SIDEBAR2}
                                     </div>
                                 </div>
-                            <!-- /.blog-sidebar -->
-                        </div>
-                        <!-- /.row -->
                             </div>
                         </div>
                     </div>
                 </div>
-        <footer>
+            </div>
             {FOOT}
-            {COPY}
+        </div>
-        </footer>
         <!-- Bootstrap core JavaScript and jquery -->
-        <script src="{JQUERY_CDN}jquery.min.js" crossorigin="anonymous"></script>
+        <script language="JavaScript" crossorigin="anonymous" type="text/javascript" src="{JQUERY_CDN}jquery.min.js"></script>
-        <script src="{BOOTSTRAP_CDN}js/bootstrap.min.js" crossorigin="anonymous"></script>
+        <script language="JavaScript" crossorigin="anonymous" type="text/javascript" src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.6/dist/umd/popper.min.js"></script>
+        <script language="JavaScript" crossorigin="anonymous" type="text/javascript" src="{BOOTSTRAP_CDN}js/bootstrap.min.js"></script>
         <!-- Custom javascript for this template -->
         {TEMPLATE_JS_INCLUDES}
     </body>

app/plugins/blog/views/admin/create.html

@@ -1,31 +1,55 @@
-<form action="" method="post" class="form-horizontal"  enctype="multipart/form-data">
+<div class="context-main-bg context-main p-3">
-    <legend>New Blog Post</legend>
+    <legend class="text-center">Add Blog Post</legend>
-    <div class="form-group">
+    <hr>
-        <label for="title" class="col-lg-3 control-label">Title</label>
+    {ADMIN_BREADCRUMBS}
-        <div class="col-lg-3">
+    <form method="post">
-            <input type="text" class="form-check-input" name="title" id="title">
+        <fieldset>
-        </div>
+            <!-- Title -->
-    </div>
+            <div class="mb-3 row">
-    <div class="form-group">
+                <label for="title" class="col-lg-3 col-form-label text-end">Title:</label>
-        <div class="col-lg-6 col-lg-offset-3 btn-group">
-            <button type="button" class="btn btn-sm btn-primary" onclick="insertTag ('blogPost', 'c');">&#10004;</button>
-            <button type="button" class="btn btn-sm btn-primary" onclick="insertTag ('blogPost', 'x');">&#10006;</button>
-            <button type="button" class="btn btn-sm btn-primary" onclick="insertTag ('blogPost', '!');">&#10069;</button>
-            <button type="button" class="btn btn-sm btn-primary" onclick="insertTag ('blogPost', '?');">&#10068;</button>
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="blogPost" class="col-lg-3 control-label">Post</label>
                 <div class="col-lg-6">
-            <textarea class="form-control" name="blogPost" maxlength="2000" rows="10" cols="50" id="blogPost"></textarea>
+                    <input type="text" class="form-control" name="title" id="title" required>
                 </div>
             </div>
-    <div class="form-group">
+
-        <div class="col-lg-6 col-lg-offset-3">
+            <!-- Slug -->
-            <button name="submit" value="publish" type="submit" class="btn btn-lg btn-primary">Publish</button>
+            <div class="mb-3 row">
-            <button name="submit" value="saveDraft" type="submit" class="btn btn-lg btn-primary">Save as Draft</button>
+                <label for="slug" class="col-lg-3 col-form-label text-end">URL Slug (for pretty linking):</label>
-            <button name="submit" value="preview" type="submit" class="btn btn-lg btn-primary">Preview</button>
+                <div class="col-lg-6">
+                    <input type="text" class="form-control" name="slug" id="slug" required>
                 </div>
             </div>
+
+            <!-- form buttons -->
+            <div class="mb-3 row">
+                <div class="offset-3 col-lg-6">
+                        <div class="btn-group w-100">
+                            <button type="button" class="btn btn-sm btn-outline-primary" onclick="insertTag ('blogPost', 'c');">&#10004;</button>
+                            <button type="button" class="btn btn-sm btn-outline-primary" onclick="insertTag ('blogPost', 'x');">&#10006;</button>
+                            <button type="button" class="btn btn-sm btn-outline-primary" onclick="insertTag ('blogPost', '!');">&#10069;</button>
+                            <button type="button" class="btn btn-sm btn-outline-primary" onclick="insertTag ('blogPost', '?');">&#10068;</button>
+                        </div>
+                </div>
+            </div>
+
+            <!-- Message -->
+            <div class="mb-3 row">
+                <label for="blogPost" class="col-lg-3 col-form-label text-end">Post:</label>
+                <div class="col-lg-6">
+                    <textarea class="form-control" name="blogPost" id="blogPost" rows="6" maxlength="2000" required></textarea>
+                    <small class="form-text text-muted">Max: 2000 characters</small>
+                </div>
+            </div>
+
+            <!-- Hidden Token -->
             <input type="hidden" name="token" value="{TOKEN}">
-</form>
+        </fieldset>
+
+        <!-- Submit Button -->
+        <div class="text-center">
+            <button name="submit" value="publish" type="submit" class="mx-2 btn btn-lg btn-primary">Publish</button>
+            <button name="submit" value="saveDraft" type="submit" class="mx-2 btn btn-lg btn-primary">Save as Draft</button>
+            <button name="submit" value="preview" type="submit" class="mx-2 btn btn-lg btn-primary">Preview</button>
+        </div>
+    </form>
+</div>

app/plugins/blog/views/admin/dashboard.html

@@ -1,5 +1,5 @@
 <legend>New Posts</legend>
-<table class="table table-striped">
+<table class="table context-main">
     <thead>
         <tr>
             <th style="width: 20%"></th>
@@ -14,9 +14,9 @@
         <tr>
             <td>{title}</td>
             <td>{contentSummary}</td>
-            <td><a href="{ROOT_URL}admin/blog/view/{ID}" class="btn btn-sm btn-primary" role="button"><i class="glyphicon glyphicon-open"></i></a></td>
+            <td><a href="{ROOT_URL}admin/blog/view/{ID}" class="btn btn-sm btn-primary"><i class="fa fa-fw fa-upload"></i></a></td>
-            <td><a href="{ROOT_URL}admin/blog/edit/{ID}" class="btn btn-sm btn-warning" role="button"><i class="glyphicon glyphicon-edit"></i></a></td>
+            <td><a href="{ROOT_URL}admin/blog/edit/{ID}" class="btn btn-sm btn-warning"><i class="fa fa-fw fa-pencil"></i></a></td>
-            <td width="30px"><a href="{ROOT_URL}admin/blog/delete/{ID}" class="btn btn-sm btn-danger" role="button"><i class="glyphicon glyphicon-trash"></i></a></td>
+            <td width="30px"><a href="{ROOT_URL}admin/blog/delete/{ID}" class="btn btn-sm btn-danger"><i class="fa fa-fw fa-trash"></i></a></td>
         </tr>
         {/LOOP}
         {ALT}

app/plugins/blog/views/admin/edit.html

@@ -1,31 +1,55 @@
-<form action="" method="post" class="form-horizontal"  enctype="multipart/form-data">
+<div class="context-main-bg context-main p-3">
-    <legend>Edit Blog Post</legend>
+    <legend class="text-center">Edit Blog Post</legend>
-    <div class="form-group">
+    <hr>
-        <label for="title" class="col-lg-3 control-label">Title</label>
+    {ADMIN_BREADCRUMBS}
-        <div class="col-lg-3">
+    <form method="post">
-            <input type="text" class="form-check-input" name="title" id="title" value="{title}">
+        <fieldset>
-        </div>
+            <!-- Title -->
-    </div>
+            <div class="mb-3 row">
-    <div class="form-group">
+                <label for="title" class="col-lg-3 col-form-label text-end">Title:</label>
-        <div class="col-lg-6 col-lg-offset-3 btn-group">
-            <button type="button" class="btn btn-sm btn-primary" onclick="insertTag ('blogPost', 'c');">&#10004;</button>
-            <button type="button" class="btn btn-sm btn-primary" onclick="insertTag ('blogPost', 'x');">&#10006;</button>
-            <button type="button" class="btn btn-sm btn-primary" onclick="insertTag ('blogPost', '!');">&#10069;</button>
-            <button type="button" class="btn btn-sm btn-primary" onclick="insertTag ('blogPost', '?');">&#10068;</button>
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="blogPost" class="col-lg-3 control-label">Post</label>
                 <div class="col-lg-6">
-            <textarea class="form-control" name="blogPost" maxlength="2000" rows="10" cols="50" id="blogPost">{content}</textarea>
+                    <input type="text" class="form-control" name="title" id="title" value="{title}" required>
                 </div>
             </div>
-    <div class="form-group">
+
-        <div class="col-lg-6 col-lg-offset-3">
+            <!-- Slug -->
-            <button name="submit" value="publish" type="submit" class="btn btn-lg btn-primary">Publish</button>
+            <div class="mb-3 row">
-            <button name="submit" value="saveDraft" type="submit" class="btn btn-lg btn-primary">Save as Draft</button>
+                <label for="slug" class="col-lg-3 col-form-label text-end">URL Slug (for pretty linking):</label>
-            <button name="submit" value="preview" type="submit" class="btn btn-lg btn-primary">Preview</button>
+                <div class="col-lg-6">
+                    <input type="text" class="form-control" name="slug" id="slug" value="{slug}" required>
                 </div>
             </div>
+
+            <!-- form buttons -->
+            <div class="mb-3 row">
+                <div class="offset-3 col-lg-6">
+                        <div class="btn-group w-100">
+                            <button type="button" class="btn btn-sm btn-outline-primary" onclick="insertTag ('blogPost', 'c');">&#10004;</button>
+                            <button type="button" class="btn btn-sm btn-outline-primary" onclick="insertTag ('blogPost', 'x');">&#10006;</button>
+                            <button type="button" class="btn btn-sm btn-outline-primary" onclick="insertTag ('blogPost', '!');">&#10069;</button>
+                            <button type="button" class="btn btn-sm btn-outline-primary" onclick="insertTag ('blogPost', '?');">&#10068;</button>
+                        </div>
+                </div>
+            </div>
+
+            <!-- Message -->
+            <div class="mb-3 row">
+                <label for="blogPost" class="col-lg-3 col-form-label text-end">Post:</label>
+                <div class="col-lg-6">
+                    <textarea class="form-control" name="blogPost" id="blogPost" rows="6" maxlength="2000" required>{content}</textarea>
+                    <small class="form-text text-muted">Max: 2000 characters</small>
+                </div>
+            </div>
+
+            <!-- Hidden Token -->
             <input type="hidden" name="token" value="{TOKEN}">
-</form>
+        </fieldset>
+
+        <!-- Submit Button -->
+        <div class="text-center">
+            <button name="submit" value="publish" type="submit" class="mx-2 btn btn-lg btn-primary">Publish</button>
+            <button name="submit" value="saveDraft" type="submit" class="mx-2 btn btn-lg btn-primary">Save as Draft</button>
+            <button name="submit" value="preview" type="submit" class="mx-2 btn btn-lg btn-primary">Preview</button>
+        </div>
+    </form>
+</div>

app/plugins/blog/views/admin/list.html

@@ -1,6 +1,8 @@
-<legend>Blog Posts</legend>
+<div class="context-main-bg context-main p-3">
-{PAGINATION}
+    <legend class="text-center">Blog Posts</legend>
-<form action="{ROOT_URL}admin/blog/delete" method="post">
+    <hr>
+    {ADMIN_BREADCRUMBS}
+    <form action="{ROOT_URL}admin/blog/delete" method="post">
         <table class="table table-striped">
             <thead>
                 <tr>
@@ -12,20 +14,20 @@
                     <th style="width: 5%"></th>
                     <th style="width: 5%"></th>
                     <th style="width: 10%">
-                    <INPUT type="checkbox" onchange="checkAll(this)" name="check.b" value="B_[]"/>
+                        <input type="checkbox" onchange="checkAll(this)" name="check.b" value="B_[]">
                     </th>
                 </tr>
             </thead>
             <tbody>
                 {LOOP}
                 <tr>
-                <td><a href="{ROOT_URL}admin/blog/view/{ID}">{title}</a>{isDraft}</td>
+                    <td><a href="{ROOT_URL}admin/blog/view/{ID}" class="text-decoration-none">{title}</a>{isDraft}</td>
                     <td>{authorName}</td>
                     <td>{commentCount}</td>
                     <td>{DTC}{created}{/DTC}</td>
                     <td>{DTC}{edited}{/DTC}</td>
-                <td><a href="{ROOT_URL}admin/blog/edit/{ID}" class="btn btn-sm btn-warning" role="button"><i class="glyphicon glyphicon-edit"></i></a></td>
+                    <td><a href="{ROOT_URL}admin/blog/edit/{ID}" class="btn btn-sm btn-warning"><i class="fa fa-fw fa-pencil"></i></a></td>
-                <td><a href="{ROOT_URL}admin/blog/delete/{ID}" class="btn btn-sm btn-danger" role="button"><i class="glyphicon glyphicon-trash"></i></a></td>
+                    <td><a href="{ROOT_URL}admin/blog/delete/{ID}" class="btn btn-sm btn-danger"><i class="fa fa-fw fa-trash"></i></a></td>
                     <td>
                         <input type="checkbox" value="{ID}" name="B_[]">
                     </td>
@@ -40,6 +42,7 @@
                 {/ALT}
             </tbody>
         </table>
-    <a href="{ROOT_URL}admin/blog/create" class="btn btn-sm btn-primary" role="button">Create</a>
+        <a href="{ROOT_URL}admin/blog/create" class="btn btn-sm btn-primary">Create</a>
-    <button name="submit" value="submit" type="submit" class="btn btn-sm btn-danger">Delete</button>
+        <button name="submit" value="submit" type="submit" class="btn btn-sm btn-danger"><i class="fa fa-fw fa-trash"></i></button>
-</form>
+    </form>
+</div>

app/plugins/blog/views/admin/preview.html

@@ -7,7 +7,7 @@
         </div><!-- /.blog-post -->
     </div><!-- /.blog-main -->
 </div><!-- /.row -->
-<form action="" method="post" class="form-horizontal"  enctype="multipart/form-data">
+<form method="post" enctype="multipart/form-data">
     <legend>New Blog Post</legend>
     <div class="form-group">
         <label for="title" class="col-lg-3 control-label">Title</label>

app/plugins/blog/views/admin/view.html

@@ -1,11 +1,14 @@
-<div class="row">
+<div class="context-main-bg context-main p-3">
-    <div class="col-sm-8 blog-main">
+    <legend class="text-center">Blog Post: {title}</legend>
-        <div class="page-header">
+    <hr>
-            <h1>{title} <small>{DTC}{created}{/DTC} by <a href="{ROOT_URL}admin/users/view/{author}">{authorName}</a></small></h1>
+    {ADMIN_BREADCRUMBS}
-        </div>
+    <p class="blog-post-meta">{DTC date}{created}{/DTC} by <a href="{ROOT_URL}admin/users/view/{author}">{authorName}</a></p>
     <div class="well">{content}</div>
-        <a href="{ROOT_URL}admin/blog/delete/{ID}" class="btn btn-md btn-danger" role="button">Delete</a>
+    {ADMIN}
-        <a href="{ROOT_URL}admin/blog/edit/{ID}" class="btn btn-md btn-warning" role="button">Edit</a>
+        <hr>
-        <a href="{ROOT_URL}admin/comments/blog/{ID}" class="btn btn-md btn-primary" role="button">View Comments</a>
+        <a href="{ROOT_URL}admin/blog/delete/{ID}" class="btn btn-md btn-danger"><i class="fa fa-fw fa-trash"></i></a>
-    </div><!-- /.blog-main -->
+        <a href="{ROOT_URL}admin/blog/edit/{ID}" class="btn btn-md btn-warning"><i class="fa fa-fw fa-pencil"></i></a>
-</div><!-- /.row -->
+        <a href="{ROOT_URL}admin/comments/blog/{ID}" class="btn btn-md btn-primary">View Comments</a>
+        <hr>
+    {/ADMIN}
+</div>

app/plugins/blog/views/largeFeature.html

@@ -0,0 +1,7 @@
+<div class="p-4 p-md-5 mb-4 rounded text-bg-dark">
+    <div class="col-md-6 px-0">
+        <h1 class="display-4 fst-italic">Title of a longer featured blog post</h1>
+        <p class="lead my-3">Multiple lines of text that form the lede, informing new readers quickly and efficiently about what’s most interesting in this post’s contents.</p>
+        <p class="lead mb-0"><a href="#" class="text-white fw-bold">Continue reading...</a></p>
+    </div>
+</div>

app/plugins/blog/views/list.html

@@ -1,18 +1,15 @@
-{PAGINATION}
 {LOOP}
-    <div class="blog-post">
+    <article class="blog-post context-main-bg p-2">
-        <h2 class="blog-post-title"><a href="{ROOT_URL}blog/post/{ID}">{title}</a></h2>
+        <h2 class="blog-post-title mb-1">{title}</h2>
-        <hr>
+        <p class="blog-post-meta">{DTC date}{created}{/DTC} by <a href="{ROOT_URL}home/profile/{authorName}" class="text-decoration-none">{authorName}</a></p>
         <div class="well">
-            <p class="blog-post-meta">
-                Posted on <i>{DTC date}{created}{/DTC}</i> by <a href="{ROOT_URL}home/profile/{author}"><strong>{authorName}</strong></a>
-            </p>
             {contentSummary}
         </div>
-    </div>
+    </article>
+    <hr>
 {/LOOP}
 {ALT}
-    <div class="blog-post">
+    <div class="text-center">
-        <p class="blog-post-meta">No Posts Found.</p>
+        <p class="h5">No Posts Found</p>
     </div>
 {/ALT}

app/plugins/blog/views/post.html

@@ -1,14 +1,14 @@
 <div class="row">
-    <div class="col-lg-12 col-sm-12 blog-main">
+    <div class="col-lg-12 col-sm-12 blog-main context-main-bg p-1 p-md-2 mb-2 rounded">
-        <div class="blog-post">
+        <div class="blog-post mb-5 pb-5">
             <h2 class="blog-post-title">{title}</h2>
             <hr>
-            <p class="blog-post-meta">{DTC date}{created}{/DTC} by <a href="{ROOT_URL}home/profile/{author}">{authorName}</a></p>
+            <p class="blog-post-meta">{DTC date}{created}{/DTC} by <a href="{ROOT_URL}home/profile/{authorName}" class="text-decoration-none">{authorName}</a></p>
             {content}
             {ADMIN}
                 <hr>
-                <a href="{ROOT_URL}admin/blog/delete/{ID}" class="btn btn-md btn-danger" role="button">Delete</a>
+                <a href="{ROOT_URL}admin/blog/delete/{ID}" class="btn btn-md btn-danger"><i class="fa fa-fw fa-trash"></i></a>
-                <a href="{ROOT_URL}admin/blog/edit/{ID}" class="btn btn-md btn-warning" role="button">Edit</a>
+                <a href="{ROOT_URL}admin/blog/edit/{ID}" class="btn btn-md btn-warning"><i class="fa fa-fw fa-pencil"></i></a>
                 <hr>
             {/ADMIN}
         </div><!-- /.blog-post -->

app/plugins/blog/views/recentWidget.html

@@ -1,15 +0,0 @@
-<div class="panel panel-info">
-    <div class="panel-heading">
-        <h3 class="panel-title">Recent Posts</h3>
-    </div>
-    <ul class="list-group">
-        {LOOP}
-            <li class="list-group-item">
-                <a href="{ROOT_URL}blog/post/{ID}">{title}</a>
-            </li>
-        {/LOOP}
-        {ALT}
-            <li class="list-group-item">No Posts to show</li>
-        {/ALT}
-    </ul>
-</div>

app/plugins/blog/views/searchResults.html

@@ -0,0 +1,3 @@
+<legend class="text-center my-2">Search Results</legend>
+<hr>
+{searchResults}

app/plugins/blog/views/sidebar.html

@@ -1,18 +0,0 @@
-<div class="panel panel-info">
-    <div class="panel-heading">
-        <h3 class="panel-title">Recent Posts</h3>
-    </div>
-    <div class="panel-body">
-        <ol class="list-unstyled">
-            {LOOP}
-                <li><a href="{ROOT_URL}blog/post/{ID}">{title}</a></li>
-            {/LOOP}
-            {ALT}
-                <li>No Posts to show</li>
-            {/ALT}
-        </ol>
-    </div>
-    <div class="panel-footer">
-        <a href="{ROOT_URL}blog">View All</a>
-    </div>
-</div>

app/plugins/blog/views/sidebar2.html

@@ -1,14 +0,0 @@
-<div class="panel panel-info">
-    <div class="panel-heading">
-        <h3 class="panel-title">Archives</h3>
-    </div>
-    <div class="panel-body">
-        <ol class="list-unstyled">
-            {LOOP}
-                <li>({count}) <a href="{ROOT_URL}blog/month/{month}/{year}">{monthText} {year}</a></li>
-            {/LOOP}
-            {ALT}
-            {/ALT}
-        </ol>
-    </div>
-</div>

app/plugins/blog/views/smallFeature.html

@@ -0,0 +1,31 @@
+
+<div class="row mb-2">
+    <div class="col-md-6">
+        <div class="row g-0 border rounded overflow-hidden flex-md-row mb-4 shadow-sm h-md-250 position-relative">
+            <div class="col p-4 d-flex flex-column position-static">
+                <strong class="d-inline-block mb-2 text-primary">World</strong>
+                <h3 class="mb-0">Featured post</h3>
+                <div class="mb-1 text-muted">Nov 12</div>
+                <p class="card-text mb-auto">This is a wider card with supporting text below as a natural lead-in to additional content.</p>
+                <a href="#" class="stretched-link">Continue reading</a>
+            </div>
+            <div class="col-auto d-none d-lg-block">
+                <svg class="bd-placeholder-img" width="200" height="250" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="Placeholder: Thumbnail" preserveAspectRatio="xMidYMid slice" focusable="false"><title>Placeholder</title><rect width="100%" height="100%" fill="#55595c"><text x="50%" y="50%" fill="#eceeef" dy=".3em">Thumbnail</text></svg>
+            </div>
+        </div>
+    </div>
+    <div class="col-md-6">
+        <div class="row g-0 border rounded overflow-hidden flex-md-row mb-4 shadow-sm h-md-250 position-relative">
+            <div class="col p-4 d-flex flex-column position-static">
+                <strong class="d-inline-block mb-2 text-success">Design</strong>
+                <h3 class="mb-0">Post title</h3>
+                <div class="mb-1 text-muted">Nov 11</div>
+                <p class="mb-auto">This is a wider card with supporting text below as a natural lead-in to additional content.</p>
+                <a href="#" class="stretched-link">Continue reading</a>
+            </div>
+            <div class="col-auto d-none d-lg-block">
+                <svg class="bd-placeholder-img" width="200" height="250" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="Placeholder: Thumbnail" preserveAspectRatio="xMidYMid slice" focusable="false"><title>Placeholder</title><rect width="100%" height="100%" fill="#55595c"><text x="50%" y="50%" fill="#eceeef" dy=".3em">Thumbnail</text></svg>
+            </div>
+        </div>
+    </div>
+</div>

app/plugins/blog/views/widgets/about.html

@@ -0,0 +1,11 @@
+<div class="pb-2 pb-lg-3">
+    <div class="card rounded context-main-bg">
+        <div class="card-body">
+            <h4 class="fst-italic">About</h4>
+            <p class="mb-0">
+                The blog is mostly here to serve ass a simple way to link to long-form content on the site.
+                There won't be any breaking news or tell-all stories here. Just good ole fashioned boring crap no one wants to read.
+            </p>
+        </div>
+    </div>
+</div>

app/plugins/blog/views/widgets/archive.html

@@ -0,0 +1,17 @@
+<div class="pb-2 pb-lg-3">
+    <div class="card rounded context-main-bg">
+        <div class="card-header">
+            <h3 class="card-title">Archives</h3>
+        </div>
+        <div class="card-body context-second-bg">
+            <ol class="list-unstyled">
+                {LOOP}
+                    <li>({count}) <a href="{ROOT_URL}blog/month/{month}/{year}" class="text-decoration-none">{monthText} {year}</a></li>
+                {/LOOP}
+                {ALT}
+                    <li>None To Show</li>
+                {/ALT}
+            </ol>
+        </div>
+    </div>
+</div>

app/plugins/blog/views/widgets/recent.html

@@ -0,0 +1,20 @@
+<div class="pb-2 pb-lg-3">
+    <div class="card rounded context-main-bg">
+        <div class="card-header">
+            <h3 class="card-title">Recent Posts</h3>
+        </div>
+        <div class="card-body context-second-bg">
+            <ol class="list-unstyled">
+                {LOOP}
+                    <li><a href="{ROOT_URL}blog/post/{ID}" class="text-decoration-none">{title}</a></li>
+                {/LOOP}
+                {ALT}
+                    <li>No Posts to show</li>
+                {/ALT}
+            </ol>
+        </div>
+        <div class="card-footer">
+            <a href="{ROOT_URL}blog" class="text-decoration-none">View All</a>
+        </div>
+    </div>
+</div>

app/plugins/blog/views/widgets/search.html

@@ -0,0 +1,18 @@
+<div class="pb-2 pb-lg-3">
+    <div class="card rounded context-main-bg">
+        <div class="card-body">
+            <form method="post" action="/blog/search">
+                <fieldset>
+                    <!-- Hidden Token -->
+                    <input type="hidden" name="token" value="{TOKEN}">
+            
+                    <!-- Search -->
+                    <div class="input-group">
+                        <input type="text" class="form-control" aria-label="Search Terms" name="searchTerm" id="searchTerm">
+                        <button type="submit" class="btn btn-secondary bg-primary" name="submit" value="submit">Search</button>
+                    </div>
+                </fieldset>
+            </form>
+        </div>
+    </div>
+</div>

app/plugins/bookmarks/controllers/bookmarks.php

@@ -1,402 +0,0 @@
-<?php
-/**
- * app/plugins/bugreport/controllers/bugreport.php
- *
- * This is the bug reports controller.
- *
- * @package TP BugReports
- * @version 3.0
- * @author  Joey Kimsey <Joey@thetempusproject.com>
- * @link    https://TheTempusProject.com
- * @license https://opensource.org/licenses/MIT [MIT LICENSE]
- */
-namespace TheTempusProject\Controllers;
-
-use TheTempusProject\Hermes\Functions\Redirect;
-use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Bedrock\Functions\Input;
-use TheTempusProject\Bedrock\Functions\Session;
-use TheTempusProject\Houdini\Classes\Issues;
-use TheTempusProject\Houdini\Classes\Views;
-use TheTempusProject\Classes\Controller;
-use TheTempusProject\Classes\Forms;
-use TheTempusProject\Models\Bookmarks as Bookmark;
-use TheTempusProject\Models\Folders;
-use TheTempusProject\TheTempusProject as App;
-use TheTempusProject\Houdini\Classes\Components;
-use TheTempusProject\Houdini\Classes\Forms as HoudiniForms;
-use TheTempusProject\Houdini\Classes\Navigation;
-
-class Bookmarks extends Controller {
-    protected static $bookmarks;
-    protected static $folders;
-
-    public function __construct() {
-        parent::__construct();
-        if ( !App::$isLoggedIn ) {
-            Session::flash( 'notice', 'You must be logged in to create or manage bookmarks.' );
-            return Redirect::home();
-        }
-        self::$bookmarks = new Bookmark;
-        self::$folders = new Folders;
-        self::$title = 'Bookmarks - {SITENAME}';
-        self::$pageDescription = 'Add and save url bookmarks here.';
-
-        $folderTabs = Views::simpleView( 'bookmarks.nav.folderTabs' );
-        if ( stripos( Input::get('url'), 'bookmarks/bookmarks' ) !== false ) {
-            $tabsView = Navigation::activePageSelect( $folderTabs, '/bookmarks/folders/', false, true );
-            $userFolderTabs = Views::simpleView('bookmarks.nav.userFolderTabs', self::$folders->simpleObjectByUser(true) );
-            $userFolderTabsView = Navigation::activePageSelect( $userFolderTabs, Input::get( 'url' ), false, true );
-        } else {
-            $tabsView = Navigation::activePageSelect( $folderTabs, Input::get( 'url' ), false, true );
-            $userFolderTabsView = '';
-        }
-        Components::set( 'userFolderTabs', $userFolderTabsView );
-        Views::raw( $tabsView );
-    }
-
-    public function index() {
-        $bookmarks = self::$bookmarks->noFolder();
-        $folders = self::$folders->byUser();
-        
-        $panelArray = [];
-        if ( !empty( $folders ) ) {
-            foreach ( $folders as $folder ) {
-                $panel = new \stdClass();
-                $folderObject = new \stdClass();
-                $folderObject->bookmarks = self::$bookmarks->byFolder( $folder->ID );
-                $folderObject->ID = $folder->ID;
-                $folderObject->title = $folder->title;
-                $folderObject->color = $folder->color;
-                $folderObject->bookmarkListRows = Views::simpleView( 'bookmarks.components.bookmarkListRows', $folderObject->bookmarks );
-                $panel->panel = Views::simpleView( 'bookmarks.components.bookmarkListPanel', [$folderObject] );
-                $panelArray[] = $panel;
-            }
-        }
-        Components::set( 'foldersList', Views::simpleView( 'bookmarks.folders.list', $folders ) );
-        Components::set( 'folderPanels', Views::simpleView( 'bookmarks.components.folderPanelList', $panelArray ) );
-        Components::set( 'bookmarksList', Views::simpleView( 'bookmarks.bookmarks.list', $bookmarks ) );
-        return Views::view( 'bookmarks.dash' );
-    }
-
-    /**
-     * Bookmarks
-     */
-    public function bookmark( $id = 0 ) {
-        $bookmark = self::$bookmarks->findById( $id );
-        if ( $bookmark == false ) {
-            Session::flash( 'error', 'Bookmark not found.' );
-            return Redirect::to( 'bookmarks/index' );
-        }
-        if ( $bookmark->createdBy != App::$activeUser->ID ) {
-            Session::flash( 'error', 'You do not have permission to modify this bookmark.' );
-            return Redirect::to( 'bookmarks/index' );
-        }
-        Navigation::setCrumbComponent( 'BookmarkBreadCrumbs', 'bookmarks/bookmark/' . $id );
-        return Views::view( 'bookmarks.bookmarks.view', $bookmark );
-    }
-
-    public function bookmarks( $id = null ) {
-        $folder = self::$folders->findById( $id );
-        if ( $folder == false ) {
-            Session::flash( 'error', 'Folder not found.' );
-            return Redirect::to( 'bookmarks/index' );
-        }
-        if ( $folder->createdBy != App::$activeUser->ID ) {
-            Session::flash( 'error', 'You do not have permission to view this folder.' );
-            return Redirect::to( 'bookmarks/index' );
-        }
-        Navigation::setCrumbComponent( 'BookmarkBreadCrumbs', 'bookmarks/bookmarks/' . $id );
-
-
-        $bookmarks = self::$bookmarks->noFolder();
-        
-        $panelArray = [];
-        $panel = new \stdClass();
-        $folderObject = new \stdClass();
-        $folderObject->bookmarks = self::$bookmarks->byFolder( $folder->ID );
-        $folderObject->ID = $folder->ID;
-        $folderObject->title = $folder->title;
-        $folderObject->color = $folder->color;
-        $folderObject->bookmarkListRows = Views::simpleView( 'bookmarks.components.bookmarkListRows', $folderObject->bookmarks );
-        $panel->panel = Views::simpleView( 'bookmarks.components.bookmarkListPanel', [$folderObject] );
-        $panelArray[] = $panel;
-
-        return Views::view( 'bookmarks.components.folderPanelList', $panelArray );
-    }
-
-    public function createBookmark( $id = null ) {
-        $folderID = Input::get('folder_id') ? Input::get('folder_id') : $id;
-        $folderID = Input::post('folder_id') ? Input::post('folder_id') : $id;
-        $folderSelect = HoudiniForms::getFormFieldHtml( 'folder_id', 'Folder', 'select', $folderID, self::$folders->simpleByUser() );
-        Components::set( 'folderSelect', $folderSelect );
-
-        if ( ! Input::exists() ) {
-            return Views::view( 'bookmarks.bookmarks.create' );
-        }
-        if ( ! Forms::check( 'createBookmark' ) ) {
-            Issues::add( 'error', [ 'There was an error with your form.' => Check::userErrors() ] );
-            return Views::view( 'bookmarks.bookmarks.create' );
-        }
-
-        $result = self::$bookmarks->create(
-            Input::post('title'),
-            Input::post('url'),
-            $folderID,
-            Input::post('description'),
-            Input::post('color'),
-            Input::post('privacy'),
-        );
-
-        if ( ! $result ) {
-            Issues::add( 'error', [ 'There was an error creating your bookmark.' => Check::userErrors() ] );
-            return Views::view( 'bookmarks.bookmarks.create' );
-        }
-        self::$bookmarks->refreshInfo( $result );
-        Session::flash( 'success', 'Your Bookmark has been created.' );
-        Redirect::to( 'bookmarks/bookmarks/'. $folderID );
-    }
-
-    public function editBookmark( $id = null ) {
-        $folderID = Input::exists('folder_id') ? Input::post('folder_id') : '';
-
-        $bookmark = self::$bookmarks->findById( $id );
-        if ( $bookmark == false ) {
-            Issues::add( 'error', 'Bookmark not found.' );
-            return Redirect::to( 'bookmarks/index' );
-        }
-        if ( $bookmark->createdBy != App::$activeUser->ID ) {
-            Issues::add( 'error', 'You do not have permission to modify this bookmark.' );
-            return Redirect::to( 'bookmarks/index' );
-        }
-        if ( empty( $folderID ) ) {
-            $folderID = $bookmark->folderID;
-        }
-
-        $folderSelect = HoudiniForms::getFormFieldHtml( 'folder_id', 'Folder', 'select', $folderID, self::$folders->simpleByUser() );
-        Components::set( 'folderSelect', $folderSelect );
-        Components::set( 'color', $bookmark->color );
-
-        if ( ! Input::exists( 'submit' ) ) {
-            return Views::view( 'bookmarks.bookmarks.edit', $bookmark );
-        }
-        if ( ! Forms::check( 'editBookmark' ) ) {
-            Issues::add( 'error', [ 'There was an error updating your bookmark.' => Check::userErrors() ] );
-            return Views::view( 'bookmarks.bookmarks.edit', $bookmark );
-        }
-
-        $result = self::$bookmarks->update(
-            $id,
-            Input::post('title'),
-            Input::post('url'),
-            $folderID,
-            Input::post('description'),
-            Input::post('color'),
-            Input::post('privacy'),
-        );
-        if ( ! $result ) {
-            Issues::add( 'error', [ 'There was an error updating your bookmark.' => Check::userErrors() ] );
-            return Views::view( 'bookmarks.bookmarks.edit', $bookmark );
-        }
-        Session::flash( 'success', 'Your Bookmark has been updated.' );
-        Redirect::to( 'bookmarks/folders/'. $bookmark->folderID );
-    }
-
-    public function deleteBookmark( $id = null ) {
-        $bookmark = self::$bookmarks->findById( $id );
-        if ( $bookmark == false ) {
-            Issues::add( 'error', 'Bookmark not found.' );
-            return $this->index();
-        }
-        if ( $bookmark->createdBy != App::$activeUser->ID ) {
-            Issues::add( 'error', 'You do not have permission to modify this bookmark.' );
-            return $this->index();
-        }
-        $result = self::$bookmarks->delete( $id );
-        if ( !$result ) {
-            Session::flash( 'error', 'There was an error deleting the bookmark(s)' );
-        } else {
-            Session::flash( 'success', 'Bookmark deleted' );
-        }
-        Redirect::to( 'bookmarks/folders/'. $bookmark->folderID );
-    }
-
-    /**
-     * Folders
-     */
-    public function folders( $id = null) {
-        $folder = self::$folders->findById( $id );
-        if ( $folder == false ) {
-            $folders = self::$folders->byUser();
-            return Views::view( 'bookmarks.folders.list', $folders );
-        }
-        if ( $folder->createdBy != App::$activeUser->ID ) {
-            Session::flash( 'error', 'You do not have permission to view this folder.' );
-            return Redirect::to( 'bookmarks/index' );
-        }
-        Navigation::setCrumbComponent( 'BookmarkBreadCrumbs', 'bookmarks/folders/' . $id );
-        return Views::view( 'bookmarks.folders.view', $folder );
-    }
-
-    public function createFolder( $id = 0 ) {
-        $folderID = Input::exists('folder_id') ? Input::post('folder_id') : $id;
-        $folders = self::$folders->simpleByUser();
-        if ( ! empty( $folders ) ) {
-            $folderSelect = HoudiniForms::getFormFieldHtml( 'folder_id', 'Folder', 'select', $folderID, $folders );
-        } else {
-            $folderSelect = '';
-        }
-        Components::set( 'folderSelect', $folderSelect );
-        if ( ! Input::exists() ) {
-            return Views::view( 'bookmarks.folders.create' );
-        }
-        if ( ! Forms::check( 'createFolder' ) ) {
-            Issues::add( 'error', [ 'There was an error creating your folder.' => Check::userErrors() ] );
-            return Views::view( 'bookmarks.folders.create' );
-        }
-        $folder = self::$folders->create( Input::post('title'), $folderID, Input::post('description'), Input::post('color'), Input::post('privacy') );
-        if ( ! $folder ) {
-            return Views::view( 'bookmarks.folders.create' );
-        }
-        Session::flash( 'success', 'Your Folder has been created.' );
-        Redirect::to( 'bookmarks/folders' );
-    }
-
-    public function editFolder( $id = null ) {
-        $folder = self::$folders->findById( $id );
-
-        if ( $folder == false ) {
-            Issues::add( 'error', 'Folder not found.' );
-            return $this->index();
-        }
-
-        if ( $folder->createdBy != App::$activeUser->ID ) {
-            Issues::add( 'error', 'You do not have permission to modify this folder.' );
-            return $this->index();
-        }
-        $folderID = ( false === Input::exists('folder_id') ) ? $folder->ID : Input::post('folder_id');
-
-        $folderSelect = HoudiniForms::getFormFieldHtml( 'folder_id', 'Folder', 'select', $folderID, self::$folders->simpleByUser() );
-        Components::set( 'folderSelect', $folderSelect );
-        Components::set( 'color', $folder->color );
-
-        if ( ! Input::exists( 'submit' ) ) {
-            return Views::view( 'bookmarks.folders.edit', $folder );
-        }
-
-        if ( !Forms::check( 'editFolder' ) ) {
-            Issues::add( 'error', [ 'There was an error editing your folder.' => Check::userErrors() ] );
-            return Views::view( 'bookmarks.folders.edit', $folder );
-        }
-
-        $result = self::$folders->update( $id, Input::post('title'), $folderID, Input::post('description'), Input::post('color'), Input::post('privacy') );
-        if ( !$result ) {
-            Issues::add( 'error', [ 'There was an error updating your folder.' => Check::userErrors() ] );
-            return Views::view( 'bookmarks.folders.edit', $folder );
-        }
-        Session::flash( 'success', 'Your Folder has been updated.' );
-        Redirect::to( 'bookmarks/folders/'. $folder->ID );
-    }
-
-    public function deleteFolder( $id = null ) {
-        $folder = self::$folders->findById( $id );
-        if ( $folder == false ) {
-            Issues::add( 'error', 'Folder not found.' );
-            return $this->index();
-        }
-        if ( $folder->createdBy != App::$activeUser->ID ) {
-            Issues::add( 'error', 'You do not have permission to modify this folder.' );
-            return $this->index();
-        }
-        $results = self::$bookmarks->deleteByFolder( $id );
-        $result = self::$folders->delete( $id );
-        if ( !$result ) {
-            Session::flash( 'error', 'There was an error deleting the folder(s)' );
-        } else {
-            Session::flash( 'success', 'Folder deleted' );
-        }
-        Redirect::to( 'bookmarks/folders' );
-    }
-
-    /**
-     * Functionality
-     */
-    public function hideBookmark( $id = null ) {
-        $bookmark = self::$bookmarks->findById( $id );
-        if ( $bookmark == false ) {
-            Session::flash( 'error', 'Bookmark not found.' );
-            return Redirect::to( 'bookmarks/index' );
-        }
-        if ( $bookmark->createdBy != App::$activeUser->ID ) {
-            Session::flash( 'error', 'You do not have permission to modify this bookmark.' );
-            return Redirect::to( 'bookmarks/index' );
-        }
-        self::$bookmarks->hide( $id );
-        Session::flash( 'success', 'Bookmark hidden.' );
-        return Redirect::to( 'bookmarks/index' );
-    }
-
-    public function archiveBookmark( $id = null ) {
-        $bookmark = self::$bookmarks->findById( $id );
-        if ( $bookmark == false ) {
-            Session::flash( 'error', 'Bookmark not found.' );
-            return Redirect::to( 'bookmarks/index' );
-        }
-        if ( $bookmark->createdBy != App::$activeUser->ID ) {
-            Session::flash( 'error', 'You do not have permission to modify this bookmark.' );
-            return Redirect::to( 'bookmarks/index' );
-        }
-        self::$bookmarks->archive( $id );
-        Session::flash( 'success', 'Bookmark archived.' );
-        return Redirect::to( 'bookmarks/index' );
-    }
-
-    public function showBookmark( $id = null ) {
-        $bookmark = self::$bookmarks->findById( $id );
-        if ( $bookmark == false ) {
-            Session::flash( 'error', 'Bookmark not found.' );
-            return Redirect::to( 'bookmarks/index' );
-        }
-        if ( $bookmark->createdBy != App::$activeUser->ID ) {
-            Session::flash( 'error', 'You do not have permission to modify this bookmark.' );
-            return Redirect::to( 'bookmarks/index' );
-        }
-        self::$bookmarks->show( $id );
-        Session::flash( 'success', 'Bookmark shown.' );
-        return Redirect::to( 'bookmarks/index' );
-    }
-
-    public function unarchiveBookmark( $id = null ) {
-        $bookmark = self::$bookmarks->findById( $id );
-        if ( $bookmark == false ) {
-            Session::flash( 'error', 'Bookmark not found.' );
-            return Redirect::to( 'bookmarks/index' );
-        }
-        if ( $bookmark->createdBy != App::$activeUser->ID ) {
-            Session::flash( 'error', 'You do not have permission to modify this bookmark.' );
-            return Redirect::to( 'bookmarks/index' );
-        }
-        self::$bookmarks->unarchive( $id );
-        Session::flash( 'success', 'Bookmark un-archived.' );
-        return Redirect::to( 'bookmarks/index' );
-    }
-
-    public function refreshBookmark( $id = null ) {
-        $bookmark = self::$bookmarks->findById( $id );
-        if ( $bookmark == false ) {
-            Session::flash( 'error', 'Bookmark not found.' );
-            return Redirect::to( 'bookmarks/index' );
-        }
-        if ( $bookmark->createdBy != App::$activeUser->ID ) {
-            Session::flash( 'error', 'You do not have permission to modify this bookmark.' );
-            return Redirect::to( 'bookmarks/index' );
-        }
-        $info = self::$bookmarks->refreshInfo( $id );
-        if ( false == $info ) {
-            Session::flash( 'error', 'Issue refreshing your bookmark.' );
-            return Redirect::to( 'bookmarks/bookmark/' . $bookmark->ID );
-        }
-        Session::flash( 'success', 'Bookmark data refreshed.' );
-        return Redirect::to( 'bookmarks/bookmark/' . $bookmark->ID );
-    }
-}

app/plugins/bookmarks/forms.php

@@ -1,122 +0,0 @@
-<?php
-/**
- * app/plugins/bookmarks/forms.php
- *
- * This houses all of the form checking functions for this plugin.
- *
- * @package TP Bookmarks
- * @version 3.0
- * @author  Joey Kimsey <Joey@thetempusproject.com>
- * @link    https://TheTempusProject.com
- * @license https://opensource.org/licenses/MIT [MIT LICENSE]
- */
-namespace TheTempusProject\Plugins\Bookmarks;
-
-use TheTempusProject\Bedrock\Functions\Input;
-use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Classes\Forms;
-
-class BookmarksForms extends Forms {
-    /**
-     * Adds these functions to the form list.
-     */
-    public function __construct() {
-        self::addHandler( 'createBookmark', __CLASS__, 'createBookmark' );
-        self::addHandler( 'createFolder', __CLASS__, 'createFolder' );
-        self::addHandler( 'editBookmark', __CLASS__, 'editBookmark' );
-        self::addHandler( 'editFolder', __CLASS__, 'editFolder' );
-    }
-
-    public static function createBookmark() {
-        // if ( ! Input::exists( 'title' ) ) {
-        //     Check::addUserError( 'You must include a title.' );
-        //     return false;
-        // }
-        if ( ! Input::exists( 'url' ) ) {
-            Check::addUserError( 'You must include a url.' );
-            return false;
-        }
-        // if ( ! Input::exists( 'color' ) ) {
-        //     Check::addUserError( 'You must include a color.' );
-        //     return false;
-        // }
-        // if ( ! Input::exists( 'privacy' ) ) {
-        //     Check::addUserError( 'You must include a privacy.' );
-        //     return false;
-        // }
-        // if ( !self::token() ) {
-        //     Check::addUserError( 'token - comment out later.' );
-        //     return false;
-        // }
-        return true;
-    }
-
-    public static function createFolder() {
-        if ( ! Input::exists( 'title' ) ) {
-            Check::addUserError( 'You must include a title.' );
-            return false;
-        }
-        // if ( ! Input::exists( 'color' ) ) {
-        //     Check::addUserError( 'You must include a color.' );
-        //     return false;
-        // }
-        // if ( ! Input::exists( 'privacy' ) ) {
-        //     Check::addUserError( 'You must include a privacy.' );
-        //     return false;
-        // }
-        // if ( ! self::token() ) {
-        //     Check::addUserError( 'token - comment out later.' );
-        //     return false;
-        // }
-        return true;
-    }
-
-    public static function editBookmark() {
-        // if ( ! Input::exists( 'title' ) ) {
-        //     Check::addUserError( 'You must include a title.' );
-        //     return false;
-        // }
-        if ( ! Input::exists( 'url' ) ) {
-            Check::addUserError( 'You must include a url.' );
-            return false;
-        }
-        // if ( ! Input::exists( 'color' ) ) {
-        //     Check::addUserError( 'You must include a color.' );
-        //     return false;
-        // }
-        // if ( ! Input::exists( 'privacy' ) ) {
-        //     Check::addUserError( 'You must include a privacy.' );
-        //     return false;
-        // }
-        // if ( !self::token() ) {
-        //     Check::addUserError( 'token - comment out later.' );
-        //     return false;
-        // }
-        return true;
-    }
-
-    public static function editFolder() {
-        if ( ! Input::exists( 'submit' ) ) {
-            return false;
-        }
-        if ( ! Input::exists( 'title' ) ) {
-            Check::addUserError( 'You must include a title.' );
-            return false;
-        }
-        // if ( ! Input::exists( 'color' ) ) {
-        //     Check::addUserError( 'You must include a color.' );
-        //     return false;
-        // }
-        // if ( ! Input::exists( 'privacy' ) ) {
-        //     Check::addUserError( 'You must include a privacy.' );
-        //     return false;
-        // }
-        // if ( !self::token() ) {
-        //     Check::addUserError( 'token - comment out later.' );
-        //     return false;
-        // }
-        return true;
-    }
-}
-
-new BookmarksForms;

app/plugins/bookmarks/models/bookmarkViews.php

@@ -1,149 +0,0 @@
-<?php
-/**
- * app/plugins/bookmarks/models/bookmarkViews.php
- *
- * This class is used for the manipulation of the bookmark_views database table.
- *
- * @package TP Bookmarks
- * @version 3.0
- * @author  Joey Kimsey <Joey@thetempusproject.com>
- * @link    https://TheTempusProject.com
- * @license https://opensource.org/licenses/MIT [MIT LICENSE]
- */
-namespace TheTempusProject\Models;
-
-use TheTempusProject\Bedrock\Classes\Config;
-use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Canary as Debug;
-use TheTempusProject\Classes\DatabaseModel;
-use TheTempusProject\TheTempusProject as App;
-use TheTempusProject\Houdini\Classes\Filters;
-use TheTempusProject\Bedrock\Classes\CustomException;
-
-class BookmarkViews extends DatabaseModel {
-    public $tableName = 'bookmark_views';
-    public $databaseMatrix = [
-        [ 'title', 'varchar', '256' ],
-        [ 'description', 'text', '' ],
-        [ 'privacy', 'varchar', '48' ],
-
-
-
-
-
-
-
-
-
-        
-        [ 'createdBy', 'int', '11' ],
-        [ 'createdAt', 'int', '11' ],
-        [ 'updatedAt', 'int', '11' ],
-    ];
-
-    /**
-     * The model constructor.
-     */
-    public function __construct() {
-        parent::__construct();
-    }
-
-    public function create( $title, $description = '', $privacy = 'private' ) {
-        if ( ! Check::dataTitle( $title ) ) {
-            Debug::info( 'Views: illegal title.' );
-            return false;
-        }
-        $fields = [
-            'title' => $title,
-            'description' => $description,
-            'privacy' => $privacy,
-            'createdBy' => App::$activeUser->ID,
-            'createdAt' => time(),
-        ];
-        if ( ! self::$db->insert( $this->tableName, $fields ) ) {
-            new CustomException( 'viewCreate' );
-            Debug::error( "Views: not created " . var_export($fields,true) );
-            return false;
-        }
-        return self::$db->lastId();
-    }
-
-    public function update( $id, $title, $description = '', $privacy = 'private' ) {
-        if ( !Check::id( $id ) ) {
-            Debug::info( 'Views: illegal ID.' );
-            return false;
-        }
-        if ( !Check::dataTitle( $title ) ) {
-            Debug::info( 'Views: illegal title.' );
-            return false;
-        }
-        $fields = [
-            'title' => $title,
-            'description' => $description,
-            'privacy' => $privacy,
-        ];
-        if ( !self::$db->update( $this->tableName, $id, $fields ) ) {
-            new CustomException( 'viewUpdate' );
-            Debug::error( "Views: $id not updated: $fields" );
-            return false;
-        }
-        return true;
-    }
-
-    public function byUser( $limit = null ) {
-        $whereClause = ['createdBy', '=', App::$activeUser->ID];
-        if ( empty( $limit ) ) {
-            $views = self::$db->get( $this->tableName, $whereClause );
-        } else {
-            $views = self::$db->get( $this->tableName, $whereClause, 'ID', 'DESC', [0, $limit] );
-        }
-        if ( !$views->count() ) {
-            Debug::info( 'No Views found.' );
-            return false;
-        }
-        return $this->filter( $views->results() );
-    }
-
-    public function getName( $id ) {
-        $views = self::findById( $id );
-        if (false == $views) {
-            return 'unknown';
-        }
-        return $views->title;
-    }
-
-    public function simpleByUser() {
-        $whereClause = ['createdBy', '=', App::$activeUser->ID];
-        $views = self::$db->get( $this->tableName, $whereClause );
-        if ( !$views->count() ) {
-            Debug::warn( 'Could not find any Views' );
-            return false;
-        }
-
-        $views = $views->results();
-        $out = [];
-        foreach ( $views as $view ) {
-            $out[ $view->title ] = $view->ID;
-        }
-        return $out;
-    }
-
-    public function simpleObjectByUser() {
-        $whereClause = ['createdBy', '=', App::$activeUser->ID];
-        $views = self::$db->get( $this->tableName, $whereClause );
-        if ( !$views->count() ) {
-            Debug::warn( 'Could not find any Views' );
-            return false;
-        }
-
-        $views = $views->results();
-        $out = [];
-        foreach ( $views as $view ) {
-            $obj = new \stdClass();
-            $obj->title = $view->title;
-            $obj->ID = $view->ID;
-            $out[] = $obj;
-        }
-        return $out;
-    }
-}

app/plugins/bookmarks/models/bookmarks.php

@@ -1,705 +0,0 @@
-<?php
-/**
- * app/plugins/bookmarks/models/bookmarks.php
- *
- * This class is used for the manipulation of the bookmarks database table.
- *
- * @package TP Bookmarks
- * @version 3.0
- * @author  Joey Kimsey <Joey@thetempusproject.com>
- * @link    https://TheTempusProject.com
- * @license https://opensource.org/licenses/MIT [MIT LICENSE]
- */
-namespace TheTempusProject\Models;
-
-use TheTempusProject\Bedrock\Classes\Config;
-use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Canary as Debug;
-use TheTempusProject\Classes\DatabaseModel;
-use TheTempusProject\TheTempusProject as App;
-use TheTempusProject\Houdini\Classes\Filters;
-use TheTempusProject\Bedrock\Classes\CustomException;
-
-class Bookmarks extends DatabaseModel {
-    public $tableName = 'bookmarks';
-    public $linkTypes = [
-        'Open in New Tab' => 'external',
-        'Open in Same Tab' => 'internal',
-    ];
-
-    public $databaseMatrix = [
-        [ 'title', 'varchar', '256' ],
-        [ 'url', 'text', '' ],
-        [ 'color', 'varchar', '48' ],
-        [ 'privacy', 'varchar', '48' ],
-        [ 'folderID', 'int', '11' ],
-        [ 'description', 'text', '' ],
-        [ 'createdBy', 'int', '11' ],
-        [ 'createdAt', 'int', '11' ],
-        [ 'meta', 'text', '' ],
-        [ 'icon', 'text', '' ],
-        [ 'archivedAt', 'int', '11' ],
-        [ 'refreshedAt', 'int', '11' ],
-        [ 'hiddenAt', 'int', '11' ],
-        [ 'order', 'int', '11' ],
-        [ 'linkType', 'varchar', '32' ],
-    ];
-
-    /**
-     * The model constructor.
-     */
-    public function __construct() {
-        parent::__construct();
-    }
-
-    public function create( $title, $url, $folderID = 0, $description = '', $color = 'default', $privacy = 'private', $type = 'external' ) {
-        $fields = [
-            'title' => $title,
-            'url' => $url,
-            'description' => $description,
-            'color' => $color,
-            'privacy' => $privacy,
-            'createdBy' => App::$activeUser->ID,
-            'createdAt' => time(),
-        ];
-        if ( !empty( $folderID ) ) {
-            $fields['folderID'] = $folderID;
-        } else {
-            $fields['folderID'] = null;
-        }
-        if ( ! self::$db->insert( $this->tableName, $fields ) ) {
-            new CustomException( 'bookmarkCreate' );
-            Debug::error( "Bookmarks: not created " . var_export($fields,true) );
-            return false;
-        }
-        return self::$db->lastId();
-    }
-
-    public function update( $id, $title, $url, $folderID = 0, $description = '', $color = 'default', $privacy = 'private', $type = 'external', $order = 0 ) {
-        if ( !Check::id( $id ) ) {
-            Debug::info( 'Bookmarks: illegal ID.' );
-            return false;
-        }
-        $fields = [
-            'title' => $title,
-            'url' => $url,
-            'description' => $description,
-            'color' => $color,
-            'privacy' => $privacy,
-            // 'linkType' => $type,
-            // 'order' => $order,
-        ];
-        if ( !empty( $folderID ) ) {
-            $fields['folderID'] = $folderID;
-        }
-        if ( !self::$db->update( $this->tableName, $id, $fields ) ) {
-            new CustomException( 'bookmarkUpdate' );
-            Debug::error( "Bookmarks: $id not updated" );
-            return false;
-        }
-        return true;
-    }
-
-    public function byUser( $limit = null ) {
-        $whereClause = ['createdBy', '=', App::$activeUser->ID];
-        if ( empty( $limit ) ) {
-            $bookmarks = self::$db->get( $this->tableName, $whereClause );
-        } else {
-            $bookmarks = self::$db->get( $this->tableName, $whereClause, 'ID', 'DESC', [0, $limit] );
-        }
-        if ( !$bookmarks->count() ) {
-            Debug::info( 'No Bookmarks found.' );
-            return false;
-        }
-        return $this->filter( $bookmarks->results() );
-    }
-
-    public function byFolder( $id, $limit = null ) {
-        $whereClause = ['createdBy', '=', App::$activeUser->ID, 'AND'];
-        
-        $whereClause = array_merge( $whereClause, [ 'folderID', '=', $id ] );
-        if ( empty( $limit ) ) {
-            $bookmarks = self::$db->get( $this->tableName, $whereClause );
-        } else {
-            $bookmarks = self::$db->get( $this->tableName, $whereClause, 'ID', 'DESC', [0, $limit] );
-        }
-        if ( !$bookmarks->count() ) {
-            Debug::info( 'No Bookmarks found.' );
-            return false;
-        }
-        return $this->filter( $bookmarks->results() );
-    }
-
-    public function noFolder( $id = 0, $limit = 10 ) {
-        $whereClause = ['createdBy', '=', App::$activeUser->ID, 'AND'];
-        if ( !empty( $id ) ) {
-            $whereClause = array_merge( $whereClause, ['folderID', '!=', $id] );
-        } else {
-            $whereClause = array_merge( $whereClause, [ 'folderID', 'IS', null] );
-        }
-        if ( empty( $limit ) ) {
-            $bookmarks = self::$db->get( $this->tableName, $whereClause );
-        } else {
-            $bookmarks = self::$db->get( $this->tableName, $whereClause, 'ID', 'DESC', [ 0, $limit ] );
-        }
-        if ( !$bookmarks->count() ) {
-            Debug::info( 'No Bookmarks found.' );
-            return false;
-        }
-        return $this->filter( $bookmarks->results() );
-    }
-
-    public function getName( $id ) {
-        $bookmarks = self::findById( $id );
-        if (false == $bookmarks) {
-            return 'unknown';
-        }
-        return $bookmarks->title;
-    }
-
-    public function getColor( $id ) {
-        $bookmarks = self::findById( $id );
-        if (false == $bookmarks) {
-            return 'default';
-        }
-        return $bookmarks->color;
-    }
-
-    public function simpleByUser() {
-        $whereClause = ['createdBy', '=', App::$activeUser->ID];
-        $bookmarks = self::$db->get( $this->tableName, $whereClause );
-        if ( !$bookmarks->count() ) {
-            Debug::warn( 'Could not find any bookmarks' );
-            return false;
-        }
-        
-        $bookmarks = $bookmarks->results();
-        $out = [];
-        foreach ( $bookmarks as $bookmarks ) {
-            $out[ $bookmarks->title ] = $bookmarks->ID;
-        }
-        return $out;
-    }
-
-    public function simpleObjectByUser() {
-        $whereClause = ['createdBy', '=', App::$activeUser->ID];
-        $bookmarks = self::$db->get( $this->tableName, $whereClause );
-        if ( !$bookmarks->count() ) {
-            Debug::warn( 'Could not find any bookmarks' );
-            return false;
-        }
-        
-        $bookmarks = $bookmarks->results();
-        $out = [];
-        foreach ( $bookmarks as $bookmarks ) {
-            $obj = new \stdClass();
-            $obj->title = $bookmarks->title;
-            $obj->ID = $bookmarks->ID;
-            $out[] = $obj;
-        }
-        return $out;
-    }
-
-    public function deleteByFolder( $folderID ) {
-        $whereClause = [ 'createdBy', '=', App::$activeUser->ID, 'AND' ];
-        $whereClause = array_merge( $whereClause, [ 'folderID', '=', $folderID ] );
-        $bookmarks = self::$db->get( $this->tableName, $whereClause );
-        if ( ! $bookmarks->count() ) {
-            Debug::info( 'No ' . $this->tableName . ' data found.' );
-            return [];
-        }
-        foreach( $bookmarks->results() as $bookmark ) {
-            $this->delete( $bookmark->ID );
-        }
-        return true;
-    }
-
-    private function resolveShortenedUrl( $url ) {
-        $ch = curl_init($url);
-
-        // Set curl options
-        curl_setopt($ch, CURLOPT_NOBODY, true); // We don't need the body
-        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); // Follow redirects
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); // Return the response
-        curl_setopt($ch, CURLOPT_TIMEOUT, 30); // Set a timeout
-        // curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10); // Maybe sketchy?
-        // Maybe sketchy?
-        // curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false); // Disable SSL host verification
-        // curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); // Disable SSL peer verification
-        // curl_setopt($ch, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1_2);
-
-        // added to support the regex site
-        // curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
-
-        //  = 
-        // curl_setopt($ch, CURLOPT_SSL_CIPHER_LIST, 'AES256+EECDH:AES256+EDH' );
-
-
-
-
-        // Execute curl
-        $response = curl_exec( $ch );
-
-        // Check if there was an error
-        if ( curl_errno( $ch ) ) {
-            
-
-            // Get error details
-            $errorCode = curl_errno($ch);
-            $errorMessage = curl_error($ch);
-            // Log or display the error details
-            dv('cURL Error: ' . $errorMessage . ' (Error Code: ' . $errorCode . ')');
-
-            curl_close($ch);
-            // return $url; // Return the original URL if there was an error
-
-
-            $url = rtrim( $url, '/' );
-            $ch2 = curl_init($url);
-            curl_setopt($ch2, CURLOPT_NOBODY, true); // We don't need the body
-            curl_setopt($ch2, CURLOPT_FOLLOWLOCATION, true); // Follow redirects
-            curl_setopt($ch2, CURLOPT_RETURNTRANSFER, true); // Return the response
-            curl_setopt($ch2, CURLOPT_TIMEOUT, 5); // Set a timeout
-            curl_exec($ch2);
-            
-            if ( curl_errno( $ch2 ) ) {
-
-            }
-            curl_close( $ch );
-            return $url;
-        }
-
-        // Get the effective URL (the final destination after redirects)
-        $finalUrl = curl_getinfo( $ch, CURLINFO_EFFECTIVE_URL );
-        curl_close( $ch );
-
-        return $finalUrl;
-
-
-
-
-
-
-
-
-
-
-        // $headers = get_headers( $url, 1 );
-        $headers = @get_headers($url, 1);
-        if ( $headers === false ) {
-        }
-        if ( isset( $headers['Location'] ) ) {
-            if (is_array($headers['Location'])) {
-                return end($headers['Location']);
-            } else {
-                return $headers['Location'];
-            }
-        } else {
-            return $url;
-        }
-    }
-
-    public function filter( $data, $params = [] ) {
-        foreach ( $data as $instance ) {
-            if ( !is_object( $instance ) ) {
-                $instance = $data;
-                $end = true;
-            }
-            $base_url = $this->getBaseUrl( $instance->url );
-            
-            if ( empty( $instance->icon ) ) {
-                $instance->iconHtml = '<i class="glyphicon glyphicon-link"></i>';
-            } else {
-                if (strpos($instance->icon, 'http') !== false) {
-                    $instance->iconHtml = '<img src="' . $instance->icon  .'" />';
-                } else {
-                    $instance->iconHtml = '<img src="' . $base_url . ltrim( $instance->icon, '/' ) .'" />';
-                }
-            }
-            if ( empty( $instance->hiddenAt ) ) {
-                $instance->hideBtn = '
-                <a href="{ROOT_URL}bookmarks/hideBookmark/'.$instance->ID.'" class="btn btn-sm btn-warning" role="button">
-                    <i class="glyphicon glyphicon-eye-open"></i>
-                </a>';
-            } else {
-                $instance->hideBtn = '
-                <a href="{ROOT_URL}bookmarks/showBookmark/'.$instance->ID.'" class="btn btn-sm btn-default" role="button">
-                    <i class="glyphicon glyphicon-eye-open"></i>
-                </a>';
-            }
-            if ( empty( $instance->archivedAt ) ) {
-                $instance->archiveBtn = '
-                <a href="{ROOT_URL}bookmarks/archiveBookmark/'.$instance->ID.'" class="btn btn-sm btn-info" role="button">
-                    <i class="glyphicon glyphicon-briefcase"></i>
-                </a>';
-            } else {
-                $instance->archiveBtn = '
-                <a href="{ROOT_URL}bookmarks/unarchiveBookmark/'.$instance->ID.'" class="btn btn-sm btn-default" role="button">
-                    <i class="glyphicon glyphicon-briefcase"></i>
-                </a>';
-            }
-            if ( ! empty( $instance->refreshedAt ) && time() < ( $instance->refreshedAt + ( 60 * 10 ) ) ) {
-                $instance->refreshBtn = '
-                <a href="{ROOT_URL}bookmarks/refreshBookmark/'.$instance->ID.'" class="btn btn-sm btn-danger" role="button">
-                    <i class="glyphicon glyphicon-refresh"></i>
-                </a>';
-            } else {
-                $instance->refreshBtn = '
-                <a href="{ROOT_URL}bookmarks/refreshBookmark/'.$instance->ID.'" class="btn btn-sm btn-success" role="button">
-                    <i class="glyphicon glyphicon-refresh"></i>
-                </a>';
-            }
-
-            $out[] = $instance;
-            if ( !empty( $end ) ) {
-                $out = $out[0];
-                break;
-            }
-        }
-        return $out;
-    }
-
-    public function hide( $id ) {
-        if ( !Check::id( $id ) ) {
-            Debug::info( 'Bookmarks: illegal ID.' );
-            return false;
-        }
-        $fields = [
-            'hiddenAt' => time(),
-        ];
-        if ( !self::$db->update( $this->tableName, $id, $fields ) ) {
-            new CustomException( 'bookmarkUpdate' );
-            Debug::error( "Bookmarks: $id not updated" );
-            return false;
-        }
-        return true;
-    }
-
-    public function show( $id ) {
-        if ( !Check::id( $id ) ) {
-            Debug::info( 'Bookmarks: illegal ID.' );
-            return false;
-        }
-        $fields = [
-            'hiddenAt' => 0,
-        ];
-        if ( !self::$db->update( $this->tableName, $id, $fields ) ) {
-            new CustomException( 'bookmarkUpdate' );
-            Debug::error( "Bookmarks: $id not updated" );
-            return false;
-        }
-        return true;
-    }
-
-    public function archive( $id ) {
-        if ( !Check::id( $id ) ) {
-            Debug::info( 'Bookmarks: illegal ID.' );
-            return false;
-        }
-        $fields = [
-            'archivedAt' => time(),
-        ];
-        if ( !self::$db->update( $this->tableName, $id, $fields ) ) {
-            new CustomException( 'bookmarkUpdate' );
-            Debug::error( "Bookmarks: $id not updated" );
-            return false;
-        }
-        return true;
-    }
-
-    public function unarchive( $id ) {
-        if ( !Check::id( $id ) ) {
-            Debug::info( 'Bookmarks: illegal ID.' );
-            return false;
-        }
-        $fields = [
-            'archivedAt' => 0,
-        ];
-        if ( !self::$db->update( $this->tableName, $id, $fields ) ) {
-            new CustomException( 'bookmarkUpdate' );
-            Debug::error( "Bookmarks: $id not updated" );
-            return false;
-        }
-        return true;
-    }
-
-    public function extractMetaTags($htmlContent) {
-        $doc = new \DOMDocument();
-        @$doc->loadHTML($htmlContent);
-        $metaTags = [];
-        foreach ($doc->getElementsByTagName('meta') as $meta) {
-            $name = $meta->getAttribute('name') ?: $meta->getAttribute('property');
-            $content = $meta->getAttribute('content');
-            if ($name && $content) {
-                $metaTags[$name] = $content;
-            }
-        }
-        return $metaTags;
-    }
-
-    public function fetchUrlData($url) {
-        $ch = curl_init();
-
-        // Set cURL options
-        curl_setopt($ch, CURLOPT_URL, $url);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($ch, CURLOPT_HEADER, true); // Include headers in the output
-        curl_setopt($ch, CURLOPT_NOBODY, false); // Include the body in the output
-        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); // Follow redirects
-        curl_setopt($ch, CURLOPT_TIMEOUT, 30); // Set a timeout
-        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false); // Disable SSL host verification for testing
-        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); // Disable SSL peer verification for testing
-
-        // Execute cURL request
-        $response = curl_exec($ch);
-
-        // Check if there was an error
-        if (curl_errno($ch)) {
-            $errorMessage = curl_error($ch);
-            curl_close($ch);
-            throw new \Exception('cURL Error: ' . $errorMessage);
-        }
-
-        // Get HTTP status code
-        $httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-
-        // Separate headers and body
-        $headerSize = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
-        $headers = substr($response, 0, $headerSize);
-        $body = substr($response, $headerSize);
-
-        curl_close($ch);
-
-        // Parse headers into an associative array
-        $headerLines = explode("\r\n", trim($headers));
-        $headerArray = [];
-        foreach ($headerLines as $line) {
-            $parts = explode(': ', $line, 2);
-            if (count($parts) == 2) {
-                $headerArray[$parts[0]] = $parts[1];
-            }
-        }
-
-        return [
-            'http_code' => $httpCode,
-            'headers' => $headerArray,
-            'body' => $body,
-        ];
-    }
-
-    private function getMetaTagsAndFavicon( $url ) {
-        try {
-            // $url = 'https://runescape.wiki';
-            $data = $this->fetchUrlData($url);
-            
-            // iv($data);
-
-            // Get headers
-            $headers = $data['headers'];
-            iv($headers);
-
-            // Get meta tags
-            $metaTags = $this->extractMetaTags($data['body']);
-        } catch (Exception $e) {
-            dv( 'Error: ' . $e->getMessage());
-
-        }
-        $metaInfo = [
-            'url' => $url,
-            'title' => null,
-            'description' => null,
-            'image' => null,
-            'favicon' => null
-        ];
-        $ch = curl_init($url);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        $html = curl_exec($ch);
-        curl_close($ch);
-
-        if ($html === false) {
-            return null;
-        }
-
-        $meta = @get_meta_tags( $url );
-
-        $dom = new \DOMDocument('1.0', 'utf-8');
-        $dom->strictErrorChecking = false;
-        $dom->loadHTML($html, LIBXML_NOERROR);
-        $xml = simplexml_import_dom($dom);
-        $arr = $xml->xpath('//link[@rel="shortcut icon"]');
-        
-        // Get the title of the page
-        $titles = $dom->getElementsByTagName('title');
-        if ($titles->length > 0) {
-            $metaInfo['title'] = $titles->item(0)->nodeValue;
-        }
-        
-        // Get the meta tags
-        $metaTags = $dom->getElementsByTagName('meta');
-        $metadata = [];
-        foreach ($metaTags as $meta) {
-            $metadata[] = [
-                'name' => $meta->getAttribute('name'),
-                'property' => $meta->getAttribute('property'),
-                'content' => $meta->getAttribute('content')
-            ];
-            if ($meta->getAttribute('name') === 'description') {
-                $metaInfo['description'] = $meta->getAttribute('content');
-            }
-            if ($meta->getAttribute('itemprop') === 'image') {
-                $metaInfo['google_image'] = $meta->getAttribute('content');
-            }
-            if ($meta->getAttribute('property') === 'og:image') {
-                $metaInfo['image'] = $meta->getAttribute('content');
-            }
-        }
-        
-        // Get the link tags to find the favicon
-        $linkTags = $dom->getElementsByTagName('link');
-        $metadata['links'] = [];
-        foreach ($linkTags as $link) {
-            $metadata['links'][] = [ $link->getAttribute('rel') => $link->getAttribute('href') ];
-            if ( $link->getAttribute('rel') === 'icon' || $link->getAttribute('rel') === 'shortcut icon') {
-                $metaInfo['favicon'] = $link->getAttribute('href');
-                break;
-            }
-        }
-
-        $metaInfo['metadata'] = $metadata;
-        
-        return $metaInfo;
-    }
-
-    public function retrieveInfo( $url ) {
-        $finalDestination = $this->resolveShortenedUrl( $url );
-        $info = $this->getMetaTagsAndFavicon( $finalDestination );
-        $base_url = $this->getBaseUrl( $finalDestination );
-
-        if ( ! empty( $info['favicon'] ) ) {
-            echo 'favicon exists' . PHP_EOL;
-            if ( stripos( $info['favicon'], 'http' ) !== false) {
-                echo 'favicon is full url' . PHP_EOL;
-                $imageUrl = $info['favicon'];
-            } else {
-                echo 'favicon is not full url' . PHP_EOL;
-                $imageUrl = trim( $base_url, '/' ) . '/' .  ltrim( $info['favicon'], '/' );
-            }
-            if ( $this->isValidImageUrl( $imageUrl ) ) {
-                echo 'image is valid' . PHP_EOL;
-                $info['favicon'] = $imageUrl;
-            } else {
-                echo 'image is not valid' . PHP_EOL;
-                $base_info = $this->getMetaTagsAndFavicon( $base_url );
-                if ( ! empty( $base_info['favicon'] ) ) {
-                    echo 'parent favicon exists!';
-                    if ( stripos( $base_info['favicon'], 'http' ) !== false) {
-                        echo 'parent favicon is full url' . PHP_EOL;
-                        $imageUrl = $base_info['favicon'];
-                    } else {
-                        echo 'parent favicon is not full url' . PHP_EOL;
-                        $imageUrl = trim( $base_url, '/' ) . '/' .  ltrim( $base_info['favicon'], '/' );
-                    }
-                    if ( $this->isValidImageUrl( $imageUrl ) ) {
-                        echo 'parent favicon image is valid' . PHP_EOL;
-                        $info['favicon'] = $imageUrl;
-                    } else {
-                        echo 'parent favicon image is not valid' . PHP_EOL;
-                    }
-                }
-            }
-        } else {
-            echo 'favicon does not exist' . PHP_EOL;
-            $base_info = $this->getMetaTagsAndFavicon( $base_url );
-            if ( ! empty( $base_info['favicon'] ) ) {
-                echo 'parent favicon exists!' . PHP_EOL;
-                if ( stripos( $base_info['favicon'], 'http' ) !== false) {
-                    echo 'parent favicon is full url' . PHP_EOL;
-                    $imageUrl = $base_info['favicon'];
-                } else {
-                    echo 'parent favicon is not full url' . PHP_EOL;
-                    $imageUrl = trim( $base_url, '/' ) . '/' .  ltrim( $base_info['favicon'], '/' );
-                }
-                if ( $this->isValidImageUrl( $imageUrl ) ) {
-                    echo 'parent favicon image is valid' . PHP_EOL;
-                    $info['favicon'] = $imageUrl;
-                } else {
-                    echo 'parent favicon image is not valid' . PHP_EOL;
-                }
-            }
-        }
-
-        return $info;
-    }
-
-    public function refreshInfo( $id ) {
-        if ( !Check::id( $id ) ) {
-            Debug::info( 'Bookmarks: illegal ID.' );
-            return false;
-        }
-        $bookmark = self::findById( $id );
-        if ( $bookmark == false ) {
-            Debug::info( 'Bookmarks not found.' );
-            return false;
-        }
-        if ( $bookmark->createdBy != App::$activeUser->ID ) {
-            Debug::info( 'You do not have permission to modify this bookmark.' );
-            return false;
-        }
-        if ( time() < ( $bookmark->refreshedAt + ( 60 * 10 ) ) ) {
-            Debug::info( 'You may only fetch bookmarks once every 10 minutes.' );
-            return false;
-        }
-        
-        $info = $this->retrieveInfo( $bookmark->url );
-
-        $fields = [
-            // 'refreshedAt' => time(),
-        ];
-
-        if ( empty( $bookmark->title ) && ! empty( $info['title'] ) ) {
-            $fields['title'] = $info['title'];
-        }
-        if ( empty( $bookmark->description ) && ! empty( $info['description'] ) ) {
-            $fields['description'] = $info['description'];
-        }
-
-        if ( ( empty( $bookmark->icon ) || ! $this->isValidImageUrl( $bookmark->icon ) ) && ! empty( $info['favicon'] ) ) {
-            $fields['icon'] = $info['favicon'];
-        }
-        $fields['meta'] = json_encode( $info['metadata'] );
-        
-        if ( !self::$db->update( $this->tableName, $id, $fields ) ) {
-            new CustomException( 'bookmarkUpdate' );
-            Debug::error( "Bookmarks: $id not updated" );
-            return false;
-        }
-        return true;
-    }
-
-    private function getBaseUrl ($url ) {
-        $parsedUrl = parse_url($url);
-
-        if (isset($parsedUrl['scheme']) && isset($parsedUrl['host'])) {
-            return $parsedUrl['scheme'] . '://' . $parsedUrl['host'] . '/';
-        } else {
-            return null; // URL is not valid or cannot be parsed
-        }
-    }
-
-    function isValidImageUrl($url) {
-        $headers = @get_headers($url);
-        if ($headers && strpos($headers[0], '200') !== false) {
-            
-                        return true;
-            // Further check to ensure it's an image
-            foreach ($headers as $header) {
-                if (strpos(strtolower($header), 'content-type:') !== false) {
-                    if (strpos(strtolower($header), 'image/') !== false) {
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-}

app/plugins/bookmarks/models/folders.php

@@ -1,157 +0,0 @@
-<?php
-/**
- * app/plugins/bookmarks/models/folders.php
- *
- * This class is used for the manipulation of the folders database table.
- *
- * @package TP Bookmarks
- * @version 3.0
- * @author  Joey Kimsey <Joey@thetempusproject.com>
- * @link    https://TheTempusProject.com
- * @license https://opensource.org/licenses/MIT [MIT LICENSE]
- */
-namespace TheTempusProject\Models;
-
-use TheTempusProject\Bedrock\Classes\Config;
-use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Canary as Debug;
-use TheTempusProject\Classes\DatabaseModel;
-use TheTempusProject\TheTempusProject as App;
-use TheTempusProject\Houdini\Classes\Filters;
-use TheTempusProject\Bedrock\Classes\CustomException;
-
-class Folders extends DatabaseModel {
-    public $tableName = 'folders';
-    public $databaseMatrix = [
-        [ 'title', 'varchar', '256' ],
-        [ 'color', 'varchar', '48' ],
-        [ 'privacy', 'varchar', '48' ],
-        [ 'description', 'text', '' ],
-        [ 'folderID', 'int', '11' ],
-        [ 'createdBy', 'int', '11' ],
-        [ 'createdAt', 'int', '11' ],
-    ];
-
-    /**
-     * The model constructor.
-     */
-    public function __construct() {
-        parent::__construct();
-    }
-
-    public function create( $title, $folderID = 0, $description = '', $color = 'default', $privacy = 'private' ) {
-        if ( ! Check::dataTitle( $title ) ) {
-            Debug::info( 'Folders: illegal title.' );
-            return false;
-        }
-        $fields = [
-            'title' => $title,
-            'description' => $description,
-            'color' => $color,
-            'privacy' => $privacy,
-            'createdBy' => App::$activeUser->ID,
-            'createdAt' => time(),
-        ];
-        if ( !empty( $folderID ) ) {
-            $fields['folderID'] = $folderID;
-        }
-        if ( ! self::$db->insert( $this->tableName, $fields ) ) {
-            new CustomException( 'folderCreate' );
-            Debug::error( "Folders: not created " . var_export($fields,true) );
-            return false;
-        }
-        return self::$db->lastId();
-    }
-
-    public function update( $id, $title, $folderID = 0, $description = '', $color = 'default', $privacy = 'private' ) {
-        if ( !Check::id( $id ) ) {
-            Debug::info( 'Folders: illegal ID.' );
-            return false;
-        }
-        if ( !Check::dataTitle( $title ) ) {
-            Debug::info( 'Folders: illegal title.' );
-            return false;
-        }
-        $fields = [
-            'title' => $title,
-            'description' => $description,
-            'color' => $color,
-            'privacy' => $privacy,
-        ];
-        if ( !empty( $folderID ) ) {
-            $fields['folderID'] = $folderID;
-        }
-        if ( !self::$db->update( $this->tableName, $id, $fields ) ) {
-            new CustomException( 'folderUpdate' );
-            Debug::error( "Folders: $id not updated: $fields" );
-            return false;
-        }
-        return true;
-    }
-
-    public function byUser( $limit = null ) {
-        $whereClause = ['createdBy', '=', App::$activeUser->ID];
-        if ( empty( $limit ) ) {
-            $folders = self::$db->get( $this->tableName, $whereClause );
-        } else {
-            $folders = self::$db->get( $this->tableName, $whereClause, 'ID', 'DESC', [0, $limit] );
-        }
-        if ( !$folders->count() ) {
-            Debug::info( 'No Folders found.' );
-            return false;
-        }
-        return $this->filter( $folders->results() );
-    }
-
-    public function getName( $id ) {
-        $folder = self::findById( $id );
-        if (false == $folder) {
-            return 'unknown';
-        }
-        return $folder->title;
-    }
-
-    public function getColor( $id ) {
-        $folder = self::findById( $id );
-        if (false == $folder) {
-            return 'default';
-        }
-        return $folder->color;
-    }
-
-    public function simpleByUser() {
-        $whereClause = ['createdBy', '=', App::$activeUser->ID];
-        $folders = self::$db->get( $this->tableName, $whereClause );
-        if ( !$folders->count() ) {
-            Debug::warn( 'Could not find any folders' );
-            return false;
-        }
-        
-        $folders = $folders->results();
-        $out = [];
-        $out[ 'No Folder' ] = 0;
-        foreach ( $folders as $folder ) {
-            $out[ $folder->title ] = $folder->ID;
-        }
-        return $out;
-    }
-
-    public function simpleObjectByUser() {
-        $whereClause = ['createdBy', '=', App::$activeUser->ID];
-        $folders = self::$db->get( $this->tableName, $whereClause );
-        if ( !$folders->count() ) {
-            Debug::warn( 'Could not find any folders' );
-            return false;
-        }
-        
-        $folders = $folders->results();
-        $out = [];
-        foreach ( $folders as $folder ) {
-            $obj = new \stdClass();
-            $obj->title = $folder->title;
-            $obj->ID = $folder->ID;
-            $out[] = $obj;
-        }
-        return $out;
-    }
-}

app/plugins/bookmarks/plugin.php

@@ -1,62 +0,0 @@
-<?php
-/**
- * app/plugins/bookmarks/plugin.php
- *
- * This houses all of the main plugin info and functionality.
- *
- * @package TP Bookmarks
- * @version 3.0
- * @author  Joey Kimsey <Joey@thetempusproject.com>
- * @link    https://TheTempusProject.com
- * @license https://opensource.org/licenses/MIT [MIT LICENSE]
- */
-namespace TheTempusProject\Plugins;
-
-use TheTempusProject\Classes\Plugin;
-use TheTempusProject\Models\Events;
-use TheTempusProject\Models\Bookmarks as Bookmark;
-use TheTempusProject\Models\Folders;
-use TheTempusProject\Houdini\Classes\Components;
-use TheTempusProject\Houdini\Classes\Template;
-
-class Bookmarks extends Plugin {
-    public $pluginName = 'TP Bookmarks';
-    public $configName = 'bookmarks';
-    public $pluginAuthor = 'JoeyK';
-    public $pluginWebsite = 'https://TheTempusProject.com';
-    public $modelVersion = '1.0';
-    public $pluginVersion = '3.0';
-    public $pluginDescription = 'A simple plugin which adds a site wide bookmark system.';
-    public $permissionMatrix = [
-        'useBookmarks' => [
-            'pretty' => 'Can use the bookmarks feature',
-            'default' => false,
-        ],
-        'createEvents' => [
-            'pretty' => 'Can add events to bookmarks',
-            'default' => false,
-        ],
-    ];
-    public $main_links = [
-        [
-            'text' => 'Bookmarks',
-            'url' => '{ROOT_URL}bookmarks/index',
-            'filter' => 'loggedin',
-        ],
-    ];
-    public $configMatrix = [
-        'enabled' => [
-            'type' => 'radio',
-            'pretty' => 'Enable Bookmarks.',
-            'default' => true,
-        ],
-    ];
-    public $bookmarks;
-    public $folders;
-    
-    public function __construct( $load = false ) {
-        $this->bookmarks = new Bookmark;
-        $this->folders = new Folders;
-        parent::__construct( $load );
-    }
-}

app/plugins/bookmarks/views/bookmarks/create.html

@@ -1,45 +0,0 @@
-<legend>Create Bookmark</legend>
-{BookmarkBreadCrumbs}
-<form action="" method="post" class="form-horizontal">
-    <input type="hidden" name="token" value="{TOKEN}">
-    <div class="form-group">
-        <label for="title" class="col-lg-3 control-label">Title</label>
-        <div class="col-lg-3">
-            <input type="text" class="form-control" name="title" id="title">
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="url" class="col-lg-3 control-label">URL:</label>
-        <div class="col-lg-3">
-            <input type="text" class="form-control" name="url" id="url">
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="description" class="col-lg-3 control-label">Description:</label>
-        <div class="col-lg-3">
-            <textarea class="form-control" name="description" maxlength="2000" rows="10" cols="50" id="description"></textarea>
-        </div>
-    </div>
-    {folderSelect}
-    <div class="form-group">
-        <label for="privacy" class="col-lg-3 control-label">Privacy</label>
-        <div class="col-lg-3 select-container" id="colorContainer">
-            <select id="privacy" name="privacy" class="form-control custom-select">
-                <option value="private">Private</option>
-                <option value="public">Public</option>
-            </select>
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="color" class="col-lg-3 control-label">Color</label>
-        <div class="col-lg-3 select-container" id="colorContainer">
-            {colorSelect}
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="submit" class="col-lg-3 control-label"></label>
-        <div class="col-lg-3">
-            <button name="submit" value="submit" type="submit" class="btn btn-lg btn-primary center-block ">Submit</button>
-        </div>
-    </div>
-</form>

app/plugins/bookmarks/views/bookmarks/edit.html

@@ -1,45 +0,0 @@
-<legend>Edit Bookmark</legend>
-{BookmarkBreadCrumbs}
-<form action="" method="post" class="form-horizontal">
-    <input type="hidden" name="token" value="{TOKEN}">
-    <div class="form-group">
-        <label for="title" class="col-lg-3 control-label">Title</label>
-        <div class="col-lg-3">
-            <input type="text" class="form-control" name="title" id="title" value="{title}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="url" class="col-lg-3 control-label">URL:</label>
-        <div class="col-lg-3">
-            <input type="text" class="form-control" name="url" id="url" value="{url}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="description" class="col-lg-3 control-label">Description:</label>
-        <div class="col-lg-3">
-            <textarea class="form-control" name="description" maxlength="2000" rows="10" cols="50" id="description">{description}</textarea>
-        </div>
-    </div>
-    {folderSelect}
-    <div class="form-group">
-        <label for="privacy" class="col-lg-3 control-label">Privacy</label>
-        <div class="col-lg-3 select-container" id="colorContainer">
-            <select id="privacy" name="privacy" class="form-control custom-select" value="{privacy}">
-                <option value="private">Private</option>
-                <option value="public">Public</option>
-            </select>
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="color" class="col-lg-3 control-label">Color</label>
-        <div class="col-lg-3 select-container" id="colorContainer">
-            {colorSelect}
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="submit" class="col-lg-3 control-label"></label>
-        <div class="col-lg-3">
-            <button name="submit" value="submit" type="submit" class="btn btn-lg btn-primary center-block ">Submit</button>
-        </div>
-    </div>
-</form>

app/plugins/bookmarks/views/bookmarks/list.html

@@ -1,37 +0,0 @@
-{BookmarkBreadCrumbs}
-<table class="table table-striped">
-    <thead>
-        <tr>
-            <th style="width: 75%">Bookmark</th>
-            <th style="width: 10%"></th>
-            <th style="width: 5%"></th>
-            <th style="width: 5%"></th>
-            <th style="width: 5%"></th>
-        </tr>
-    </thead>
-    <tbody>
-        {LOOP}
-        <tr>
-            <td style="text-align: center;">
-                <a href="{url}" role="button">
-                    {title}
-                </a>
-            </td>
-            <td style="text-align: center;">
-                    {privacy}
-            </td>
-            <td><a href="{ROOT_URL}bookmarks/bookmarks/{ID}" class="btn btn-sm btn-primary" role="button"><i class="glyphicon glyphicon-open"></i></a></td>
-            <td><a href="{ROOT_URL}bookmarks/editBookmark/{ID}" class="btn btn-sm btn-warning" role="button"><i class="glyphicon glyphicon-edit"></i></a></td>
-            <td><a href="{ROOT_URL}bookmarks/deleteBookmark/{ID}" class="btn btn-sm btn-danger" role="button"><i class="glyphicon glyphicon-trash"></i></a></td>
-        </tr>
-        {/LOOP}
-        {ALT}
-        <tr>
-            <td style="text-align: center;" colspan="6">
-                No results to show.
-            </td>
-        </tr>
-        {/ALT}
-    </tbody>
-</table>
-<a href="{ROOT_URL}bookmarks/createBookmark" class="btn btn-sm btn-primary" role="button">Create</a>

app/plugins/bookmarks/views/bookmarks/view.html

@@ -1,84 +0,0 @@
-{BookmarkBreadCrumbs}<br />
-<div class="container col-md-4 col-lg-4">
-	<div class="row">
-        <div class="panel panel-{color}">
-            <div class="panel-heading">
-                <h3 class="panel-title">Bookmark</h3>
-            </div>
-            <div class="panel-body">
-                <div class="row">
-                    <div class=""> 
-                        <table class="table table-user-primary">
-                            <tbody>
-                                <tr>
-                                    <td align="left" width="200"><b>Title</b></td>
-                                    <td align="right">{title}</td>
-                                </tr>
-                                <tr>
-                                    <td align="left" width="200"><b>URL</b></td>
-                                    <td align="right">{url}</td>
-                                </tr>
-                                <tr>
-                                    <td align="left" width="200"><b>Type</b></td>
-                                    <td align="right">{linkType}</td>
-                                </tr>
-                                <tr>
-                                    <td align="left" width="200"><b>Privacy</b></td>
-                                    <td align="right">{privacy}</td>
-                                </tr>
-                                <tr>
-                                    <td align="left" width="200"><b>Color</b></td>
-                                    <td align="right">{color}</td>
-                                </tr>
-                                <tr>
-                                    <td align="center" colspan="2"><b>Description</b></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2">{description}</td>
-                                </tr>
-                                <tr>
-                                    <td align="center" colspan="2"><b>Icon</b></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2">{iconHtml}</td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2">{icon}</td>
-                                </tr>
-                                <tr>
-                                    <td align="center" colspan="2"><b>Meta</b></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2">{meta}</td>
-                                </tr>
-                                <tr>
-                                    <td><b>Created</b></td>
-                                    <td align="right">{DTC}{createdAt}{/DTC}</td>
-                                </tr>
-                                <tr>
-                                    <td><b>Archived</b></td>
-                                    <td align="right">{DTC}{archivedAt}{/DTC}</td>
-                                </tr>
-                                <tr>
-                                    <td><b>Hidden</b></td>
-                                    <td align="right">{DTC}{hiddenAt}{/DTC}</td>
-                                </tr>
-                                <tr>
-                                    <td><b>Last Refreshed</b></td>
-                                    <td align="right">{DTC}{refreshedAt}{/DTC}</td>
-                                </tr>
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            </div>
-            <div class="panel-footer">
-                {refreshBtn}
-                {hideBtn}
-                {archiveBtn}
-                <a href="{ROOT_URL}bookmarks/editBookmark/{ID}" class="btn btn-sm btn-warning" role="button"><i class="glyphicon glyphicon-edit"></i></a>
-                <a href="{ROOT_URL}bookmarks/deleteBookmark/{ID}" class="btn btn-sm btn-danger" role="button"><i class="glyphicon glyphicon-trash"></i></a>
-            </div>
-        </div>
-	</div>
-</div>

app/plugins/bookmarks/views/components/bookmarkListPanel.html

@@ -1,21 +0,0 @@
-<div class="panel panel-{color}">
-    <div class="panel-heading" data-target="#Collapse{ID}" data-toggle="collapse" aria-expanded="true" aria-controls="#Collapse{ID}">
-        {title}
-    </div>
-    <div id="Collapse{ID}" class="panel-collapse collapse in" style="width:100%; position: relative;" role="tabpanel" aria-expanded="true">
-        <div class="panel-body">
-            <ul class="list-group">
-                {bookmarkListRows}
-            </ul>
-        </div>
-        <div class="panel-footer">
-            <a href="{ROOT_URL}bookmarks/createBookmark/{ID}" class="btn btn-sm btn-success" role="button"><i class="glyphicon glyphicon-plus-sign"></i></a></td>
-            <span class="pull-right">
-                <a href="{ROOT_URL}bookmarks/bookmarks/{ID}" class="btn btn-sm btn-primary" role="button"><i class="glyphicon glyphicon-th-list"></i></a>
-                <a href="{ROOT_URL}bookmarks/folders/{ID}" class="btn btn-sm btn-primary" role="button"><i class="glyphicon glyphicon-info-sign"></i></a></td>
-                <a href="{ROOT_URL}bookmarks/editFolder/{ID}" class="btn btn-sm btn-warning" role="button"><i class="glyphicon glyphicon-edit"></i></a></td>
-                <a href="{ROOT_URL}bookmarks/deleteFolder/{ID}" class="btn btn-sm btn-danger" role="button"><i class="glyphicon glyphicon-trash"></i></a></td>
-            </span>
-        </div>
-    </div>
-</div>

app/plugins/bookmarks/views/components/bookmarkListRows.html

@@ -1,18 +0,0 @@
-
-{LOOP}
-<li class="list-group-item list-group-item-{color}">
-    <a href="{ROOT_URL}bookmarks/bookmarks/{ID}" class="btn btn-sm" role="button">{iconHtml}</a>
-    <a href="{url}" class="list-group"> {title}</a>
-    <span class="pull-right">
-        {hideBtn}
-        {archiveBtn}
-        <a href="{ROOT_URL}bookmarks/editBookmark/{ID}" class="btn btn-sm btn-warning" role="button"><i class="glyphicon glyphicon-edit"></i></a>
-        <a href="{ROOT_URL}bookmarks/deleteBookmark/{ID}" class="btn btn-sm btn-danger" role="button"><i class="glyphicon glyphicon-trash"></i></a>
-    </span>
-</li>
-{/LOOP}
-{ALT}
-<li class="list-group-item">
-    <a href="#" class="list-group">No Bookmarks</a>
-</li>
-{/ALT}

app/plugins/bookmarks/views/components/folderPanelList.html

@@ -1,10 +0,0 @@
-{LOOP}
-<div class="col-xlg-6 col-lg-6 col-md-6 col-sm-6 col-xs-6">
-    {panel}
-</div>
-{/LOOP}
-{ALT}
-<div class="col-xlg-6 col-lg-6 col-md-6 col-sm-6 col-xs-6">
-    <p>no folders</p>
-</div>
-{/ALT}

app/plugins/bookmarks/views/dash.html

@@ -1,16 +0,0 @@
-
-{BookmarkBreadCrumbs}
-<div class="row">
-    <div class="col-xlg-6 col-lg-6 col-md-6 col-sm-6 col-xs-6">
-        <legend>Unsorted Bookmarks</legend>
-        {bookmarksList}
-    </div>
-    <div class="col-xlg-6 col-lg-6 col-md-6 col-sm-6 col-xs-6">
-        <legend>Folders List</legend>
-        {foldersList}
-    </div>
-</div>
-<legend>Folders</legend>
-<div class="row">
-    {folderPanels}
-</div>

app/plugins/bookmarks/views/folders/create.html

@@ -1,39 +0,0 @@
-<legend>Create Folder</legend>
-{BookmarkBreadCrumbs}
-<form action="" method="post" class="form-horizontal">
-    <input type="hidden" name="token" value="{TOKEN}">
-    <div class="form-group">
-        <label for="title" class="col-lg-3 control-label">Title</label>
-        <div class="col-lg-3">
-            <input type="text" class="form-control" name="title" id="title">
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="description" class="col-lg-3 control-label">Description:</label>
-        <div class="col-lg-3">
-            <textarea class="form-control" name="description" maxlength="2000" rows="10" cols="50" id="description"></textarea>
-        </div>
-    </div>
-    {folderSelect}
-    <div class="form-group">
-        <label for="privacy" class="col-lg-3 control-label">Privacy</label>
-        <div class="col-lg-3 select-container" id="colorContainer">
-            <select id="privacy" name="privacy" class="form-control custom-select">
-                <option value="private">Private</option>
-                <option value="public">Public</option>
-            </select>
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="color" class="col-lg-3 control-label">Color</label>
-        <div class="col-lg-3 select-container" id="colorContainer">
-            {colorSelect}
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="submit" class="col-lg-3 control-label"></label>
-        <div class="col-lg-3">
-            <button name="submit" value="submit" type="submit" class="btn btn-lg btn-primary center-block ">Submit</button>
-        </div>
-    </div>
-</form>

app/plugins/bookmarks/views/folders/edit.html

@@ -1,39 +0,0 @@
-<legend>Edit Folder</legend>
-{BookmarkBreadCrumbs}
-<form action="" method="post" class="form-horizontal">
-    <input type="hidden" name="token" value="{TOKEN}">
-    <div class="form-group">
-        <label for="title" class="col-lg-3 control-label">Title</label>
-        <div class="col-lg-3">
-            <input type="text" class="form-control" name="title" id="title" value="{title}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="description" class="col-lg-3 control-label">Description:</label>
-        <div class="col-lg-3">
-            <textarea class="form-control" name="description" maxlength="2000" rows="10" cols="50" id="description">{description}</textarea>
-        </div>
-    </div>
-    {folderSelect}
-    <div class="form-group">
-        <label for="privacy" class="col-lg-3 control-label">Privacy</label>
-        <div class="col-lg-3 select-container" id="colorContainer">
-            <select id="privacy" name="privacy" class="form-control custom-select" value="{privacy}">
-                <option value="private">Private</option>
-                <option value="public">Public</option>
-            </select>
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="color" class="col-lg-3 control-label">Color</label>
-        <div class="col-lg-3 select-container" id="colorContainer">
-            {colorSelect}
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="submit" class="col-lg-3 control-label"></label>
-        <div class="col-lg-3">
-            <button name="submit" value="submit" type="submit" class="btn btn-lg btn-primary center-block ">Submit</button>
-        </div>
-    </div>
-</form>

app/plugins/bookmarks/views/folders/list.html

@@ -1,33 +0,0 @@
-{BookmarkBreadCrumbs}
-<table class="table table-striped">
-    <thead>
-        <tr>
-            <th style="width: 35%">Title</th>
-            <th style="width: 20%">Privacy</th>
-            <th style="width: 30%">Description</th>
-            <th style="width: 5%"></th>
-            <th style="width: 5%"></th>
-            <th style="width: 5%"></th>
-        </tr>
-    </thead>
-    <tbody>
-        {LOOP}
-        <tr>
-            <td align="center">{title}</td>
-            <td align="center">{privacy}</td>
-            <td>{description}</td>
-            <td><a href="{ROOT_URL}bookmarks/folders/{ID}" class="btn btn-sm btn-primary" role="button"><i class="glyphicon glyphicon-info-sign"></i></a></td>
-            <td><a href="{ROOT_URL}bookmarks/editFolder/{ID}" class="btn btn-sm btn-warning" role="button"><i class="glyphicon glyphicon-edit"></i></a></td>
-            <td><a href="{ROOT_URL}bookmarks/deleteFolder/{ID}" class="btn btn-sm btn-danger" role="button"><i class="glyphicon glyphicon-trash"></i></a></td>
-        </tr>
-        {/LOOP}
-        {ALT}
-        <tr>
-            <td align="center" colspan="7">
-                No results to show.
-            </td>
-        </tr>
-        {/ALT}
-    </tbody>
-</table>
-<a href="{ROOT_URL}bookmarks/createFolder" class="btn btn-sm btn-primary" role="button">Create</a>

app/plugins/bookmarks/views/folders/view.html

@@ -1,47 +0,0 @@
-{BookmarkBreadCrumbs}<br />
-<div class="container col-md-4 col-lg-4">
-	<div class="row">
-        <div class="panel panel-{color}">
-            <div class="panel-heading">
-                <h3 class="panel-title">Bookmark Folder</h3>
-            </div>
-            <div class="panel-body">
-                <div class="row">
-                    <div class=""> 
-                        <table class="table table-user-primary">
-                            <tbody>
-                                <tr>
-                                    <td align="left" width="200"><b>Title</b></td>
-                                    <td align="right">{title}</td>
-                                </tr>
-                                <tr>
-                                    <td align="left" width="200"><b>Privacy</b></td>
-                                    <td align="right">{privacy}</td>
-                                </tr>
-                                <tr>
-                                    <td align="left" width="200"><b>Color</b></td>
-                                    <td align="right">{color}</td>
-                                </tr>
-                                <tr>
-                                    <td align="center" colspan="2"><b>Description</b></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2">{description}</td>
-                                </tr>
-                                <tr>
-                                    <td><b>Created</b></td>
-                                    <td align="right">{DTC}{createdAt}{/DTC}</td>
-                                </tr>
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            </div>
-            <div class="panel-footer">
-                <a href="{ROOT_URL}bookmarks/bookmarks/{ID}" class="btn btn-sm btn-primary" role="button"><i class="glyphicon glyphicon-th-list"></i></a>
-                <a href="{ROOT_URL}bookmarks/editFolder/{ID}" class="btn btn-sm btn-warning" role="button"><i class="glyphicon glyphicon-edit"></i></a>
-                <a href="{ROOT_URL}bookmarks/deleteFolder/{ID}" class="btn btn-sm btn-danger" role="button"><i class="glyphicon glyphicon-trash"></i></a>
-            </div>
-        </div>
-	</div>
-</div>

app/plugins/bookmarks/views/nav/folderTabs.html

@@ -1,5 +0,0 @@
-<ul class="nav nav-tabs">
-    <li><a href="{ROOT_URL}bookmarks/index/">Dashboard</a></li>
-    <li><a href="{ROOT_URL}bookmarks/folders/">Folders</a></li>
-</ul>
-{userFolderTabs}

app/plugins/bookmarks/views/nav/userFolderTabs.html

@@ -1,9 +0,0 @@
-<ul class="nav nav-tabs">
-    <li><a href="{ROOT_URL}bookmarks/folders/">All</a></li>
-    {LOOP}
-        <li><a href="{ROOT_URL}bookmarks/bookmarks/{ID}">{title}</a></li>
-    {/LOOP}
-    {ALT}
-        <li></li>
-    {/ALT}
-</ul>

app/plugins/bugreport/controllers/bugreport.php

@@ -41,7 +41,7 @@ class Bugreport extends Controller {
             return Views::view( 'bugreport.create' );
         }
         $result = self::$bugreport->create( App::$activeUser->ID, Input::post( 'url' ), Input::post( 'ourl' ), Input::post( 'repeat' ), Input::post( 'entry' ) );
-        if ( true === $result ) {
+        if ( false != $result ) {
             Session::flash( 'success', 'Your Bug Report has been received. We may contact you for more information at the email address you provided.' );
             Redirect::to( 'home/index' );
         } else {

app/plugins/bugreport/models/bugreport.php

@@ -13,9 +13,8 @@
 namespace TheTempusProject\Models;
 
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Bedrock\Classes\Config;
+use TheTempusProject\Canary\Bin\Canary as Debug;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Classes\CustomException;
-use TheTempusProject\Bedrock\Classes\CustomException;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\Plugins\Bugreport as Plugin;
 use TheTempusProject\TheTempusProject as App;

app/plugins/bugreport/plugin.php

@@ -49,10 +49,11 @@ class Bugreport extends Plugin {
             'default' => false,
         ],
     ];
-    public $footer_links = [
+    public $contact_footer_links = [
         [
-            'text' => 'Bug Report',
+            'text' => 'Report a Bug',
             'url' => '{ROOT_URL}bugreport',
+            'filter' => 'loggedin',
         ],
     ];
     public $admin_links = [

app/plugins/bugreport/views/admin/list.html

@@ -1,6 +1,8 @@
-<legend>Bug Reports</legend>
+<div class="context-main-bg context-main p-3">
-{PAGINATION}
+    <legend class="text-center">Bug Reports</legend>
-<form action="{ROOT_URL}admin/bugreport/delete" method="post">
+    <hr>
+    {ADMIN_BREADCRUMBS}
+	<form action="{ROOT_URL}admin/bugreport/delete" method="post">
 		<table class="table table-striped">
 			<thead>
 				<tr>
@@ -10,7 +12,7 @@
 					<th style="width: 5%"></th>
 					<th style="width: 5%"></th>
 					<th style="width: 5%">
-					<INPUT type="checkbox" onchange="checkAll(this)" name="check.br" value="BR_[]"/>
+						<input type="checkbox" onchange="checkAll(this)" name="check.br" value="BR_[]">
 					</th>
 				</tr>
 			</thead>
@@ -20,8 +22,8 @@
 					<td align="center">{ID}</td>
 					<td align="center">{DTC}{time}{/DTC}</td>
 					<td>{description}</td>
-				<td><a href="{ROOT_URL}admin/bugreport/view/{ID}" class="btn btn-sm btn-primary" role="button"><i class="glyphicon glyphicon-open"></i></a></td>
+					<td><a href="{ROOT_URL}admin/bugreport/view/{ID}" class="btn btn-sm btn-primary"><i class="fa fa-fw fa-upload"></i></a></td>
-                <td><a href="{ROOT_URL}admin/bugreport/delete/{ID}" class="btn btn-sm btn-danger" role="button"><i class="glyphicon glyphicon-trash"></i></a></td>
+					<td><a href="{ROOT_URL}admin/bugreport/delete/{ID}" class="btn btn-sm btn-danger"><i class="fa fa-fw fa-trash"></i></a></td>
 					<td>
 						<input type="checkbox" value="{ID}" name="BR_[]">
 					</td>
@@ -36,7 +38,8 @@
 				{/ALT}
 			</tbody>
 		</table>
-	<button name="submit" value="submit" type="submit" class="btn btn-sm btn-danger">Delete</button>
+		<button name="submit" value="submit" type="submit" class="btn btn-sm btn-danger"><i class="fa fa-fw fa-trash"></i></button>
-</form>
+	</form>
-<br />
+	<br>
-<a href="{ROOT_URL}admin/bugreport/clear">clear all</a>
+	<a href="{ROOT_URL}admin/bugreport/clear">clear all</a>
+</div>

app/plugins/bugreport/views/admin/view.html

@@ -1,45 +1,49 @@
-<div class="container">
+<div class="container py-4">
-	<div class="row">
+    <div class="row justify-content-center">
-		<div class="col-xs-12 col-sm-12 col-md-6 col-lg-6 col-xs-offset-0 col-sm-offset-0 col-md-offset-3 col-lg-offset-3 top-pad" >
+        <div class="col-md-8">
-			<div class="panel panel-primary">
+            {ADMIN_BREADCRUMBS}
-				<div class="panel-heading">
+            <div class="card shadow">
-					<h3 class="panel-title">Bug Report</h3>
+                <!-- Card Header -->
+                <div class="card-header text-center bg-dark text-white">
+                    <h3 class="card-title mb-0">Bug Report</h3>
                 </div>
-				<div class="panel-body">
+
-					<div class="row">
+                <!-- Card Body -->
-						<div class=" col-md-12 col-lg-12 "> 
+                <div class="card-body">
-							<table class="table table-user-primary">
+                    <div class="row align-items-center">
+                        <!-- Log Details -->
+                            <table class="table table-borderless">
                                 <tbody>
                                     <tr>
-										<td align="left" width="200"><b>ID</b></td>
+                                        <th scope="row">ID:</th>
-										<td align="right">{ID}</td>
+                                        <td>{ID}</td>
                                     </tr>
 									<tr>
-										<td><b>Time submitted</b></td>
+										<th scope="row">Time submitted</th>
-										<td align="right">{DTC}{time}{/DTC}</td>
+										<td>{DTC}{time}{/DTC}</td>
 									</tr>
 									<tr>
-										<td><b>Submitted by</b></td>
+										<th scope="row">URL:</th>
-										<td align="right"><a href="{ROOT_URL}admin/users/view/{userID}">{submittedBy}</a></td>
+										<td><a href="{URL}">{URL}</a></td>
 									</tr>
 									<tr>
-										<td><b>IP</b></td>
+										<th scope="row">Original URL</th>
-										<td align="right">{ip}</td>
+										<td><a href="{OURL}">{OURL}</a></td>
 									</tr>
 									<tr>
-										<td><b>URL:</b></td>
+										<th scope="row">Multiple occurrences?</th>
-										<td align="right"><a href="{URL}">{URL}</a></td>
+										<td>{repeatText}</td>
 									</tr>
                                     <tr>
-										<td><b>Original URL</b></td>
+                                        <th scope="row">IP:</th>
-										<td align="right"><a href="{OURL}">{OURL}</a></td>
+                                        <td>{ip}</td>
                                     </tr>
                                     <tr>
-										<td><b>Multiple occurrences?</b></td>
+                                        <th scope="row">User:</th>
-										<td align="right">{repeatText}</td>
+                                        <td><a href="{ROOT_URL}admin/users/view/{userID}">{submittedBy}</a></td>
                                     </tr>
 									<tr>
-										<td align="center" colspan="2"><b>Description</b></td>
+										<th scope="row" colspan="2">Description:</th>
 									</tr>
 									<tr>
 										<td colspan="2">{description}</td>
@@ -48,13 +52,14 @@
                             </table>
                     </div>
                 </div>
-				</div>
+
-				<div class="panel-footer">
+                <!-- Admin Controls -->
+                <div class="card-footer text-center">
 					{ADMIN}
 					<form action="{ROOT_URL}admin/bugreport/delete" method="post">
-						<INPUT type="hidden" name="BR_" value="{ID}"/>
+						<input type="hidden" name="BR_" value="{ID}">
-						<input type="hidden" name="token" value="{TOKEN}" />
+						<input type="hidden" name="token" value="{TOKEN}">
-						<button name="submit" value="submit" type="submit" class="btn btn-sm btn-danger"><i class="glyphicon glyphicon-remove"></i></button>
+						<button name="submit" value="submit" type="submit" class="btn btn-sm btn-danger"><i class="fa fa-fw fa-trash"></i></button>
 					</form>
 					{/ADMIN}
                 </div>

app/plugins/bugreport/views/create.html

@@ -1,36 +1,61 @@
-<legend>Bug Report</legend>
+<div class="m-2 m-lg-4">
-<p>Thank you for visiting Our bug reporting page. We value our users' input highly and in an effort to better serve your needs, please fill out the form below to help us address this issue.</p>
+    <div class="col-12 mx-5 col-sm-10 col-lg-8 mx-auto p-4 rounded shadow-sm context-main-bg">
-<p>We read each and every bug report submitted, and by submitting this form you allow us to send you a follow up email.</p>
+    <h2 class="text-center mb-4">Report a Bug</h2>
-<form action="" method="post" class="form-horizontal">
+    <hr>
-    <label for="url">Page you were trying to reach:</label>
+    <p class="text-center text-sm-start">
-    <input type="url" name="url" id="url" class="form-control" aria-describedby="urlHelp">
+        Thank you for visiting our bug reporting page. We value our users' input highly and in an effort to better serve your needs, please fill out the form below to help us address this issue.
-    <p id="urlHelp" class="form-text text-muted">
-        What is the URL of the page you actually received the error on? (The URL is the website address. Example: {ROOT_URL}home)
     </p>
-    <label for="ourl">Page you were on:</label>
+    <p class="text-center text-sm-start">
+        We read each and every bug report submitted, and by submitting this form you allow us to send you a follow-up email.
+    </p>
+    <form method="post">
+        <!-- Page URL -->
+        <div class="mb-3">
+            <label for="url" class="form-label">Page you were trying to reach:</label>
+            <input type="url" name="url" id="url" class="form-control" aria-describedby="urlHelp" required>
+            <small id="urlHelp" class="form-text text-muted">
+                This is the URL of the page you actually received the error.
+            </small>
+        </div>
+
+        <!-- Referrer URL -->
+        <div class="mb-3">
+            <label for="ourl" class="form-label">Page you were on:</label>
             <input type="url" name="ourl" id="ourl" class="form-control" aria-describedby="ourlHelp">
-    <p id="ourlHelp" class="form-text text-muted">
+            <small id="ourlHelp" class="form-text text-muted">
-        What is the URL of the page you were on before you received the error? (The URL is the website address. Example: {ROOT_URL}home/newhome)
+                This is the URL of the page you were on before you received the error.
-    </p>
+            </small>
-    <label for="repeat">*Has this happened more than once?</label>
+        </div>
+
+        <!-- Repeat Issue -->
+        <div class="mb-3">
+            <label class="form-label">*Has this happened more than once?</label>
             <div class="form-check">
-        <label class="form-check-label">
+                <input class="form-check-input" type="radio" name="repeat" id="repeatNo" value="false" checked>
-            <input class="form-check-input" type="radio" name="repeat" id="repeat" value="false" checked>
+                <label class="form-check-label" for="repeatNo">No</label>
-            No
-        </label>
             </div>
             <div class="form-check">
-        <label class="form-check-label">
+                <input class="form-check-input" type="radio" name="repeat" id="repeatYes" value="true">
-            <input class="form-check-input" type="radio" name="repeat" id="repeat" value="true">
+                <label class="form-check-label" for="repeatYes">Yes</label>
-            Yes
-        </label>
-    </div>
-    <div class="form-group">
-        <label for="entry" class="col-lg-3 control-label">Describe the problem/error as best as you can: (max:2000 characters)</label>
-        <div class="col-lg-6">
-            <textarea class="form-control" name="entry" maxlength="2000" rows="10" cols="50" id="entry"></textarea>
             </div>
         </div>
+
+        <!-- Description -->
+        <div class="mb-3">
+            <label for="entry" class="form-label">Describe the error you received: </label>
+            <textarea class="form-control" name="entry" id="entry" rows="6" maxlength="2000" aria-describedby="descHelp" required></textarea>
+            <small id="descHelp" class="form-text text-muted">
+                (max: 2000 characters)
+            </small>
+        </div>
+
+        <!-- Hidden Token -->
         <input type="hidden" name="token" value="{TOKEN}">
-    <button name="submit" value="submit" type="submit" class="btn btn-lg btn-primary center-block">Submit</button>
+
-</form>
+        <!-- Submit Button -->
+        <div class="text-center">
+            <button type="submit" name="submit" value="submit" class="btn btn-primary btn-lg">Submit</button>
+        </div>
+    </form>
+</div>
+</div>

app/plugins/bugtracker/config/constants.php

@@ -1,7 +0,0 @@
-<?php
-# bugTracker
-	define( 'TRACKER_STATUS_IN_PROGRESS', 'In Progress' );
-	define( 'TRACKER_STATUS_TESTING',     'Needs Testing' );
-	define( 'TRACKER_STATUS_NEW',         'New' );
-	define( 'TRACKER_STATUS_FIXED',       'Fixed' );
-	define( 'TRACKER_STATUS_CLOSED',      'Closed' );

app/plugins/bugtracker/controllers/admin/bugtracker.php

@@ -1,206 +0,0 @@
-<?php
-/**
- * app/plugins/bugtracker/controllers/admin/bugtracker.php
- *
- * This is the Bug-Tracker admin controller.
- *
- * @package TP BugTracker
- * @version 3.0
- * @author  Joey Kimsey <Joey@thetempusproject.com>
- * @link    https://TheTempusProject.com
- * @license https://opensource.org/licenses/MIT [MIT LICENSE]
- */
-namespace TheTempusProject\Controllers\Admin;
-
-use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Bedrock\Functions\Upload;
-use TheTempusProject\Bedrock\Functions\Input;
-use TheTempusProject\Houdini\Classes\Issues;
-use TheTempusProject\Houdini\Classes\Views;
-use TheTempusProject\Houdini\Classes\Navigation;
-use TheTempusProject\Houdini\Classes\Components;
-use TheTempusProject\Houdini\Classes\Forms as FormGen;
-use TheTempusProject\Classes\AdminController;
-use TheTempusProject\Classes\Forms;
-use TheTempusProject\Models\Bugtracker as BugtrackerModel;
-use TheTempusProject\TheTempusProject as App;
-use TheTempusProject\Models\Comments;
-
-class Bugtracker extends AdminController {
-    protected static $tracker;
-    protected static $comments;
-
-    public function __construct() {
-        parent::__construct();
-        self::$tracker = new BugtrackerModel;
-        self::$title = 'Admin - Bug-Tracker';
-        $view = Navigation::activePageSelect( 'nav.admin', '/admin/bugtracker' );
-        Components::set( 'ADMINNAV', $view );
-    }
-
-    public function index( $data = null ) {
-        Views::view( 'bugtracker.admin.list', self::$tracker->list() );
-    }
-
-    public function create( $data = null ) {
-        $form = '';
-        $form .= FormGen::getFormFieldHtml( 'title', 'Title', 'text', Input::post('title') );
-        $form .= FormGen::getFormFieldHtml( 'description', 'Description', 'block', Input::post('description') );
-        $form .= FormGen::getFormFieldHtml( 'bugImage', 'Screenshot', 'file', '' );
-        $form .= FormGen::getFormFieldHtml( 'url', 'URL (if possible)', 'text', '' );
-        $form .= FormGen::getFormFieldHtml( 'repeat', 'Has this happened more than once', 'radio' );
-        Components::set( 'TRACKER_FORM', $form );
-        if ( !Input::exists( 'submit' ) ) {
-            return Views::view( 'bugtracker.admin.create' );
-        }
-        if ( !Forms::check( 'newBugTracker' ) ) {
-            Issues::add( 'error', [ 'There was an error with your request.' => Check::userErrors() ] );
-            return Views::view( 'bugtracker.admin.create' );
-        }
-        $image = '';
-        if ( Input::exists( 'bugImage' ) ) {
-            $folder = IMAGE_UPLOAD_DIRECTORY . App::$activeUser->username . DIRECTORY_SEPARATOR;
-            if ( !Upload::image( 'bugImage', $folder ) ) {
-                Issues::add( 'error', [ 'There was an error with your upload.' => Check::systemErrors() ] );
-            } else {
-                $route = str_replace( APP_ROOT_DIRECTORY, '', $folder );
-                $image = $route . Upload::last();
-            }
-        }
-        $result = self::$tracker->create(
-            App::$activeUser->ID,
-            Input::post( 'url' ),
-            $image,
-            Input::post( 'repeat' ),
-            Input::post( 'description' ),
-            Input::post( 'title' ),
-        );
-        if ( $result ) {
-            Issues::add( 'success', 'Your tracker has been created.' );
-            return $this->index();
-        } else {
-            Issues::add( 'error', [ 'There was an unknown error submitting your data.' => Check::userErrors() ] );
-            return $this->index();
-        }
-    }
-
-    public function edit( $data = null ) {
-        if ( !Input::exists( 'submit' ) ) {
-            $bug = self::$tracker->findById( $data );
-            $statusList = [
-                TRACKER_STATUS_IN_PROGRESS => TRACKER_STATUS_IN_PROGRESS,
-                TRACKER_STATUS_TESTING => TRACKER_STATUS_TESTING,
-                TRACKER_STATUS_NEW => TRACKER_STATUS_NEW,
-                TRACKER_STATUS_FIXED => TRACKER_STATUS_FIXED,
-                TRACKER_STATUS_CLOSED => TRACKER_STATUS_CLOSED,
-            ];
-            $form = '';
-            $form .= FormGen::getFormFieldHtml( 'title', 'Title', 'text', $bug->title );
-            $form .= FormGen::getFormFieldHtml( 'description', 'Description', 'block', $bug->description );
-            $form .= FormGen::getFormFieldHtml( 'bugImage', 'Screenshot', 'file', $bug->image );
-            $form .= FormGen::getFormFieldHtml( 'url', 'Page you were on', 'text', $bug->url );
-            $form .= FormGen::getFormFieldHtml( 'repeat', 'Has this happened more than once', 'radio', $bug->repeatable );
-            $form .= FormGen::getFormFieldHtml( 'status', 'Status', 'customSelect', $bug->status, $statusList );
-            Components::set( 'TRACKER_FORM', $form );
-            return Views::view( 'bugtracker.admin.edit', $bug );
-        }
-        if ( !Forms::check( 'editBugTracker' ) ) {
-            Issues::add( 'error', [ 'There was an error with your form.' => Check::userErrors() ] );
-            return $this->index();
-        }
-        $image = '';
-        if ( Input::exists( 'bugImage' ) ) {
-            $folder = IMAGE_UPLOAD_DIRECTORY . App::$activeUser->username . DIRECTORY_SEPARATOR;
-            if ( !Upload::image( 'bugImage', $folder ) ) {
-                Issues::add( 'error', [ 'There was an error with your upload.' => Check::systemErrors() ] );
-            } else {
-                $image = $folder . Upload::last();
-            }
-        }
-        $tracker = self::$tracker->updateTracker(
-            $data,
-            Input::post( 'url' ),
-            $image,
-            Input::post( 'repeat' ),
-            Input::post( 'description' ),
-            Input::post( 'title' ),
-            Input::post( 'status' )
-        );
-        if ( true === $tracker ) {
-            Issues::add( 'success', 'Tracker Updated.' );
-            return $this->index();
-        }
-        Issues::add( 'error', 'There was an error with your request.' );
-        $this->index();
-    }
-
-    public function view( $id = null ) {
-        if ( empty( self::$comments ) ) {
-            self::$comments = new Comments;
-        }
-        $data = self::$tracker->findById( $id );
-        if ( $data === false ) {
-            Issues::add( 'error', 'Tracker not found.' );
-            return $this->index();
-        }
-        if ( Input::exists( 'contentId' ) ) {
-            $this->comments( 'post', Input::post( 'contentId' ) );
-        }
-        if ( empty( self::$comments ) ) {
-            self::$comments = new Comments;
-        }
-        Components::set( 'CONTENT_ID', $id );
-        Components::set( 'COMMENT_TYPE', 'admin/bugtracker' );
-        Components::set( 'count', self::$comments->count( 'tracker', $id ) );
-        Components::set( 'NEWCOMMENT', Views::simpleView( 'comments.create' ) );
-        Components::set( 'COMMENTS', Views::simpleView( 'comments.list', self::$comments->display( 10, 'tracker', $id ) ) );
-        Views::view( 'bugtracker.admin.view', $data );
-    }
-
-    public function delete( $data = null ) {
-        if ( $data == null ) {
-            if ( Input::exists( 'T_' ) ) {
-                $data = Input::post( 'T_' );
-            }
-        }
-        if ( !self::$tracker->delete( $data ) ) {
-            Issues::add( 'error', 'There was an error with your request.' );
-        } else {
-            Issues::add( 'success', 'Tracker has been deleted' );
-        }
-        $this->index();
-    }
-
-    public function comments( $sub = null, $data = null ) {
-        if ( empty( self::$comments ) ) {
-            self::$comments = new Comments;
-        }
-        if ( empty( $sub ) || empty( $data ) ) {
-            Session::flash( 'error', 'Whoops, try again.' );
-            Redirect::to( 'admin/bugtracker' );
-        }
-        switch ( $sub ) {
-            case 'post':
-                $content = self::$tracker->findById( $data );
-                if ( empty( $content ) ) {
-                    Session::flash( 'error', 'Unknown Post.' );
-                    Redirect::to( 'admin/bugtracker' );
-                }
-                return self::$comments->formPost( 'tracker', $content, 'admin/bugtracker/view/' );
-            case 'edit':
-                $content = self::$comments->findById( $data );
-                if ( empty( $content ) ) {
-                    Session::flash( 'error', 'Unknown Comment.' );
-                    Redirect::to( 'admin/bugtracker' );
-                }
-                return self::$comments->formEdit( 'tracker', $content, 'admin/bugtracker/view/' );
-            case 'delete':
-                $content = self::$comments->findById( $data );
-                if ( empty( $content ) ) {
-                    Session::flash( 'error', 'Unknown Comment.' );
-                    Redirect::to( 'admin/bugtracker' );
-                }
-                return self::$comments->formDelete( 'tracker', $content, 'admin/bugtracker/view/' );
-        }
-    }
-}

app/plugins/bugtracker/forms.php

@@ -1,92 +0,0 @@
-<?php
-/**
- * app/plugins/bugtracker/forms.php
- *
- * This houses all of the form checking functions for this plugin.
- *
- * @package TP BugTracker
- * @version 3.0
- * @author  Joey Kimsey <Joey@thetempusproject.com>
- * @link    https://TheTempusProject.com
- * @license https://opensource.org/licenses/MIT [MIT LICENSE]
- */
-namespace TheTempusProject\Plugins\Bugreport;
-
-use TheTempusProject\Bedrock\Functions\Input;
-use TheTempusProject\Classes\Forms;
-
-class BugTrackerForms extends Forms {
-    /**
-     * Adds these functions to the form list.
-     */
-    public function __construct() {
-        self::addHandler( 'newBugTracker', __CLASS__, 'newBugTracker' );
-        self::addHandler( 'editBugTracker', __CLASS__, 'editBugTracker' );
-    }
-
-    /**
-     * Validates the bug tracker create form.
-     *
-     * @return {bool}
-     */
-    public static function newBugTracker() {
-        if ( !empty(Input::post( 'url' )) && !self::url( Input::post( 'url' ) ) ) {
-            self::addUserError( 'Invalid url: <code>' . Input::post( 'url' ) . '</code>' );
-            return false;
-        }
-        if ( !self::tf( Input::post( 'repeat' ) ) ) {
-            self::addUserError( 'Invalid repeat value: ' . Input::post( 'repeat' )  );
-            return false;
-        }
-        if ( !Input::exists( 'title' ) ) {
-            self::addUserError( 'You must specify title' );
-            return false;
-        }
-        if ( !self::dataTitle( Input::post( 'title' ) ) ) {
-            self::addUserError( 'Invalid title' );
-            return false;
-        }
-        if ( !Input::exists( 'description' ) ) {
-            self::addUserError( 'You must specify a description' );
-            return false;
-        }
-        // if ( !self::token() ) {
-        //     return false;
-        // }
-        return true;
-    }
-
-    /**
-     * Validates the bug tracker create form.
-     *
-     * @return {bool}
-     */
-    public static function editBugTracker() {
-        if ( !empty(Input::post( 'url' )) && !self::url( Input::post( 'url' ) ) ) {
-            self::addUserError( 'Invalid url.' . Input::post( 'url' )  );
-            return false;
-        }
-        if ( !self::tf( Input::post( 'repeat' ) ) ) {
-            self::addUserError( 'Invalid repeat value.' );
-            return false;
-        }
-        if ( !Input::exists( 'title' ) ) {
-            self::addUserError( 'You must specify title' );
-            return false;
-        }
-        if ( !self::dataTitle( Input::post( 'title' ) ) ) {
-            self::addUserError( 'Invalid title' );
-            return false;
-        }
-        if ( !Input::exists( 'description' ) ) {
-            self::addUserError( 'You must specify a description' );
-            return false;
-        }
-        // if ( !self::token() ) {
-        //     return false;
-        // }
-        return true;
-    }
-}
-
-new BugTrackerForms;

app/plugins/bugtracker/models/bugtracker.php

@@ -1,142 +0,0 @@
-<?php
-/**
- * app/plugins/bugtracker/models/bugtracker.php
- *
- * This class is used for the manipulation of the bugs database table.
- *
- * @package TP BugTracker
- * @version 3.0
- * @author  Joey Kimsey <Joey@thetempusproject.com>
- * @link    https://TheTempusProject.com
- * @license https://opensource.org/licenses/MIT [MIT LICENSE]
- */
-namespace TheTempusProject\Models;
-
-use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Bedrock\Classes\Config;
-use TheTempusProject\Canary\Canary as Debug;
-use TheTempusProject\Bedrock\Classes\CustomException;
-use TheTempusProject\Classes\DatabaseModel;
-use TheTempusProject\TheTempusProject as App;
-use TheTempusProject\Plugins\Bugtracker as Plugin;
-
-class Bugtracker extends DatabaseModel {
-    public $tableName = 'bugs';
-    public $databaseMatrix = [
-        [ 'userID', 'int', '11' ],
-        [ 'time', 'int', '10' ],
-        [ 'title', 'varchar', '128' ],
-        [ 'status', 'varchar', '64' ],
-        [ 'description', 'text', '' ],
-        [ 'image', 'varchar', '256' ],
-        [ 'repeatable', 'varchar', '5' ],
-        [ 'url', 'varchar', '256' ],
-    ];
-    public $plugin;
-
-    /**
-     * The model constructor.
-     */
-    public function __construct() {
-        parent::__construct();
-        $this->plugin = new Plugin;
-    }
-
-    /**
-     * This function parses the bug reports description and
-     * separates it into separate keys in the array.
-     *
-     * @param  array $data - The data being parsed.
-     *
-     * @return array
-     */
-    public function filter( $data, $params = [] ) {
-        foreach ( $data as $instance ) {
-            if ( !is_object( $instance ) ) {
-                $instance = $data;
-                $end = true;
-            }
-            $instance->submittedBy = self::$user->getUsername( $instance->userID );
-            $instance->repeatText = ( 'false' == $instance->repeatable ? 'no' : 'yes' );
-            $out[] = $instance;
-            if ( !empty( $end ) ) {
-                $out = $out[0];
-                break;
-            }
-        }
-        return $out;
-    }
-
-    /**
-     * Logs a Bug Report form.
-     *
-     * @param  int $ID           the user ID submitting the form
-     * @param  string $url          the url
-     * @param  string $o_url        the original url
-     * @param  int $repeat       is repeatable?
-     * @param  string $description_ description of the event.
-     *
-     * @return null
-     */
-    public function create( $ID, $url, $image, $repeat, $description, $title ) {
-        if ( !$this->plugin->checkEnabled() ) {
-            Debug::info( 'Bug Tracking is disabled in the config.' );
-            return false;
-        }
-        if ( !Check::dataTitle( $title ) ) {
-            Debug::info( 'bugTracker: illegal title.' );
-            return false;
-        }
-        $fields = [
-            'userID' => App::$activeUser->ID,
-            'time' => time(),
-            'title' => $title,
-            'status' => TRACKER_STATUS_NEW,
-            'description' => $description,
-            'image' => $image,
-            'repeatable' => $repeat,
-            'url' => $url,
-        ];
-        if ( !self::$db->insert( $this->tableName, $fields ) ) {
-            new CustomException( $this->tableName );
-            return false;
-        }
-        return self::$db->lastId();
-    }
-
-    public function updateTracker( $ID, $url, $image, $repeat, $description, $title, $status ) {
-        if ( !$this->plugin->checkEnabled() ) {
-            Debug::info( 'Bug Tracking is disabled in the config.' );
-            return false;
-        }
-        if ( empty( self::$log ) ) {
-            self::$log = new Log;
-        }
-        if ( !Check::id( $ID ) ) {
-            Debug::info( 'bugTracker: illegal ID.' );
-            return false;
-        }
-        if ( !Check::dataTitle( $title ) ) {
-            Debug::info( 'bugTracker: illegal title.' );
-            return false;
-        }
-        $fields = [
-            'url' => $url,
-            'description' => $description,
-            'repeatable' => $repeat,
-            'title' => $title,
-            'status' => $status,
-        ];
-        if ( !empty( $image ) ) {
-            $fields['image'] = $image;
-        }
-        if ( !self::$db->update( $this->tableName, $ID, $fields ) ) {
-            new CustomException( $this->tableName );
-            Debug::error( "Tracker Post: $ID not updated: $fields" );
-
-            return false;
-        }
-        self::$log->admin( "Updated Tracker Post: $ID" );
-        return true;
-    }
-}