diff --git a/app/classes/admin_controller.php b/app/classes/admin_controller.php index 7dbc312..84351ca 100644 --- a/app/classes/admin_controller.php +++ b/app/classes/admin_controller.php @@ -5,7 +5,7 @@ * This is the base admin controller. Every other admin controller should * extend this class. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/classes/api_controller.php b/app/classes/api_controller.php index b23fbe4..47d1aa5 100644 --- a/app/classes/api_controller.php +++ b/app/classes/api_controller.php @@ -5,7 +5,7 @@ * This is the base api controller. Every other api controller should * extend this class. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/classes/config.php b/app/classes/config.php index 0a28176..dff2866 100644 --- a/app/classes/config.php +++ b/app/classes/config.php @@ -4,7 +4,7 @@ * * This class handles all the hard-coded configurations. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] @@ -69,14 +69,21 @@ class Config extends BedrockConfig { $html .= '
'; $html .= $fieldHtml; $html .= '
'; + $html .= ''; if ( 'file' === $node['type'] ) { $html .= '
'; - $html .= '

Current Image

'; + $html .= '

Current Value

'; $html .= '
'; + $html .= ''; + $html .= '
'; + $html .= '
'; + $html .= '
'; + $html .= '

Current Image

'; + $html .= '
'; $html .= 'configured image'; $html .= '
'; + $html .= '
'; } - $html .= ''; return Template::parse( $html ); } diff --git a/app/classes/controller.php b/app/classes/controller.php index 4bde183..78fd280 100644 --- a/app/classes/controller.php +++ b/app/classes/controller.php @@ -4,7 +4,7 @@ * * This is the main controller class. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/classes/database_model.php b/app/classes/database_model.php index 16f66c7..0b71de2 100644 --- a/app/classes/database_model.php +++ b/app/classes/database_model.php @@ -4,7 +4,7 @@ * * This is the main TempusProject database model. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/classes/email.php b/app/classes/email.php index f359557..142c6a8 100644 --- a/app/classes/email.php +++ b/app/classes/email.php @@ -4,7 +4,7 @@ * * This is our class for constructing and sending various kinds of emails. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/classes/forms.php b/app/classes/forms.php index afea762..28201a2 100644 --- a/app/classes/forms.php +++ b/app/classes/forms.php @@ -7,7 +7,7 @@ * error reporting to easily define exactly what feedback you * would like to give. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/classes/installer.php b/app/classes/installer.php index dcd289f..aa36ad3 100644 --- a/app/classes/installer.php +++ b/app/classes/installer.php @@ -6,7 +6,7 @@ * the application. It handles installing the application, installing and updating * models as well as the database, and generating and checking the htaccess file. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/classes/permissions.php b/app/classes/permissions.php index 5842418..2191349 100644 --- a/app/classes/permissions.php +++ b/app/classes/permissions.php @@ -4,7 +4,7 @@ * * This class handles all the hard-coded permissions. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/classes/plugin.php b/app/classes/plugin.php index 7364455..acb5a83 100644 --- a/app/classes/plugin.php +++ b/app/classes/plugin.php @@ -4,7 +4,7 @@ * * This class is used as a foundation for all plugins to build from. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/classes/preferences.php b/app/classes/preferences.php index c582d1b..7258bf2 100644 --- a/app/classes/preferences.php +++ b/app/classes/preferences.php @@ -4,7 +4,7 @@ * * This class handles all the hard-coded preferences. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/controllers/admin/admin.php b/app/controllers/admin/admin.php index 17d1850..f709b42 100644 --- a/app/controllers/admin/admin.php +++ b/app/controllers/admin/admin.php @@ -4,7 +4,7 @@ * * This is the admin log controller. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/controllers/admin/composer.php b/app/controllers/admin/composer.php index 7eb1323..17ee61e 100644 --- a/app/controllers/admin/composer.php +++ b/app/controllers/admin/composer.php @@ -4,7 +4,7 @@ * * This is the composer controller. Its only very effective when using composer for autoloading. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/controllers/admin/errors.php b/app/controllers/admin/errors.php index da8cf23..e445c75 100644 --- a/app/controllers/admin/errors.php +++ b/app/controllers/admin/errors.php @@ -4,7 +4,7 @@ * * This is the error logs controller. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/controllers/admin/groups.php b/app/controllers/admin/groups.php index b6ed9d9..a8d2d42 100644 --- a/app/controllers/admin/groups.php +++ b/app/controllers/admin/groups.php @@ -4,7 +4,7 @@ * * This is the groups admin controller. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/controllers/admin/home.php b/app/controllers/admin/home.php index dedddb1..06ea21c 100644 --- a/app/controllers/admin/home.php +++ b/app/controllers/admin/home.php @@ -4,7 +4,7 @@ * * This is the admin dashboard controller. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/controllers/admin/images.php b/app/controllers/admin/images.php index e2abda8..690cdaf 100644 --- a/app/controllers/admin/images.php +++ b/app/controllers/admin/images.php @@ -4,7 +4,7 @@ * * This is the admin app/user tokens controller. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] @@ -36,6 +36,8 @@ class Images extends AdminController { APP_ROOT_DIRECTORY . 'app/plugins' ]; + private $spacer = []; + private $excludedDirectories = [ '.', '..', @@ -97,12 +99,13 @@ class Images extends AdminController { $names = explode( DIRECTORY_SEPARATOR, $folder ); $folderName = array_pop( $names ); $out = [ + 'spacer' => implode( '', $this->spacer ), 'folderName' => $folderName, 'location' => $folder, 'subdirs' => $subdirs, ]; if ( ! empty( $subdirs ) ) { - $out['folderexpand'] = ''; + $out['folderexpand'] = ''; } else { $out['folderexpand'] = ''; } @@ -116,7 +119,9 @@ class Images extends AdminController { if ( $top == $sub ) { $html = ''; } else { + $this->spacer[] = '-> '; $children = $this->generateFolderHtml( $sub ); + array_pop( $this->spacer ); Components::set( 'parentfolderName', $object->folderName ); $html = Views::simpleView( 'forms.folderSelectParent', $children ); Components::set( 'parentfolderName', '' ); @@ -223,10 +228,36 @@ class Images extends AdminController { } public function delete() { - if ( self::$token->delete( [ $id ] ) ) { - Session::flash( 'success', 'Token deleted.' ); + if ( ! Input::exists( 'fileLocation' ) ) { + Session::flash( 'warning', 'Unknown image.' ); + Redirect::to( 'admin/images' ); } - Redirect::to( 'admin/images' ); + + $fileLocation = Input::get('fileLocation'); + + // Ensure the file exists + if ( ! file_exists( $fileLocation ) ) { + Session::flash('error', 'File does not exist.'); + Redirect::to('admin/images'); + } + + // Check if the file is an image + $validMimeTypes = ['image/jpeg', 'image/png', 'image/gif', 'image/webp']; + $fileMimeType = mime_content_type( $fileLocation ); + + if ( ! in_array( $fileMimeType, $validMimeTypes ) ) { + Session::flash('error', 'Invalid file type. Only images can be deleted.'); + Redirect::to('admin/images'); + } + + // Attempt to delete the file + if (@unlink($fileLocation)) { + Session::flash('success', 'Image deleted.'); + } else { + Session::flash('error', 'Failed to delete the image.'); + } + + Redirect::to('admin/images'); } public function rename() { diff --git a/app/controllers/admin/logins.php b/app/controllers/admin/logins.php index 174639e..d006c8b 100644 --- a/app/controllers/admin/logins.php +++ b/app/controllers/admin/logins.php @@ -4,7 +4,7 @@ * * This is the login logs controller. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/controllers/admin/logs.php b/app/controllers/admin/logs.php index 1729f1e..172e0ed 100644 --- a/app/controllers/admin/logs.php +++ b/app/controllers/admin/logs.php @@ -4,7 +4,7 @@ * * This is the generic logs controller. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/controllers/admin/plugins.php b/app/controllers/admin/plugins.php index 34ae918..7d0d023 100644 --- a/app/controllers/admin/plugins.php +++ b/app/controllers/admin/plugins.php @@ -4,7 +4,7 @@ * * This is the installed plugins controller. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/controllers/admin/routes.php b/app/controllers/admin/routes.php index 116394b..bd7e5ee 100644 --- a/app/controllers/admin/routes.php +++ b/app/controllers/admin/routes.php @@ -4,7 +4,7 @@ * * This is the admin routes/redirects controller. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/controllers/admin/send_mail.php b/app/controllers/admin/send_mail.php index e2065e5..70a8ed2 100644 --- a/app/controllers/admin/send_mail.php +++ b/app/controllers/admin/send_mail.php @@ -4,7 +4,7 @@ * * This is the admin email controller. The only real use is to send out emails to the various lists. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/controllers/admin/settings.php b/app/controllers/admin/settings.php index 2445c7b..6ab8307 100644 --- a/app/controllers/admin/settings.php +++ b/app/controllers/admin/settings.php @@ -4,7 +4,7 @@ * * This is the configuration and settings controller. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/controllers/admin/tokens.php b/app/controllers/admin/tokens.php index a60aa75..41d036d 100644 --- a/app/controllers/admin/tokens.php +++ b/app/controllers/admin/tokens.php @@ -4,7 +4,7 @@ * * This is the admin app/user tokens controller. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/controllers/admin/users.php b/app/controllers/admin/users.php index fbc83a5..d93d7ed 100644 --- a/app/controllers/admin/users.php +++ b/app/controllers/admin/users.php @@ -4,7 +4,7 @@ * * This is the users admin controller. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/controllers/api/auth.php b/app/controllers/api/auth.php index a0de860..c41e4f9 100644 --- a/app/controllers/api/auth.php +++ b/app/controllers/api/auth.php @@ -4,7 +4,7 @@ * * This is the api authentication controller. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/controllers/api/login.php b/app/controllers/api/login.php index 74536eb..7973efb 100644 --- a/app/controllers/api/login.php +++ b/app/controllers/api/login.php @@ -4,7 +4,7 @@ * * This is the api authentication controller. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/controllers/api/users.php b/app/controllers/api/users.php index 44168f9..cbbd9b1 100644 --- a/app/controllers/api/users.php +++ b/app/controllers/api/users.php @@ -4,7 +4,7 @@ * * This is the users' api controller. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/controllers/error.php b/app/controllers/error.php index db2cb75..c840214 100644 --- a/app/controllers/error.php +++ b/app/controllers/error.php @@ -4,7 +4,7 @@ * * This is the error controller. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/controllers/home.php b/app/controllers/home.php index 31e04ef..2fd4a35 100644 --- a/app/controllers/home.php +++ b/app/controllers/home.php @@ -4,7 +4,7 @@ * * This is the home or 'index' controller. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/controllers/register.php b/app/controllers/register.php index 3e5d10d..c04e6ca 100644 --- a/app/controllers/register.php +++ b/app/controllers/register.php @@ -4,7 +4,7 @@ * * This is the user registration controller. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/controllers/usercp.php b/app/controllers/usercp.php index 5d1c6c1..627e63b 100644 --- a/app/controllers/usercp.php +++ b/app/controllers/usercp.php @@ -4,7 +4,7 @@ * * This is the user control panel controller. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] @@ -31,7 +31,7 @@ use TheTempusProject\Bedrock\Functions\Session; class Usercp extends Controller { public function __construct() { parent::__construct(); - if ( !App::$isLoggedIn ) { + if ( ! App::$isLoggedIn ) { Session::flash( 'notice', 'You must be logged in to view this page!' ); Redirect::home(); } diff --git a/app/css/debug.css b/app/css/debug.css index 72e4d8b..f87a281 100644 --- a/app/css/debug.css +++ b/app/css/debug.css @@ -3,7 +3,7 @@ * * This is css used in the debuging console. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/css/main-dark.css b/app/css/main-dark.css index f82a8a1..0623766 100644 --- a/app/css/main-dark.css +++ b/app/css/main-dark.css @@ -3,7 +3,7 @@ * * This file provides dark mode styles to override existing Bootstrap 5 base styles. * - * @version 3.0-dark + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] @@ -12,6 +12,9 @@ .context-main-border { border-color: #f5f5f5!important; } +.context-main-border-other { + border-color: #1e1e1e!important; +} .context-main-bg { background-color: #2c2c2c; diff --git a/app/css/main.css b/app/css/main.css index 1660a28..500f016 100644 --- a/app/css/main.css +++ b/app/css/main.css @@ -3,7 +3,7 @@ * * This file is for any css that should be applied site wide. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] @@ -12,6 +12,9 @@ .context-main-border { border-color: #1e1e1e!important; } +.context-main-border-other { + border-color: #f5f5f5!important; +} .context-main-bg { background-color: #f7f7f7; diff --git a/app/functions/common.php b/app/functions/common.php index 24e982d..b898fa9 100644 --- a/app/functions/common.php +++ b/app/functions/common.php @@ -2,7 +2,7 @@ /** * app/functions/common.php * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/images/ttp-gitlab.png b/app/images/ttp-gitlab.png new file mode 100644 index 0000000..9637ee2 Binary files /dev/null and b/app/images/ttp-gitlab.png differ diff --git a/app/js/main.js b/app/js/main.js index 461b5fe..c22fc1f 100644 --- a/app/js/main.js +++ b/app/js/main.js @@ -3,7 +3,7 @@ * * This file is for 'access anywhere' javascript. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] @@ -80,14 +80,14 @@ function copyElementText( id ) { } } -$(document).ready(function() { - $('select').each(function() { - var selectedValue = $(this).attr('value'); +document.addEventListener("DOMContentLoaded", function () { + document.querySelectorAll("select").forEach(function (select) { + var selectedValue = select.getAttribute("value"); if (selectedValue) { - $(this).removeAttr('value'); - $(this).find('option').each(function() { - if ($(this).attr('value') === selectedValue) { - $(this).prop('selected', true); + select.removeAttribute("value"); + select.querySelectorAll("option").forEach(function (option) { + if (option.getAttribute("value") === selectedValue) { + option.selected = true; } }); } @@ -178,12 +178,43 @@ document.addEventListener('DOMContentLoaded', function () { }); } - function toggleDarkModePref( value ) { - var fields = {}; - fields.prefName = 'darkMode'; - fields.prefValue = value; - $.post( '/usercp/updatePref', fields ).done(function(response) { - // alert('Timer updated successfully!'); - }); + function toggleDarkModePref(value) { + var fields = new URLSearchParams(); + fields.append("prefName", "darkMode"); + fields.append("prefValue", value); + + fetch("/usercp/updatePref", { + method: "POST", + body: fields, + headers: { + "Content-Type": "application/x-www-form-urlencoded", + }, + }) + // .then(response => response.text()) // Handle response if needed + .catch(error => console.error("Error:", error)); } }); + +// this reverses the carets for the folderSelect +document.querySelectorAll('[data-bs-toggle="collapse"]').forEach(button => { + button.addEventListener('click', () => { + setTimeout(() => { + const icon = button.querySelector('i'); + + // Only proceed if the icon already has one of the relevant classes + if (icon && (icon.classList.contains('fa-caret-down') || icon.classList.contains('fa-caret-up'))) { + icon.classList.toggle('fa-caret-down', button.classList.contains('collapsed')); + icon.classList.toggle('fa-caret-up', !button.classList.contains('collapsed')); + } + }, 150); + }); +}); + + +// this should load all popovers +document.addEventListener("DOMContentLoaded", function () { + var popoverTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="popover"]')); + var popoverList = popoverTriggerList.map(function (popoverTriggerEl) { + return new bootstrap.Popover(popoverTriggerEl); + }); +}); \ No newline at end of file diff --git a/app/models/group.php b/app/models/group.php index d5a85f1..dab6b84 100644 --- a/app/models/group.php +++ b/app/models/group.php @@ -4,7 +4,7 @@ * * This class is used for the manipulation of the groups database table. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/models/log.php b/app/models/log.php index 135758b..8586814 100644 --- a/app/models/log.php +++ b/app/models/log.php @@ -4,7 +4,7 @@ * * Model for handling all logging. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/models/routes.php b/app/models/routes.php index a48b834..dddff43 100644 --- a/app/models/routes.php +++ b/app/models/routes.php @@ -4,7 +4,7 @@ * * This class is used for the manipulation of the routes database table. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/models/sessions.php b/app/models/sessions.php index 427d573..2070dde 100644 --- a/app/models/sessions.php +++ b/app/models/sessions.php @@ -7,7 +7,7 @@ * Notes: After refactor, the sessions will use ID's for short term, and Cookies * will use the token for long term storage * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/models/token.php b/app/models/token.php index 59cb422..3e3ccb8 100644 --- a/app/models/token.php +++ b/app/models/token.php @@ -4,7 +4,7 @@ * * This class is used for the manipulation of the tokens database table. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/models/user.php b/app/models/user.php index 90c52de..0bbf75a 100644 --- a/app/models/user.php +++ b/app/models/user.php @@ -8,7 +8,7 @@ * @todo finish fixing the check functions that were migrated here * These could go in the Forms class? * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/plugins/blog/controllers/admin/blog.php b/app/plugins/blog/controllers/admin/blog.php index b97e319..617a4f3 100644 --- a/app/plugins/blog/controllers/admin/blog.php +++ b/app/plugins/blog/controllers/admin/blog.php @@ -5,7 +5,7 @@ * This is the Blog admin controller. * * @package TP Blog - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/plugins/blog/controllers/blog.php b/app/plugins/blog/controllers/blog.php index 678f1ee..ba3a71d 100644 --- a/app/plugins/blog/controllers/blog.php +++ b/app/plugins/blog/controllers/blog.php @@ -5,7 +5,7 @@ * This is the blog controller. * * @package TP Blog - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/plugins/blog/forms.php b/app/plugins/blog/forms.php index 0fab016..8361958 100644 --- a/app/plugins/blog/forms.php +++ b/app/plugins/blog/forms.php @@ -5,7 +5,7 @@ * This houses all of the form checking functions for this plugin. * * @package TP Blog - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/plugins/blog/models/posts.php b/app/plugins/blog/models/posts.php index ed049c5..730424e 100644 --- a/app/plugins/blog/models/posts.php +++ b/app/plugins/blog/models/posts.php @@ -5,7 +5,7 @@ * This class is used for the manipulation of the blog database table. * * @package TP Blog - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/plugins/blog/plugin.php b/app/plugins/blog/plugin.php index 0c5275b..887aea6 100644 --- a/app/plugins/blog/plugin.php +++ b/app/plugins/blog/plugin.php @@ -5,7 +5,7 @@ * This houses all of the main plugin info and functionality. * * @package TP Blog - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/plugins/blog/templates/blog.inc.php b/app/plugins/blog/templates/blog.inc.php index 575c5da..0dc26cf 100644 --- a/app/plugins/blog/templates/blog.inc.php +++ b/app/plugins/blog/templates/blog.inc.php @@ -5,7 +5,7 @@ * This is the loader for the blog template. * * @package TP Blog - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/plugins/blog/templates/blog.tpl b/app/plugins/blog/templates/blog.tpl index cb23a4e..f97e3c1 100644 --- a/app/plugins/blog/templates/blog.tpl +++ b/app/plugins/blog/templates/blog.tpl @@ -4,7 +4,7 @@ * app/plugins/blog/templates/blog.tpl * * @package TP Blog - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] @@ -130,7 +130,6 @@ {FOOT} - diff --git a/app/plugins/blog/templates/rss.inc.php b/app/plugins/blog/templates/rss.inc.php index 5e98222..1c59ce7 100644 --- a/app/plugins/blog/templates/rss.inc.php +++ b/app/plugins/blog/templates/rss.inc.php @@ -5,7 +5,7 @@ * This is the loader for the rss template. * * @package TP Blog - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/plugins/bugreport/controllers/admin/bugreport.php b/app/plugins/bugreport/controllers/admin/bugreport.php index 9433b70..22d1c6d 100644 --- a/app/plugins/bugreport/controllers/admin/bugreport.php +++ b/app/plugins/bugreport/controllers/admin/bugreport.php @@ -5,7 +5,7 @@ * This is the bug report admin controller. * * @package TP BugReports - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/plugins/bugreport/controllers/bugreport.php b/app/plugins/bugreport/controllers/bugreport.php index 75c5ad5..8cbe106 100644 --- a/app/plugins/bugreport/controllers/bugreport.php +++ b/app/plugins/bugreport/controllers/bugreport.php @@ -5,7 +5,7 @@ * This is the bug reports controller. * * @package TP BugReports - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/plugins/bugreport/forms.php b/app/plugins/bugreport/forms.php index 70b05fb..ad18ae6 100644 --- a/app/plugins/bugreport/forms.php +++ b/app/plugins/bugreport/forms.php @@ -5,7 +5,7 @@ * This houses all of the form checking functions for this plugin. * * @package TP BugReports - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/plugins/bugreport/models/bugreport.php b/app/plugins/bugreport/models/bugreport.php index df23b78..33a5642 100644 --- a/app/plugins/bugreport/models/bugreport.php +++ b/app/plugins/bugreport/models/bugreport.php @@ -5,7 +5,7 @@ * This class is used for the manipulation of the bugreports database table. * * @package TP BugReports - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/plugins/bugreport/plugin.php b/app/plugins/bugreport/plugin.php index 6a4be8e..06454ee 100644 --- a/app/plugins/bugreport/plugin.php +++ b/app/plugins/bugreport/plugin.php @@ -5,7 +5,7 @@ * This houses all of the main plugin info and functionality. * * @package TP BugReports - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/plugins/comments/controllers/admin/comments.php b/app/plugins/comments/controllers/admin/comments.php index 4c9ead6..4b91ada 100644 --- a/app/plugins/comments/controllers/admin/comments.php +++ b/app/plugins/comments/controllers/admin/comments.php @@ -5,7 +5,7 @@ * This is the comments admin controller. * * @package TP Comments - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/plugins/comments/controllers/moderator.php b/app/plugins/comments/controllers/moderator.php index 8d8f319..dbaacf1 100644 --- a/app/plugins/comments/controllers/moderator.php +++ b/app/plugins/comments/controllers/moderator.php @@ -4,7 +4,7 @@ * * This is the Moderator controller. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/plugins/comments/forms.php b/app/plugins/comments/forms.php index f9369b1..82cb451 100644 --- a/app/plugins/comments/forms.php +++ b/app/plugins/comments/forms.php @@ -5,7 +5,7 @@ * This houses all of the form checking functions for this plugin. * * @package TP Comments - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/plugins/comments/models/comments.php b/app/plugins/comments/models/comments.php index 662fc47..86fdcae 100644 --- a/app/plugins/comments/models/comments.php +++ b/app/plugins/comments/models/comments.php @@ -6,7 +6,7 @@ * of the comments table. * * @package TP Comments - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/plugins/comments/plugin.php b/app/plugins/comments/plugin.php index 146da01..61fb325 100644 --- a/app/plugins/comments/plugin.php +++ b/app/plugins/comments/plugin.php @@ -5,7 +5,7 @@ * This houses all of the main plugin info and functionality. * * @package TP Comments - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/plugins/contact/controllers/admin/contact.php b/app/plugins/contact/controllers/admin/contact.php index be6fd11..772ae59 100644 --- a/app/plugins/contact/controllers/admin/contact.php +++ b/app/plugins/contact/controllers/admin/contact.php @@ -5,7 +5,7 @@ * This is the contact admin controller. * * @package TP Contact - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/plugins/contact/controllers/contact.php b/app/plugins/contact/controllers/contact.php index a849547..7cb5969 100644 --- a/app/plugins/contact/controllers/contact.php +++ b/app/plugins/contact/controllers/contact.php @@ -5,7 +5,7 @@ * This is the home controller for the contact plugin. * * @package TP Contact - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/plugins/contact/forms.php b/app/plugins/contact/forms.php index f2265cb..5f83e60 100644 --- a/app/plugins/contact/forms.php +++ b/app/plugins/contact/forms.php @@ -5,7 +5,7 @@ * This houses all of the form checking functions for this plugin. * * @package TP Contact - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/plugins/contact/models/contact.php b/app/plugins/contact/models/contact.php index 8730883..96aaf90 100644 --- a/app/plugins/contact/models/contact.php +++ b/app/plugins/contact/models/contact.php @@ -7,7 +7,7 @@ * @todo make this send a confirmation email * * @package TP Contact - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/plugins/contact/plugin.php b/app/plugins/contact/plugin.php index 6bdf78a..eab4939 100644 --- a/app/plugins/contact/plugin.php +++ b/app/plugins/contact/plugin.php @@ -5,7 +5,7 @@ * This houses all of the main plugin info and functionality. * * @package TP Contact - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/plugins/notifications/controllers/admin/notifications.php b/app/plugins/notifications/controllers/admin/notifications.php index 1ff39cd..ac935f1 100644 --- a/app/plugins/notifications/controllers/admin/notifications.php +++ b/app/plugins/notifications/controllers/admin/notifications.php @@ -5,7 +5,7 @@ * This is the notifications admin controller. * * @package TP Notifications - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/plugins/notifications/controllers/notifications.php b/app/plugins/notifications/controllers/notifications.php index 6dfc3e1..b3ed7ed 100644 --- a/app/plugins/notifications/controllers/notifications.php +++ b/app/plugins/notifications/controllers/notifications.php @@ -5,7 +5,7 @@ * This is the home controller for the notifications plugin. * * @package TP Notifications - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/plugins/notifications/forms.php b/app/plugins/notifications/forms.php index 7976796..71f8e99 100644 --- a/app/plugins/notifications/forms.php +++ b/app/plugins/notifications/forms.php @@ -5,7 +5,7 @@ * This houses all of the form checking functions for this plugin. * * @package TP Notifications - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/plugins/notifications/models/notification.php b/app/plugins/notifications/models/notification.php index e83b6b2..d9f939c 100644 --- a/app/plugins/notifications/models/notification.php +++ b/app/plugins/notifications/models/notification.php @@ -5,7 +5,7 @@ * This class is used for the manipulation of the notifications database table. * * @package TP Notifications - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/plugins/notifications/plugin.php b/app/plugins/notifications/plugin.php index c1833d2..f3d8661 100644 --- a/app/plugins/notifications/plugin.php +++ b/app/plugins/notifications/plugin.php @@ -5,7 +5,7 @@ * This houses all of the main plugin info and functionality. * * @package TP Notifications - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/plugins/subscribe/controllers/admin/subscriptions.php b/app/plugins/subscribe/controllers/admin/subscriptions.php index 0256d29..983d363 100644 --- a/app/plugins/subscribe/controllers/admin/subscriptions.php +++ b/app/plugins/subscribe/controllers/admin/subscriptions.php @@ -5,7 +5,7 @@ * This is the subscriptions admin controller. * * @package TP Subscribe - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/plugins/subscribe/controllers/subscribe.php b/app/plugins/subscribe/controllers/subscribe.php index 1681685..b1512e1 100644 --- a/app/plugins/subscribe/controllers/subscribe.php +++ b/app/plugins/subscribe/controllers/subscribe.php @@ -5,7 +5,7 @@ * This is the home controller for the subscribe plugin. * * @package TP Subscribe - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/plugins/subscribe/forms.php b/app/plugins/subscribe/forms.php index d9fb68a..5a3db4d 100644 --- a/app/plugins/subscribe/forms.php +++ b/app/plugins/subscribe/forms.php @@ -5,7 +5,7 @@ * This houses all of the form checking functions for this plugin. * * @package TP Subscribe - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/plugins/subscribe/models/subscribe.php b/app/plugins/subscribe/models/subscribe.php index 024c00b..10518b0 100644 --- a/app/plugins/subscribe/models/subscribe.php +++ b/app/plugins/subscribe/models/subscribe.php @@ -5,7 +5,7 @@ * This class is used for the manipulation of the subscribers database table. * * @package TP Subscribe - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/plugins/subscribe/plugin.php b/app/plugins/subscribe/plugin.php index 972cb33..343f4ff 100644 --- a/app/plugins/subscribe/plugin.php +++ b/app/plugins/subscribe/plugin.php @@ -5,7 +5,7 @@ * This houses all of the main plugin info and functionality. * * @package TP Subscribe - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/templates/admin/admin.inc.php b/app/templates/admin/admin.inc.php index 07bdb7e..6fc3000 100644 --- a/app/templates/admin/admin.inc.php +++ b/app/templates/admin/admin.inc.php @@ -4,7 +4,7 @@ * * This is the loader for the admin template. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/templates/admin/admin.tpl b/app/templates/admin/admin.tpl index 9e48eee..05202ea 100644 --- a/app/templates/admin/admin.tpl +++ b/app/templates/admin/admin.tpl @@ -3,7 +3,7 @@
-
- - - {SITENAME} - -
- {ADMIN} - {ADMIN_LINKS} - {/ADMIN} -
-
- {topNavRight} +
+
-
- {topNavLeft} +
+
+ {topNavLeft} +
+
+ +
@@ -66,26 +74,62 @@
- +
+ +
+ +
+
- diff --git a/app/templates/api/api.inc.php b/app/templates/api/api.inc.php index c76a72b..f8d45d2 100644 --- a/app/templates/api/api.inc.php +++ b/app/templates/api/api.inc.php @@ -4,7 +4,7 @@ * * This is the loader for the admin template. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] diff --git a/app/templates/default/default.inc.php b/app/templates/default/default.inc.php index 6597d3d..95ff8c6 100644 --- a/app/templates/default/default.inc.php +++ b/app/templates/default/default.inc.php @@ -4,7 +4,7 @@ * * This is the loader for the default template. * - * @version 3.0 + * @version 5.0.1 * @author Joey Kimsey * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] @@ -23,7 +23,6 @@ use TheTempusProject\TheTempusProject as App; class DefaultLoader extends Loader { private static $loaded = false; const TEMPLATE_NAME = 'Default Tempus Project Template'; - const JQUERY_CDN = 'https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/'; const BOOTSTRAP_CDN = 'https://cdn.jsdelivr.net/npm/bootstrap@3.3.6/dist/'; const FONT_AWESOME_URL = 'https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/'; @@ -36,10 +35,8 @@ class DefaultLoader extends Loader { if ( VENDOR_AUTOLOADED === true ) { Components::set( 'FONT_AWESOME_URL', '/vendor/fortawesome/font-awesome/css/' ); Components::set( 'BOOTSTRAP_CDN', '/vendor/twbs/bootstrap/dist/' ); - Components::set( 'JQUERY_CDN', '/vendor/components/jquery/' ); } else { Components::set( 'BOOTSTRAP_CDN', self::BOOTSTRAP_CDN ); - Components::set( 'JQUERY_CDN', self::JQUERY_CDN ); Components::set( 'FONT_AWESOME_URL', self::FONT_AWESOME_URL ); } $this->addJs( '' ); diff --git a/app/templates/default/default.tpl b/app/templates/default/default.tpl index 8233028..edcc85d 100644 --- a/app/templates/default/default.tpl +++ b/app/templates/default/default.tpl @@ -3,7 +3,7 @@ - diff --git a/app/views/forms/folderSelect.html b/app/views/forms/folderSelect.html index 94c9148..d03f67b 100644 --- a/app/views/forms/folderSelect.html +++ b/app/views/forms/folderSelect.html @@ -1,17 +1,17 @@ Folder: {FOLDER_SELECT_ROOT}
{LOOP} -