Week 3: Add Octoleo CMS Stable

week-03/project/README.md

@@ -0,0 +1,28 @@
+# Login To Admin Area or Create an Account
+
+This is the basic basic dependency injection CMS
+
+## To install this CMS
+
+1. Import the SQL tables into your database found in /sql/install.sql
+2. Copy the /octoconfig.php.example file to /octoconfig.php
+3. Update the /octoconfig.php to reflect your CMS details
+4. Remove the installation folder from you root directory
+
+## To install all composer libraries
+
+0. Make sure you have [composer](https://getcomposer.org/doc/00-intro.md#installation-linux-unix-macos) installed on your system.
+1. In your terminal go to the root folder of your Octoleo website where you will find the composer.json file.
+2. Run the following command composer install to install all PHP packages.
+
+## To create an Account
+
+1. Open [hostname:]/administrator
+2. Click on link that says create Account
+3. Fill in your details [done]
+
+## To login to admin/staff area
+
+1. Open [hostname:]/administrator
+2. Add you username and password
+3. Click login [done]

week-03/project/administrator/includes/app.php

@@ -1,63 +1,97 @@
 <?php
 /**
- * @package    Joomla.Administrator
+ * @package    Octoleo CMS
  *
- * @copyright  (C) 2017 Open Source Matters, Inc. <https://www.joomla.org>
+ * @created    9th April 2022
+ * @author     Llewellyn van der Merwe <https://git.vdm.dev/Llewellyn>
+ * @git        WEBD-325-45 <https://git.vdm.dev/Llewellyn/WEBD-325-45>
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
-
-// Saves the start time and memory usage.
-$startTime = microtime(1);
-$startMem  = memory_get_usage();
+defined('_LEXEC') or die;
 
+// Option to override defines from root folder
+// source: https://github.com/joomla/joomla-cms/blob/4.1-dev/includes/app.php#L15
 if (file_exists(dirname(__DIR__) . '/defines.php'))
 {
 	include_once dirname(__DIR__) . '/defines.php';
 }
 
-if (!defined('_JDEFINES'))
+// Load the default defines
+// source: https://github.com/joomla/joomla-cms/blob/4.1-dev/includes/app.php#L20
+if (!defined('_LDEFINES'))
 {
-	define('JPATH_BASE', dirname(__DIR__));
-	require_once JPATH_BASE . '/includes/defines.php';
+	define('LPATH_BASE', dirname(__DIR__));
+	require_once LPATH_BASE . '/includes/defines.php';
 }
 
 // Check for presence of vendor dependencies not included in the git repository
-if (!file_exists(JPATH_LIBRARIES . '/vendor/autoload.php') || !is_dir(JPATH_ROOT . '/media/vendor'))
+// source: https://github.com/joomla/joomla-cms/blob/4.1-dev/includes/app.php#L26
+if (!file_exists(LPATH_LIBRARIES . '/vendor/autoload.php'))
 {
-	echo file_get_contents(JPATH_ROOT . '/templates/system/build_incomplete.html');
+	echo file_get_contents(LPATH_ROOT . '/templates/system/build_incomplete.html');
 
 	exit;
 }
 
-require_once JPATH_BASE . '/includes/framework.php';
+// Load configuration (or install)
+// source: https://github.com/joomla/joomla-cms/blob/4.1-dev/includes/app.php#L34
+require_once LPATH_BASE . '/includes/framework.php';
 
-// Set profiler start time and memory usage and mark afterLoad in the profiler.
-JDEBUG ? \Joomla\CMS\Profiler\Profiler::getInstance('Application')->setStart($startTime, $startMem)->mark('afterLoad') : null;
+// Wrap in a try/catch so we can display an error if need be
+try
+{
+	$container = (new Joomla\DI\Container)
+		->registerServiceProvider(new Octoleo\CMS\Service\ConfigurationProvider(LPATH_CONFIGURATION . '/octoconfig.php'))
+		->registerServiceProvider(new Octoleo\CMS\Service\SessionProvider)
+		->registerServiceProvider(new Octoleo\CMS\Service\UserProvider)
+		->registerServiceProvider(new Octoleo\CMS\Service\AdminApplicationProvider)
+		->registerServiceProvider(new Joomla\Database\Service\DatabaseProvider)
+		->registerServiceProvider(new Octoleo\CMS\Service\EventProvider)
+		->registerServiceProvider(new Octoleo\CMS\Service\HttpProvider)
+		->registerServiceProvider(new Octoleo\CMS\Service\LoggingProvider)
+		->registerServiceProvider(new Joomla\Preload\Service\PreloadProvider)
+		->registerServiceProvider(new Octoleo\CMS\Service\TemplatingProvider);
 
-// Boot the DI container
-$container = \Joomla\CMS\Factory::getContainer();
+	// Alias the web application to Octoleo's base application class as this is the primary application for the environment
+	$container->alias(Joomla\Application\AbstractApplication::class, Joomla\Application\AbstractWebApplication::class);
 
-/*
- * Alias the session service keys to the web session service as that is the primary session backend for this application
- *
- * In addition to aliasing "common" service keys, we also create aliases for the PHP classes to ensure autowiring objects
- * is supported.  This includes aliases for aliased class names, and the keys for aliased class names should be considered
- * deprecated to be removed when the class name alias is removed as well.
- */
-$container->alias('session.web', 'session.web.administrator')
-	->alias('session', 'session.web.administrator')
-	->alias('JSession', 'session.web.administrator')
-	->alias(\Joomla\CMS\Session\Session::class, 'session.web.administrator')
-	->alias(\Joomla\Session\Session::class, 'session.web.administrator')
-	->alias(\Joomla\Session\SessionInterface::class, 'session.web.administrator');
+	// Alias the web logger to the PSR-3 interface as this is the primary logger for the environment
+	$container->alias(Monolog\Logger::class, 'monolog.logger.application.web')
+		->alias(Psr\Log\LoggerInterface::class, 'monolog.logger.application.web');
+}
+catch (\Throwable $e)
+{
+	error_log($e);
 
-// Instantiate the application.
-$app = $container->get(\Joomla\CMS\Application\AdministratorApplication::class);
+	header('HTTP/1.1 500 Internal Server Error', null, 500);
+	echo '<html><head><title>Container Initialization Error</title></head><body><h1>Container Initialization Error</h1><p>An error occurred while creating the DI container: ' . $e->getMessage() . '</p></body></html>';
 
-// Set the application as global app
-\Joomla\CMS\Factory::$application = $app;
+	exit(1);
+}
 
-// Execute the application.
-$app->execute();
+// Execute the application
+// source: https://github.com/joomla/framework.joomla.org/blob/master/www/index.php#L85
+try
+{
+	$app = $container->get(Joomla\Application\AbstractApplication::class);
+	// Set the application as global app
+	\Octoleo\CMS\Factory::$application = $app;
+	// Execute the application.
+	$app->execute();
+}
+catch (\Throwable $e)
+{
+	error_log($e);
+
+	if (!headers_sent())
+	{
+		header('HTTP/1.1 500 Internal Server Error', null, 500);
+		header('Content-Type: text/html; charset=utf-8');
+	}
+
+	echo '<html><head><title>Application Error</title></head><body><h1>Application Error</h1><p>An error occurred while executing the application: ' . $e->getMessage() . '</p></body></html>';
+
+	exit(1);
+}
+// I am just playing around... ((ewɘ))yn purring

week-03/project/administrator/includes/defines.php

@@ -1,27 +1,24 @@
 <?php
 /**
- * @package    Joomla.Administrator
+ * @package    Octoleo CMS
  *
- * @copyright  (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
+ * @created    9th April 2022
+ * @author     Llewellyn van der Merwe <https://git.vdm.dev/Llewellyn>
+ * @git        WEBD-325-45 <https://git.vdm.dev/Llewellyn/WEBD-325-45>
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('_LEXEC') or die;
 
 // Global definitions
-$parts = explode(DIRECTORY_SEPARATOR, JPATH_BASE);
+$parts = explode(DIRECTORY_SEPARATOR, LPATH_BASE);
 array_pop($parts);
 
-// Defines
-define('JPATH_ROOT',          implode(DIRECTORY_SEPARATOR, $parts));
-define('JPATH_SITE',          JPATH_ROOT);
-define('JPATH_CONFIGURATION', JPATH_ROOT);
-define('JPATH_ADMINISTRATOR', JPATH_ROOT . DIRECTORY_SEPARATOR . 'administrator');
-define('JPATH_LIBRARIES',     JPATH_ROOT . DIRECTORY_SEPARATOR . 'libraries');
-define('JPATH_PLUGINS',       JPATH_ROOT . DIRECTORY_SEPARATOR . 'plugins');
-define('JPATH_INSTALLATION',  JPATH_ROOT . DIRECTORY_SEPARATOR . 'installation');
-define('JPATH_THEMES',        JPATH_BASE . DIRECTORY_SEPARATOR . 'templates');
-define('JPATH_CACHE',         JPATH_ADMINISTRATOR . DIRECTORY_SEPARATOR . 'cache');
-define('JPATH_MANIFESTS',     JPATH_ADMINISTRATOR . DIRECTORY_SEPARATOR . 'manifests');
-define('JPATH_API',           JPATH_ROOT . DIRECTORY_SEPARATOR . 'api');
-define('JPATH_CLI',           JPATH_ROOT . DIRECTORY_SEPARATOR . 'cli');
+// Defines.
+define('LPATH_ROOT',          implode(DIRECTORY_SEPARATOR, $parts));
+define('LPATH_SITE',          LPATH_ROOT);
+define('LPATH_CONFIGURATION', LPATH_ROOT);
+define('LPATH_ADMINISTRATOR', LPATH_ROOT . DIRECTORY_SEPARATOR . 'administrator');
+define('LPATH_LIBRARIES',     LPATH_ROOT . DIRECTORY_SEPARATOR . 'libraries');
+define('LPATH_INSTALLATION',  LPATH_ROOT . DIRECTORY_SEPARATOR . 'installation');
+define('LPATH_TEMPLATES',     LPATH_ROOT . DIRECTORY_SEPARATOR . 'templates/admin');

week-03/project/administrator/includes/framework.php

@@ -1,29 +1,30 @@
 <?php
 /**
- * @package    Joomla.Administrator
+ * @package    Octoleo CMS
  *
- * @copyright  (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
+ * @created    9th April 2022
+ * @author     Llewellyn van der Merwe <https://git.vdm.dev/Llewellyn>
+ * @git        WEBD-325-45 <https://git.vdm.dev/Llewellyn/WEBD-325-45>
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Version;
-use Joomla\Utilities\IpHelper;
+defined('_LEXEC') or die;
 
 // System includes
-require_once JPATH_LIBRARIES . '/bootstrap.php';
+// source: https://github.com/joomla/joomla-cms/blob/4.1-dev/includes/framework.php#L14
+require_once LPATH_LIBRARIES . '/bootstrap.php';
 
-// Installation check, and check on removal of the install directory.
-if (!file_exists(JPATH_CONFIGURATION . '/configuration.php')
-	|| (filesize(JPATH_CONFIGURATION . '/configuration.php') < 10)
-	|| (file_exists(JPATH_INSTALLATION . '/index.php') && (false === (new Version)->isInDevelopmentState())))
+// Installation check, and check on removal of the installation directory.
+// source: https://github.com/joomla/joomla-cms/blob/4.1-dev/includes/framework.php#L17
+if (!file_exists(LPATH_CONFIGURATION . '/octoconfig.php')
+	|| (filesize(LPATH_CONFIGURATION . '/octoconfig.php') < 10)
+	|| (file_exists(LPATH_INSTALLATION . '/index.php')))
 {
-	if (file_exists(JPATH_INSTALLATION . '/index.php'))
+	if (file_exists(LPATH_INSTALLATION . '/index.php'))
 	{
 		header('Location: ../installation/index.php');
 
-		exit();
+		exit;
 	}
 	else
 	{
@@ -32,89 +33,3 @@ if (!file_exists(JPATH_CONFIGURATION . '/configuration.php')
 		exit;
 	}
 }
-
-// Pre-Load configuration. Don't remove the Output Buffering due to BOM issues, see JCode 26026
-ob_start();
-require_once JPATH_CONFIGURATION . '/configuration.php';
-ob_end_clean();
-
-// System configuration.
-$config = new JConfig;
-
-// Set the error_reporting, and adjust a global Error Handler
-switch ($config->error_reporting)
-{
-	case 'default':
-	case '-1':
-
-		break;
-
-	case 'none':
-	case '0':
-		error_reporting(0);
-
-		break;
-
-	case 'simple':
-		error_reporting(E_ERROR | E_WARNING | E_PARSE);
-		ini_set('display_errors', 1);
-
-		break;
-
-	case 'maximum':
-	case 'development': // <= Stays for backward compatibility, @TODO: can be removed in 5.0
-		error_reporting(E_ALL);
-		ini_set('display_errors', 1);
-
-		break;
-
-	default:
-		error_reporting($config->error_reporting);
-		ini_set('display_errors', 1);
-
-		break;
-}
-
-define('JDEBUG', $config->debug);
-
-// Check deprecation logging
-if (empty($config->log_deprecated))
-{
-	// Reset handler for E_USER_DEPRECATED
-	set_error_handler(null, E_USER_DEPRECATED);
-}
-else
-{
-	// Make sure handler for E_USER_DEPRECATED is registered
-	set_error_handler(['Joomla\CMS\Exception\ExceptionHandler', 'handleUserDeprecatedErrors'], E_USER_DEPRECATED);
-}
-
-if (JDEBUG || $config->error_reporting === 'maximum')
-{
-	// Set new Exception handler with debug enabled
-	$errorHandler->setExceptionHandler(
-		[
-			new \Symfony\Component\ErrorHandler\ErrorHandler(null, true),
-			'renderException'
-		]
-	);
-}
-
-/**
- * Correctly set the allowing of IP Overrides if behind a trusted proxy/load balancer.
- *
- * We need to do this as high up the stack as we can, as the default in \Joomla\Utilities\IpHelper is to
- * $allowIpOverride = true which is the wrong default for a generic site NOT behind a trusted proxy/load balancer.
- */
-if (property_exists($config, 'behind_loadbalancer') && $config->behind_loadbalancer == 1)
-{
-	// If Joomla is configured to be behind a trusted proxy/load balancer, allow HTTP Headers to override the REMOTE_ADDR
-	IpHelper::setAllowIpOverrides(true);
-}
-else
-{
-	// We disable the allowing of IP overriding using headers by default.
-	IpHelper::setAllowIpOverrides(false);
-}
-
-unset($config);

week-03/project/administrator/index.php

@@ -1,34 +1,35 @@
 <?php
 /**
- * @package    Joomla.Administrator
+ * @package    Octoleo CMS
  *
- * @copyright  (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
+ * @created    3rd April 2022
+ * @author     Llewellyn van der Merwe <https://git.vdm.dev/Llewellyn>
+ * @git        WEBD-325-45 <https://git.vdm.dev/Llewellyn/WEBD-325-45>
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 // NOTE: This file should remain compatible with PHP 5.2 to allow us to run our PHP minimum check and show a friendly error message
+// source: https://github.com/joomla/joomla-cms/blob/4.1-dev/index.php#L9
 
-// Define the application's minimum supported PHP version as a constant so it can be referenced within the application.
-define('JOOMLA_MINIMUM_PHP', '7.2.5');
+// Define the application's minimum supported PHP version as a constant, so it can be referenced within the application.
+define('OCTOLEO_MINIMUM_PHP', '7.2.5');
 
-if (version_compare(PHP_VERSION, JOOMLA_MINIMUM_PHP, '<'))
+if (version_compare(PHP_VERSION, OCTOLEO_MINIMUM_PHP, '<'))
 {
 	die(
-		str_replace(
-			'{{phpversion}}',
-			JOOMLA_MINIMUM_PHP,
-			file_get_contents(dirname(__FILE__) . '/../templates/system/incompatible.html')
-		)
+	str_replace(
+		'{{phpversion}}',
+		OCTOLEO_MINIMUM_PHP,
+		file_get_contents(dirname(__FILE__) . '/../templates/system/incompatible.html')
+	)
 	);
 }
 
 /**
  * Constant that is checked in included files to prevent direct access.
- * define() is used rather than "const" to not error for PHP 5.2 and lower
  */
-define('_JEXEC', 1);
+define('_LEXEC', 1);
 
-// Run the application - All executable code should be triggered through this file
+// We must setup some house rules, since we can't have all
+// this code just doing what it wants can we.... <<eWɘ>>yn growling
 require_once dirname(__FILE__) . '/includes/app.php';
-
-

week-03/project/composer.json

@@ -0,0 +1,71 @@
+{
+  "name": "octoleo/cms",
+  "type": "project",
+  "description": "Octoleo CMS",
+  "keywords": [
+    "octoleo",
+    "cms"
+  ],
+  "homepage": "https://github.com/mychamplain",
+  "license": "GPL-2.0-or-later",
+  "config": {
+    "optimize-autoloader": true,
+    "platform": {
+      "php": "7.2.5"
+    },
+    "vendor-dir": "libraries/vendor",
+    "github-protocols": ["https"],
+    "allow-plugins": {
+      "dealerdirect/phpcodesniffer-composer-installer": true
+    }
+  },
+  "autoload": {
+    "psr-4": {
+      "Octoleo\\CMS\\": "libraries/src/"
+    }
+  },
+  "require": {
+    "php": "^7.2.5",
+    "joomla/application": "~2.0",
+    "joomla/archive": "~2.0",
+    "joomla/authentication": "~2.0",
+    "joomla/console": "~2.0",
+    "joomla/controller": "~2.0",
+    "joomla/crypt": "~2.0",
+    "joomla/data": "~2.0",
+    "joomla/database": "~2.0",
+    "joomla/di": "~2.0",
+    "joomla/event": "~2.0",
+    "joomla/filter": "~2.0",
+    "joomla/filesystem": "~2.0",
+    "joomla/http": "~2.0",
+    "joomla/input": "~2.0",
+    "joomla/model": "~2.0",
+    "joomla/preload": "~2.0",
+    "joomla/ldap": "~2.0",
+    "joomla/oauth1": "~2.0",
+    "joomla/oauth2": "~2.0",
+    "joomla/registry": "~2.0",
+    "joomla/renderer": "~2.0",
+    "joomla/router": "~2.0",
+    "joomla/session": "~2.0",
+    "joomla/string": "~2.0",
+    "joomla/uri": "~2.0",
+    "joomla/utilities": "~2.0",
+    "algo26-matthias/idna-convert": "~3.0",
+    "joomla/view": "~2.0",
+    "laminas/laminas-diactoros": "^2.3",
+    "monolog/monolog": "^2.1",
+    "psr/link": "^1.0",
+    "ramsey/uuid": "^4.0.1",
+    "robmorgan/phinx": "^0.12.3",
+    "defuse/php-encryption": "^2.0",
+    "symfony/asset": "^5.1.2",
+    "symfony/process": "^5.1.2",
+    "symfony/web-link": "^5.1.2",
+    "symfony/yaml": "^5.1.2",
+    "theiconic/php-ga-measurement-protocol": "^2.7.2",
+    "twig/twig": "^2.13",
+    "phpmailer/phpmailer": "~6.0"
+  }
+}

week-03/project/includes/app.php

@@ -1,63 +1,95 @@
 <?php
 /**
- * @package    Joomla.Site
+ * @package    Octoleo CMS
  *
- * @copyright  (C) 2017 Open Source Matters, Inc. <https://www.joomla.org>
+ * @created    9th April 2022
+ * @author     Llewellyn van der Merwe <https://git.vdm.dev/Llewellyn>
+ * @git        WEBD-325-45 <https://git.vdm.dev/Llewellyn/WEBD-325-45>
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
-
-// Saves the start time and memory usage.
-$startTime = microtime(1);
-$startMem  = memory_get_usage();
+defined('_LEXEC') or die;
 
+// Option to override defines from root folder
+// source: https://github.com/joomla/joomla-cms/blob/4.1-dev/includes/app.php#L15
 if (file_exists(dirname(__DIR__) . '/defines.php'))
 {
 	include_once dirname(__DIR__) . '/defines.php';
 }
 
-if (!defined('_JDEFINES'))
+// Load the default defines
+// source: https://github.com/joomla/joomla-cms/blob/4.1-dev/includes/app.php#L20
+if (!defined('_LDEFINES'))
 {
-	define('JPATH_BASE', dirname(__DIR__));
-	require_once JPATH_BASE . '/includes/defines.php';
+	define('LPATH_BASE', dirname(__DIR__));
+	require_once LPATH_BASE . '/includes/defines.php';
 }
 
 // Check for presence of vendor dependencies not included in the git repository
-if (!file_exists(JPATH_LIBRARIES . '/vendor/autoload.php') || !is_dir(JPATH_ROOT . '/media/vendor'))
+// source: https://github.com/joomla/joomla-cms/blob/4.1-dev/includes/app.php#L26
+if (!file_exists(LPATH_LIBRARIES . '/vendor/autoload.php'))
 {
-	echo file_get_contents(JPATH_ROOT . '/templates/system/build_incomplete.html');
+	echo file_get_contents(LPATH_ROOT . '/templates/system/build_incomplete.html');
 
 	exit;
 }
 
-require_once JPATH_BASE . '/includes/framework.php';
+// Load configuration (or install)
+// source: https://github.com/joomla/joomla-cms/blob/4.1-dev/includes/app.php#L34
+require_once LPATH_BASE . '/includes/framework.php';
 
-// Set profiler start time and memory usage and mark afterLoad in the profiler.
-JDEBUG && \Joomla\CMS\Profiler\Profiler::getInstance('Application')->setStart($startTime, $startMem)->mark('afterLoad');
+// Wrap in a try/catch so we can display an error if need be
+try
+{
+	$container = (new Joomla\DI\Container)
+		->registerServiceProvider(new Octoleo\CMS\Service\SiteApplicationProvider)
+		->registerServiceProvider(new Octoleo\CMS\Service\ConfigurationProvider(LPATH_CONFIGURATION . '/octoconfig.php'))
+		->registerServiceProvider(new Joomla\Database\Service\DatabaseProvider)
+		->registerServiceProvider(new Octoleo\CMS\Service\EventProvider)
+		->registerServiceProvider(new Octoleo\CMS\Service\HttpProvider)
+		->registerServiceProvider(new Octoleo\CMS\Service\LoggingProvider)
+		->registerServiceProvider(new Joomla\Preload\Service\PreloadProvider)
+		->registerServiceProvider(new Octoleo\CMS\Service\TemplatingProvider);
 
-// Boot the DI container
-$container = \Joomla\CMS\Factory::getContainer();
+	// Alias the web application to Octoleo's base application class as this is the primary application for the environment
+	$container->alias(Joomla\Application\AbstractApplication::class, Joomla\Application\AbstractWebApplication::class);
 
-/*
- * Alias the session service keys to the web session service as that is the primary session backend for this application
- *
- * In addition to aliasing "common" service keys, we also create aliases for the PHP classes to ensure autowiring objects
- * is supported.  This includes aliases for aliased class names, and the keys for aliased class names should be considered
- * deprecated to be removed when the class name alias is removed as well.
- */
-$container->alias('session.web', 'session.web.site')
-	->alias('session', 'session.web.site')
-	->alias('JSession', 'session.web.site')
-	->alias(\Joomla\CMS\Session\Session::class, 'session.web.site')
-	->alias(\Joomla\Session\Session::class, 'session.web.site')
-	->alias(\Joomla\Session\SessionInterface::class, 'session.web.site');
+	// Alias the web logger to the PSR-3 interface as this is the primary logger for the environment
+	$container->alias(Monolog\Logger::class, 'monolog.logger.application.web')
+		->alias(Psr\Log\LoggerInterface::class, 'monolog.logger.application.web');
+}
+catch (\Throwable $e)
+{
+	error_log($e);
 
-// Instantiate the application.
-$app = $container->get(\Joomla\CMS\Application\SiteApplication::class);
+	header('HTTP/1.1 500 Internal Server Error', null, 500);
+	echo '<html><head><title>Container Initialization Error</title></head><body><h1>Container Initialization Error</h1><p>An error occurred while creating the DI container: ' . $e->getMessage() . '</p></body></html>';
 
-// Set the application as global app
-\Joomla\CMS\Factory::$application = $app;
+	exit(1);
+}
 
-// Execute the application.
-$app->execute();
+// Execute the application
+// source: https://github.com/joomla/framework.joomla.org/blob/master/www/index.php#L85
+try
+{
+	$app = $container->get(Joomla\Application\AbstractApplication::class);
+	// Set the application as global app
+	\Octoleo\CMS\Factory::$application = $app;
+	// Execute the application.
+	$app->execute();
+}
+catch (\Throwable $e)
+{
+	error_log($e);
+
+	if (!headers_sent())
+	{
+		header('HTTP/1.1 500 Internal Server Error', null, 500);
+		header('Content-Type: text/html; charset=utf-8');
+	}
+
+	echo '<html><head><title>Application Error</title></head><body><h1>Application Error</h1><p>An error occurred while executing the application: ' . $e->getMessage() . '</p></body></html>';
+
+	exit(1);
+}
+// I am just playing around... ((ewɘ))yn purring

week-03/project/includes/defines.php

@@ -1,26 +1,23 @@
 <?php
 /**
- * @package    Joomla.Site
+ * @package    Octoleo CMS
  *
- * @copyright  (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
+ * @created    9th April 2022
+ * @author     Llewellyn van der Merwe <https://git.vdm.dev/Llewellyn>
+ * @git        WEBD-325-45 <https://git.vdm.dev/Llewellyn/WEBD-325-45>
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('_LEXEC') or die;
 
 // Global definitions
-$parts = explode(DIRECTORY_SEPARATOR, JPATH_BASE);
+$parts = explode(DIRECTORY_SEPARATOR, LPATH_BASE);
 
 // Defines.
-define('JPATH_ROOT',          implode(DIRECTORY_SEPARATOR, $parts));
-define('JPATH_SITE',          JPATH_ROOT);
-define('JPATH_CONFIGURATION', JPATH_ROOT);
-define('JPATH_ADMINISTRATOR', JPATH_ROOT . DIRECTORY_SEPARATOR . 'administrator');
-define('JPATH_LIBRARIES',     JPATH_ROOT . DIRECTORY_SEPARATOR . 'libraries');
-define('JPATH_PLUGINS',       JPATH_ROOT . DIRECTORY_SEPARATOR . 'plugins');
-define('JPATH_INSTALLATION',  JPATH_ROOT . DIRECTORY_SEPARATOR . 'installation');
-define('JPATH_THEMES',        JPATH_BASE . DIRECTORY_SEPARATOR . 'templates');
-define('JPATH_CACHE',         JPATH_ADMINISTRATOR . DIRECTORY_SEPARATOR . 'cache');
-define('JPATH_MANIFESTS',     JPATH_ADMINISTRATOR . DIRECTORY_SEPARATOR . 'manifests');
-define('JPATH_API',           JPATH_ROOT . DIRECTORY_SEPARATOR . 'api');
-define('JPATH_CLI',           JPATH_ROOT . DIRECTORY_SEPARATOR . 'cli');
+define('LPATH_ROOT',          implode(DIRECTORY_SEPARATOR, $parts));
+define('LPATH_SITE',          LPATH_ROOT);
+define('LPATH_CONFIGURATION', LPATH_ROOT);
+define('LPATH_ADMINISTRATOR', LPATH_ROOT . DIRECTORY_SEPARATOR . 'administrator');
+define('LPATH_LIBRARIES',     LPATH_ROOT . DIRECTORY_SEPARATOR . 'libraries');
+define('LPATH_INSTALLATION',  LPATH_ROOT . DIRECTORY_SEPARATOR . 'installation');
+define('LPATH_TEMPLATES',     LPATH_ROOT . DIRECTORY_SEPARATOR . 'templates/site');

week-03/project/includes/framework.php

@@ -1,25 +1,26 @@
 <?php
 /**
- * @package    Joomla.Site
+ * @package    Octoleo CMS
  *
- * @copyright  (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
+ * @created    9th April 2022
+ * @author     Llewellyn van der Merwe <https://git.vdm.dev/Llewellyn>
+ * @git        WEBD-325-45 <https://git.vdm.dev/Llewellyn/WEBD-325-45>
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Version;
-use Joomla\Utilities\IpHelper;
+defined('_LEXEC') or die;
 
 // System includes
-require_once JPATH_LIBRARIES . '/bootstrap.php';
+// source: https://github.com/joomla/joomla-cms/blob/4.1-dev/includes/framework.php#L14
+require_once LPATH_LIBRARIES . '/bootstrap.php';
 
-// Installation check, and check on removal of the install directory.
-if (!file_exists(JPATH_CONFIGURATION . '/configuration.php')
-	|| (filesize(JPATH_CONFIGURATION . '/configuration.php') < 10)
-	|| (file_exists(JPATH_INSTALLATION . '/index.php') && (false === (new Version)->isInDevelopmentState())))
+// Installation check, and check on removal of the installation directory.
+// source: https://github.com/joomla/joomla-cms/blob/4.1-dev/includes/framework.php#L17
+if (!file_exists(LPATH_CONFIGURATION . '/octoconfig.php')
+	|| (filesize(LPATH_CONFIGURATION . '/octoconfig.php') < 10)
+	|| (file_exists(LPATH_INSTALLATION . '/index.php')))
 {
-	if (file_exists(JPATH_INSTALLATION . '/index.php'))
+	if (file_exists(LPATH_INSTALLATION . '/index.php'))
 	{
 		header('Location: ' . substr($_SERVER['REQUEST_URI'], 0, strpos($_SERVER['REQUEST_URI'], 'index.php')) . 'installation/index.php');
 
@@ -32,92 +33,3 @@ if (!file_exists(JPATH_CONFIGURATION . '/configuration.php')
 		exit;
 	}
 }
-
-// Pre-Load configuration. Don't remove the Output Buffering due to BOM issues, see JCode 26026
-ob_start();
-require_once JPATH_CONFIGURATION . '/configuration.php';
-ob_end_clean();
-
-// System configuration.
-$config = new JConfig;
-
-// Set the error_reporting, and adjust a global Error Handler
-switch ($config->error_reporting)
-{
-	case 'default':
-	case '-1':
-
-		break;
-
-	case 'none':
-	case '0':
-		error_reporting(0);
-
-		break;
-
-	case 'simple':
-		error_reporting(E_ERROR | E_WARNING | E_PARSE);
-		ini_set('display_errors', 1);
-
-		break;
-
-	case 'maximum':
-	case 'development': // <= Stays for backward compatibility, @TODO: can be removed in 5.0
-		error_reporting(E_ALL);
-		ini_set('display_errors', 1);
-
-		break;
-
-	default:
-		error_reporting($config->error_reporting);
-		ini_set('display_errors', 1);
-
-		break;
-}
-
-if (!defined('JDEBUG'))
-{
-	define('JDEBUG', $config->debug);
-}
-
-// Check deprecation logging
-if (empty($config->log_deprecated))
-{
-	// Reset handler for E_USER_DEPRECATED
-	set_error_handler(null, E_USER_DEPRECATED);
-}
-else
-{
-	// Make sure handler for E_USER_DEPRECATED is registered
-	set_error_handler(['Joomla\CMS\Exception\ExceptionHandler', 'handleUserDeprecatedErrors'], E_USER_DEPRECATED);
-}
-
-if (JDEBUG || $config->error_reporting === 'maximum')
-{
-	// Set new Exception handler with debug enabled
-	$errorHandler->setExceptionHandler(
-		[
-			new \Symfony\Component\ErrorHandler\ErrorHandler(null, true),
-			'renderException'
-		]
-	);
-}
-
-/**
- * Correctly set the allowing of IP Overrides if behind a trusted proxy/load balancer.
- *
- * We need to do this as high up the stack as we can, as the default in \Joomla\Utilities\IpHelper is to
- * $allowIpOverride = true which is the wrong default for a generic site NOT behind a trusted proxy/load balancer.
- */
-if (property_exists($config, 'behind_loadbalancer') && $config->behind_loadbalancer == 1)
-{
-	// If Joomla is configured to be behind a trusted proxy/load balancer, allow HTTP Headers to override the REMOTE_ADDR
-	IpHelper::setAllowIpOverrides(true);
-}
-else
-{
-	// We disable the allowing of IP overriding using headers by default.
-	IpHelper::setAllowIpOverrides(false);
-}
-
-unset($config);

week-03/project/index.php

@@ -1,22 +1,25 @@
 <?php
 /**
- * @package    Joomla.Site
+ * @package    Octoleo CMS
  *
- * @copyright  (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
+ * @created    3rd April 2022
+ * @author     Llewellyn van der Merwe <https://git.vdm.dev/Llewellyn>
+ * @git        WEBD-325-45 <https://git.vdm.dev/Llewellyn/WEBD-325-45>
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 // NOTE: This file should remain compatible with PHP 5.2 to allow us to run our PHP minimum check and show a friendly error message
+// source: https://github.com/joomla/joomla-cms/blob/4.1-dev/index.php#L9
 
-// Define the application's minimum supported PHP version as a constant so it can be referenced within the application.
-define('JOOMLA_MINIMUM_PHP', '7.2.5');
+// Define the application's minimum supported PHP version as a constant, so it can be referenced within the application.
+define('OCTOLEO_MINIMUM_PHP', '7.2.5');
 
-if (version_compare(PHP_VERSION, JOOMLA_MINIMUM_PHP, '<'))
+if (version_compare(PHP_VERSION, OCTOLEO_MINIMUM_PHP, '<'))
 {
 	die(
 		str_replace(
 			'{{phpversion}}',
-			JOOMLA_MINIMUM_PHP,
+			OCTOLEO_MINIMUM_PHP,
 			file_get_contents(dirname(__FILE__) . '/templates/system/incompatible.html')
 		)
 	);
@@ -24,9 +27,9 @@ if (version_compare(PHP_VERSION, JOOMLA_MINIMUM_PHP, '<'))
 
 /**
  * Constant that is checked in included files to prevent direct access.
- * define() is used rather than "const" to not error for PHP 5.2 and lower
  */
-define('_JEXEC', 1);
+define('_LEXEC', 1);
 
-// Run the application - All executable code should be triggered through this file
+// We must setup some house rules, since we can't have all
+// this code just doing what it wants can we?... <<eWɘ>>yn growling
 require_once dirname(__FILE__) . '/includes/app.php';

week-03/project/installation/includes/app.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * @package    Octoleo CMS
+ *
+ * @created    9th April 2022
+ * @author     Llewellyn van der Merwe <https://git.vdm.dev/Llewellyn>
+ * @git        WEBD-325-45 <https://git.vdm.dev/Llewellyn/WEBD-325-45>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_LEXEC') or die;
+
+// Option to override defines from root folder
+// source: https://github.com/joomla/joomla-cms/blob/4.1-dev/includes/app.php#L15
+if (file_exists(dirname(__DIR__) . '/defines.php'))
+{
+	include_once dirname(__DIR__) . '/defines.php';
+}
+
+// Load the default defines
+// source: https://github.com/joomla/joomla-cms/blob/4.1-dev/includes/app.php#L20
+if (!defined('_LDEFINES'))
+{
+	define('LPATH_BASE', dirname(__DIR__));
+	require_once LPATH_BASE . '/includes/defines.php';
+}
+
+// I have not yet had time to finish this part of the application (CMS)
+echo file_get_contents(LPATH_ROOT . '/templates/system/install_notice.html');
+
+exit;

week-03/project/installation/includes/defines.php

@@ -0,0 +1,23 @@
+<?php
+/**
+ * @package    Octoleo CMS
+ *
+ * @created    9th April 2022
+ * @author     Llewellyn van der Merwe <https://git.vdm.dev/Llewellyn>
+ * @git        WEBD-325-45 <https://git.vdm.dev/Llewellyn/WEBD-325-45>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_LEXEC') or die;
+
+// Global definitions
+$parts = explode(DIRECTORY_SEPARATOR, LPATH_BASE);
+array_pop($parts);
+
+// Defines.
+define('LPATH_ROOT',          implode(DIRECTORY_SEPARATOR, $parts));
+define('LPATH_SITE',          LPATH_ROOT);
+define('LPATH_CONFIGURATION', LPATH_ROOT);
+define('LPATH_ADMINISTRATOR', LPATH_ROOT . DIRECTORY_SEPARATOR . 'administrator');
+define('LPATH_LIBRARIES',     LPATH_ROOT . DIRECTORY_SEPARATOR . 'libraries');
+define('LPATH_INSTALLATION',  LPATH_ROOT . DIRECTORY_SEPARATOR . 'installation');

week-03/project/installation/includes/framework.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * @package    Octoleo CMS
+ *
+ * @created    9th April 2022
+ * @author     Llewellyn van der Merwe <https://git.vdm.dev/Llewellyn>
+ * @git        WEBD-325-45 <https://git.vdm.dev/Llewellyn/WEBD-325-45>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_LEXEC') or die;
+
+// System includes
+// source: https://github.com/joomla/joomla-cms/blob/4.1-dev/administrator/includes/framework.php#L14
+require_once LPATH_LIBRARIES . '/bootstrap.php';
+
+// Installation check, and check on removal of the installation directory.
+// source: https://github.com/joomla/joomla-cms/blob/4.1-dev/administrator/includes/framework.php#L17
+if (!file_exists(LPATH_CONFIGURATION . '/octoconfig.php')
+	|| (filesize(LPATH_CONFIGURATION . '/octoconfig.php') < 10)
+	|| (file_exists(LPATH_INSTALLATION . '/index.php')))
+{
+	if (file_exists(LPATH_INSTALLATION . '/index.php'))
+	{
+		header('Location: ../installation/index.php');
+
+		exit;
+	}
+	else
+	{
+		echo 'No configuration file found and no installation code available. Exiting...';
+
+		exit;
+	}
+}
+
+// Pre-Load configuration. Don't remove the Output Buffering due to BOM issues.
+// source: https://github.com/joomla/joomla-cms/blob/4.1-dev/administrator/includes/framework.php#L36
+ob_start();
+require_once LPATH_CONFIGURATION . '/octoconfig.php';
+ob_end_clean();

week-03/project/installation/index.php

@@ -0,0 +1,35 @@
+<?php
+/**
+ * @package    Octoleo CMS
+ *
+ * @created    9th April 2022
+ * @author     Llewellyn van der Merwe <https://git.vdm.dev/Llewellyn>
+ * @git        WEBD-325-45 <https://git.vdm.dev/Llewellyn/WEBD-325-45>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// NOTE: This file should remain compatible with PHP 5.2 to allow us to run our PHP minimum check and show a friendly error message
+// source: https://github.com/joomla/joomla-cms/blob/4.1-dev/index.php#L9
+
+// Define the application's minimum supported PHP version as a constant, so it can be referenced within the application.
+define('OCTOLEO_MINIMUM_PHP', '7.2.5');
+
+if (version_compare(PHP_VERSION, OCTOLEO_MINIMUM_PHP, '<'))
+{
+	die(
+		str_replace(
+			'{{phpversion}}',
+			OCTOLEO_MINIMUM_PHP,
+			file_get_contents(dirname(__FILE__) . '/../templates/system/incompatible.html')
+		)
+	);
+}
+
+/**
+ * Constant that is checked in included files to prevent direct access.
+ */
+define('_LEXEC', 1);
+
+// We must setup some house rules, since we can't have all
+// this code just doing what it wants can we.... <<eWɘ>>yn growling
+require_once dirname(__FILE__) . '/includes/app.php';

week-03/project/libraries/bootstrap.php

@@ -1,16 +1,18 @@
 <?php
 /**
- * Bootstrap file for the Joomla! CMS [with legacy libraries].
- * Including this file into your application will make Joomla libraries available for use.
+ * @package    Octoleo CMS
  *
- * @copyright  (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @created    9th April 2022
+ * @author     Llewellyn van der Merwe <https://git.vdm.dev/Llewellyn>
+ * @git        WEBD-325-45 <https://git.vdm.dev/Llewellyn/WEBD-325-45>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('_LEXEC') or die;
 
 // Set the platform root path as a constant if necessary.
-defined('JPATH_PLATFORM') or define('JPATH_PLATFORM', __DIR__);
+// source: https://github.com/joomla/joomla-cms/blob/4.1-dev/libraries/bootstrap.php#L12
+defined('LPATH_PLATFORM') or define('LPATH_PLATFORM', __DIR__);
 
 // Detect the native operating system type.
 $os = strtoupper(substr(PHP_OS, 0, 3));
@@ -19,72 +21,28 @@ defined('IS_WIN') or define('IS_WIN', ($os === 'WIN'));
 defined('IS_UNIX') or define('IS_UNIX', (($os !== 'MAC') && ($os !== 'WIN')));
 
 // Import the library loader if necessary.
-if (!class_exists('JLoader'))
+if (!class_exists('LLoader'))
 {
-	require_once JPATH_PLATFORM . '/loader.php';
+	require_once LPATH_PLATFORM . '/loader.php';
 
 	// If JLoader still does not exist panic.
-	if (!class_exists('JLoader'))
+	if (!class_exists('LLoader'))
 	{
-		throw new RuntimeException('Joomla Platform not loaded.');
+		throw new RuntimeException('Octoleo Platform not loaded.');
 	}
 }
 
 // Setup the autoloaders.
-JLoader::setup();
+LLoader::setup();
 
 // Create the Composer autoloader
 /** @var \Composer\Autoload\ClassLoader $loader */
-$loader = require JPATH_LIBRARIES . '/vendor/autoload.php';
+$loader = require LPATH_LIBRARIES . '/vendor/autoload.php';
 
 // We need to pull our decorated class loader into memory before unregistering Composer's loader
-class_exists('\\Joomla\\CMS\\Autoload\\ClassLoader');
+class_exists('\\Octoleo\\CMS\\Autoload\\ClassLoader');
 
 $loader->unregister();
 
 // Decorate Composer autoloader
-spl_autoload_register([new \Joomla\CMS\Autoload\ClassLoader($loader), 'loadClass'], true, true);
-
-// Register the class aliases for Framework classes that have replaced their Platform equivalents
-require_once JPATH_LIBRARIES . '/classmap.php';
-
-/**
- * Register the global exception handler. And set error level to server default error level.
- * The error level may be changed later in boot up process, after application config will be loaded.
- * Do not remove the variable, to allow to use it further, after including this file.
- */
-$errorHandler = \Symfony\Component\ErrorHandler\ErrorHandler::register();
-\Symfony\Component\ErrorHandler\ErrorRenderer\HtmlErrorRenderer::setTemplate(__DIR__ . '/../templates/system/fatal.php');
-
-// Register the error handler which processes E_USER_DEPRECATED errors
-if (error_reporting() & E_USER_DEPRECATED)
-{
-	set_error_handler(['Joomla\CMS\Exception\ExceptionHandler', 'handleUserDeprecatedErrors'], E_USER_DEPRECATED);
-}
-
-// Suppress phar stream wrapper for non .phar files
-$behavior = new \TYPO3\PharStreamWrapper\Behavior;
-\TYPO3\PharStreamWrapper\Manager::initialize(
-	$behavior->withAssertion(new \TYPO3\PharStreamWrapper\Interceptor\PharExtensionInterceptor)
-);
-
-if (in_array('phar', stream_get_wrappers()))
-{
-	stream_wrapper_unregister('phar');
-	stream_wrapper_register('phar', 'TYPO3\\PharStreamWrapper\\PharStreamWrapper');
-}
-
-// Define the Joomla version if not already defined.
-defined('JVERSION') or define('JVERSION', (new \Joomla\CMS\Version)->getShortVersion());
-
-// Set up the message queue logger for web requests
-if (array_key_exists('REQUEST_METHOD', $_SERVER))
-{
-	\Joomla\CMS\Log\Log::addLogger(['logger' => 'messagequeue'], \Joomla\CMS\Log\Log::ALL, ['jerror']);
-}
-
-// Register the Crypto lib
-JLoader::register('Crypto', JPATH_PLATFORM . '/php-encryption/Crypto.php');
-
-// Register the PasswordHash library.
-JLoader::register('PasswordHash', JPATH_PLATFORM . '/phpass/PasswordHash.php');
+spl_autoload_register([new \Octoleo\CMS\Autoload\ClassLoader($loader), 'loadClass'], true, true);

week-03/project/libraries/loader.php

@@ -1,19 +1,24 @@
 <?php
 /**
+ * @package    Octoleo CMS
+ *
  * Joomla! Content Management System
  *
- * @copyright  (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
+ * @source    https://github.com/joomla/joomla-cms/blob/4.1-dev/libraries/loader.php
+ * @adapted   Llewellyn van der Merwe <https://git.vdm.dev/Llewellyn>
+ *
+ * @copyright (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license   GNU General Public License version 2 or later; see LICENSE.txt
+ **/
 
-defined('JPATH_PLATFORM') or die;
+defined('LPATH_PLATFORM') or die;
 
 /**
  * Static class to handle loading of libraries.
  *
- * @since    1.7.0
+ * @since    1.0.0
  */
-abstract class JLoader
+abstract class LLoader
 {
 	/**
 	 * Container for already imported library paths.
@@ -79,61 +84,6 @@ abstract class JLoader
 	 */
 	protected static $extensionRootFolders = array();
 
-	/**
-	 * Method to discover classes of a given type in a given path.
-	 *
-	 * @param   string   $classPrefix  The class name prefix to use for discovery.
-	 * @param   string   $parentPath   Full path to the parent folder for the classes to discover.
-	 * @param   boolean  $force        True to overwrite the autoload path value for the class if it already exists.
-	 * @param   boolean  $recurse      Recurse through all child directories as well as the parent path.
-	 *
-	 * @return  void
-	 *
-	 * @since       1.7.0
-	 * @deprecated  5.0   Classes should be autoloaded. Use JLoader::registerPrefix() or JLoader::registerNamespace() to register an autoloader for
-	 *                    your files.
-	 */
-	public static function discover($classPrefix, $parentPath, $force = true, $recurse = false)
-	{
-		try
-		{
-			if ($recurse)
-			{
-				$iterator = new RecursiveIteratorIterator(
-					new RecursiveDirectoryIterator($parentPath),
-					RecursiveIteratorIterator::SELF_FIRST
-				);
-			}
-			else
-			{
-				$iterator = new DirectoryIterator($parentPath);
-			}
-
-			/** @type  $file  DirectoryIterator */
-			foreach ($iterator as $file)
-			{
-				$fileName = $file->getFilename();
-
-				// Only load for php files.
-				if ($file->isFile() && $file->getExtension() === 'php')
-				{
-					// Get the class name and full path for each file.
-					$class = strtolower($classPrefix . preg_replace('#\.php$#', '', $fileName));
-
-					// Register the class with the autoloader if not already registered or the force flag is set.
-					if ($force || empty(self::$classes[$class]))
-					{
-						self::register($class, $file->getPath() . '/' . $fileName);
-					}
-				}
-			}
-		}
-		catch (UnexpectedValueException $e)
-		{
-			// Exception will be thrown if the path is not a directory. Ignore it.
-		}
-	}
-
 	/**
 	 * Method to get the list of registered classes and their respective file paths for the autoloader.
 	 *
@@ -170,74 +120,6 @@ abstract class JLoader
 		return self::$namespaces;
 	}
 
-	/**
-	 * Loads a class from specified directories.
-	 *
-	 * @param   string  $key   The class name to look for (dot notation).
-	 * @param   string  $base  Search this directory for the class.
-	 *
-	 * @return  boolean  True on success.
-	 *
-	 * @since       1.7.0
-	 * @deprecated  5.0   Classes should be autoloaded. Use JLoader::registerPrefix() or JLoader::registerNamespace() to register an autoloader for
-	 *                    your files.
-	 */
-	public static function import($key, $base = null)
-	{
-		// Only import the library if not already attempted.
-		if (!isset(self::$imported[$key]))
-		{
-			// Setup some variables.
-			$success = false;
-			$parts   = explode('.', $key);
-			$class   = array_pop($parts);
-			$base    = (!empty($base)) ? $base : __DIR__;
-			$path    = str_replace('.', DIRECTORY_SEPARATOR, $key);
-
-			// Handle special case for helper classes.
-			if ($class === 'helper')
-			{
-				$class = ucfirst(array_pop($parts)) . ucfirst($class);
-			}
-			// Standard class.
-			else
-			{
-				$class = ucfirst($class);
-			}
-
-			// If we are importing a library from the Joomla namespace set the class to autoload.
-			if (strpos($path, 'joomla') === 0)
-			{
-				// Since we are in the Joomla namespace prepend the classname with J.
-				$class = 'J' . $class;
-
-				// Only register the class for autoloading if the file exists.
-				if (is_file($base . '/' . $path . '.php'))
-				{
-					self::$classes[strtolower($class)] = $base . '/' . $path . '.php';
-					$success = true;
-				}
-			}
-			/*
-			 * If we are not importing a library from the Joomla namespace directly include the
-			 * file since we cannot assert the file/folder naming conventions.
-			 */
-			else
-			{
-				// If the file exists attempt to include it.
-				if (is_file($base . '/' . $path . '.php'))
-				{
-					$success = (bool) include_once $base . '/' . $path . '.php';
-				}
-			}
-
-			// Add the import key to the memory cache container.
-			self::$imported[$key] = $success;
-		}
-
-		return self::$imported[$key];
-	}
-
 	/**
 	 * Load the file for a class.
 	 *
@@ -287,41 +169,6 @@ abstract class JLoader
 		return false;
 	}
 
-	/**
-	 * Directly register a class to the autoload list.
-	 *
-	 * @param   string   $class  The class name to register.
-	 * @param   string   $path   Full path to the file that holds the class to register.
-	 * @param   boolean  $force  True to overwrite the autoload path value for the class if it already exists.
-	 *
-	 * @return  void
-	 *
-	 * @since       1.7.0
-	 * @deprecated  5.0   Classes should be autoloaded. Use JLoader::registerPrefix() or JLoader::registerNamespace() to register an autoloader for
-	 *                    your files.
-	 */
-	public static function register($class, $path, $force = true)
-	{
-		// When an alias exists, register it as well
-		if (array_key_exists(strtolower($class), self::$classAliases))
-		{
-			self::register(self::stripFirstBackslash(self::$classAliases[strtolower($class)]), $path, $force);
-		}
-
-		// Sanitize class name.
-		$class = strtolower($class);
-
-		// Only attempt to register the class if the name and file exist.
-		if (!empty($class) && is_file($path))
-		{
-			// Register the class with the autoloader if not already registered or the force flag is set.
-			if ($force || empty(self::$classes[$class]))
-			{
-				self::$classes[$class] = $path;
-			}
-		}
-	}
-
 	/**
 	 * Register a class prefix with lookup path.  This will allow developers to register library
 	 * packages with different class prefixes to the system autoloader.  More than one lookup path
@@ -345,7 +192,7 @@ abstract class JLoader
 		// Verify the library path exists.
 		if (!is_dir($path))
 		{
-			$path = (str_replace(JPATH_ROOT, '', $path) == $path) ? basename($path) : str_replace(JPATH_ROOT, '', $path);
+			$path = (str_replace(LPATH_ROOT, '', $path) == $path) ? basename($path) : str_replace(LPATH_ROOT, '', $path);
 
 			throw new RuntimeException('Library path ' . $path . ' cannot be found.', 500);
 		}
@@ -432,7 +279,7 @@ abstract class JLoader
 		// Verify the library path exists.
 		if (!is_dir($path))
 		{
-			$path = (str_replace(JPATH_ROOT, '', $path) == $path) ? basename($path) : str_replace(JPATH_ROOT, '', $path);
+			$path = (str_replace(LPATH_ROOT, '', $path) == $path) ? basename($path) : str_replace(LPATH_ROOT, '', $path);
 
 			throw new RuntimeException('Library path ' . $path . ' cannot be found.', 500);
 		}
@@ -461,15 +308,15 @@ abstract class JLoader
 	}
 
 	/**
-	 * Method to setup the autoloaders for the Joomla Platform.
+	 * Method to setup the autoloaders for the Octoleo Platform.
 	 * Since the SPL autoloaders are called in a queue we will add our explicit
 	 * class-registration based loader first, then fall back on the autoloader based on conventions.
 	 * This will allow people to register a class in a specific location and override platform libraries
 	 * as was previously possible.
 	 *
 	 * @param   boolean  $enablePsr       True to enable autoloading based on PSR-0.
-	 * @param   boolean  $enablePrefixes  True to enable prefix based class loading (needed to auto load the Joomla core).
-	 * @param   boolean  $enableClasses   True to enable class map based class loading (needed to auto load the Joomla core).
+	 * @param   boolean  $enablePrefixes  True to enable prefix based class loading (needed to auto load the Octoleo core).
+	 * @param   boolean  $enableClasses   True to enable class map based class loading (needed to auto load the Octoleo core).
 	 *
 	 * @return  void
 	 *
@@ -480,20 +327,20 @@ abstract class JLoader
 		if ($enableClasses)
 		{
 			// Register the class map based autoloader.
-			spl_autoload_register(array('JLoader', 'load'));
+			spl_autoload_register(array('LLoader', 'load'));
 		}
 
 		if ($enablePrefixes)
 		{
 			// Register the prefix autoloader.
-			spl_autoload_register(array('JLoader', '_autoload'));
+			spl_autoload_register(array('LLoader', '_autoload'));
 		}
 
 		if ($enablePsr)
 		{
 			// Register the PSR based autoloader.
-			spl_autoload_register(array('JLoader', 'loadByPsr'));
-			spl_autoload_register(array('JLoader', 'loadByAlias'));
+			spl_autoload_register(array('LLoader', 'loadByPsr'));
+			spl_autoload_register(array('LLoader', 'loadByAlias'));
 		}
 	}
 
@@ -505,7 +352,7 @@ abstract class JLoader
 	 * @return  boolean  True on success, false otherwise.
 	 *
 	 * @since       3.7.0
-	 * @deprecated  5.0 Use JLoader::loadByPsr instead
+	 * @deprecated  5.0 Use LLoader::loadByPsr instead
 	 */
 	public static function loadByPsr4($class)
 	{
@@ -750,41 +597,3 @@ abstract class JLoader
 		return $class && $class[0] === '\\' ? substr($class, 1) : $class;
 	}
 }
-
-// Check if jexit is defined first (our unit tests mock this)
-if (!function_exists('jexit'))
-{
-	/**
-	 * Global application exit.
-	 *
-	 * This function provides a single exit point for the platform.
-	 *
-	 * @param   mixed  $message  Exit code or string. Defaults to zero.
-	 *
-	 * @return  void
-	 *
-	 * @codeCoverageIgnore
-	 * @since   1.7.0
-	 */
-	function jexit($message = 0)
-	{
-		exit($message);
-	}
-}
-
-/**
- * Intelligent file importer.
- *
- * @param   string  $path  A dot syntax path.
- * @param   string  $base  Search this directory for the class.
- *
- * @return  boolean  True on success.
- *
- * @since       1.7.0
- * @deprecated  5.0   Classes should be autoloaded. Use JLoader::registerPrefix() or JLoader::registerNamespace() to register an autoloader for
- *                    your files.
- */
-function jimport($path, $base = null)
-{
-	return JLoader::import($path, $base);
-}

week-03/project/libraries/src/Application/AdminApplication.php

@@ -6,10 +6,12 @@
  * @license    http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License Version 2 or Later
  */
 
-namespace Joomla\FrameworkWebsite;
+namespace Octoleo\CMS\Application;
 
 use Joomla\Application\AbstractWebApplication;
 use Joomla\Application\Controller\ControllerResolverInterface;
+use Joomla\Application\SessionAwareWebApplicationInterface;
+use Joomla\Application\SessionAwareWebApplicationTrait;
 use Joomla\Application\Web\WebClient;
 use Joomla\Input\Input;
 use Joomla\Registry\Registry;
@@ -17,10 +19,13 @@ use Joomla\Router\RouterInterface;
 use Psr\Http\Message\ResponseInterface;
 
 /**
- * Web application class
+ * Site application class
+ * source: https://github.com/joomla/framework.joomla.org/blob/master/src/WebApplication.php
  */
-class WebApplication extends AbstractWebApplication
+class AdminApplication extends AbstractWebApplication implements SessionAwareWebApplicationInterface, SessionMessageAwareInterface, IdentityAwareInterface
 {
+	use IdentityAwareTrait, SessionMessageAwareTrait, SessionAwareWebApplicationTrait;
+
 	/**
 	 * The application's controller resolver.
 	 *
@@ -82,4 +87,4 @@ class WebApplication extends AbstractWebApplication
 
 		\call_user_func($this->controllerResolver->resolve($route));
 	}
-}
+}

week-03/project/libraries/src/Application/IdentityAwareInterface.php

@@ -0,0 +1,57 @@
+<?php
+/**
+ * @package    Octoleo CMS
+ *
+ * @created    9th April 2022
+ * @author     Llewellyn van der Merwe <https://git.vdm.dev/Llewellyn>
+ * @git        WEBD-325-45 <https://git.vdm.dev/Llewellyn/WEBD-325-45>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Octoleo\CMS\Application;
+
+use Octoleo\CMS\User\User;
+use Octoleo\CMS\User\UserFactoryInterface;
+
+interface IdentityAwareInterface
+{
+	/**
+	 * Get the application identity.
+	 *
+	 * @return  User
+	 *
+	 * @since   1.0.0
+	 */
+	public function getIdentity(): User;
+
+	/**
+	 * Allows the application to load a custom or default identity.
+	 *
+	 * @param   User  $identity  An optional identity object. If omitted, a null user object is created.
+	 *
+	 * @return  $this
+	 *
+	 * @since   1.0.0
+	 */
+	public function loadIdentity(User $identity = null): IdentityAwareInterface;
+
+	/**
+	 * Set the user factory to use.
+	 *
+	 * @param   UserFactoryInterface  $userFactory  The user factory to use
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0.0
+	 */
+	public function setUserFactory(UserFactoryInterface $userFactory);
+
+	/**
+	 * Get the user factory to use.
+	 *
+	 * @return  UserFactoryInterface
+	 *
+	 * @since   1.0.0
+	 */
+	public function getUserFactory(): UserFactoryInterface;
+}

week-03/project/libraries/src/Application/IdentityAwareTrait.php

@@ -6,25 +6,23 @@
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
-namespace Joomla\CMS\Application;
+namespace Octoleo\CMS\Application;
 
-\defined('JPATH_PLATFORM') or die;
-
-use Joomla\CMS\User\User;
-use Joomla\CMS\User\UserFactoryInterface;
+use Octoleo\CMS\User\User;
+use Octoleo\CMS\User\UserFactoryInterface;
 
 /**
  * Trait for application classes which are identity (user) aware
  *
- * @since  4.0.0
+ * @since  1.0.0
  */
-trait IdentityAware
+trait IdentityAwareTrait
 {
 	/**
 	 * The application identity object.
 	 *
 	 * @var    User
-	 * @since  4.0.0
+	 * @since  1.0.0
 	 */
 	protected $identity;
 
@@ -32,7 +30,7 @@ trait IdentityAware
 	 * UserFactoryInterface
 	 *
 	 * @var    UserFactoryInterface
-	 * @since  4.0.0
+	 * @since  1.0.0
 	 */
 	private $userFactory;
 
@@ -41,9 +39,9 @@ trait IdentityAware
 	 *
 	 * @return  User
 	 *
-	 * @since   4.0.0
+	 * @since   1.0.0
 	 */
-	public function getIdentity()
+	public function getIdentity(): User
 	{
 		return $this->identity;
 	}
@@ -53,11 +51,11 @@ trait IdentityAware
 	 *
 	 * @param   User  $identity  An optional identity object. If omitted, a null user object is created.
 	 *
-	 * @return  $this
+	 * @return  IdentityAwareInterface
 	 *
-	 * @since   4.0.0
+	 * @since   1.0.0
 	 */
-	public function loadIdentity(User $identity = null)
+	public function loadIdentity(User $identity = null): IdentityAwareInterface
 	{
 		$this->identity = $identity ?: $this->userFactory->loadUserById(0);
 
@@ -71,10 +69,23 @@ trait IdentityAware
 	 *
 	 * @return  void
 	 *
-	 * @since   4.0.0
+	 * @since   1.0.0
 	 */
 	public function setUserFactory(UserFactoryInterface $userFactory)
 	{
 		$this->userFactory = $userFactory;
 	}
+
+	/**
+	 * Get the user factory to use.
+	 *
+	 * @return  UserFactoryInterface
+	 *
+	 * @since   1.0.0
+	 */
+	public function getUserFactory(): UserFactoryInterface
+	{
+		return $this->userFactory;
+	}
 }
+

week-03/project/libraries/src/Application/SessionMessageAwareInterface.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package    Octoleo CMS
+ *
+ * @created    9th April 2022
+ * @author     Llewellyn van der Merwe <https://git.vdm.dev/Llewellyn>
+ * @git        WEBD-325-45 <https://git.vdm.dev/Llewellyn/WEBD-325-45>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Octoleo\CMS\Application;
+
+/**
+ * Application Session Message Aware Interface
+ *
+ * @since  1.0.0
+ */
+interface  SessionMessageAwareInterface
+{
+	const MSG_INFO = 'info';
+
+	/**
+	 * Enqueue a system message.
+	 *
+	 * @param   string  $msg   The message to enqueue.
+	 * @param   string  $type  The message type. Default is message.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function enqueueMessage(string $msg, string $type = self::MSG_INFO);
+
+	/**
+	 * Get the system message queue.
+	 *
+	 * @param   boolean  $clear  Clear the messages currently attached to the application object
+	 *
+	 * @return  array  The system message queue.
+	 *
+	 * @since   3.2
+	 */
+	public function getMessageQueue(bool $clear = false): array;
+}

week-03/project/libraries/src/Application/SessionMessageAwareTrait.php

@@ -0,0 +1,88 @@
+<?php
+/**
+ * @package    Octoleo CMS
+ *
+ * @created    9th April 2022
+ * @author     Llewellyn van der Merwe <https://git.vdm.dev/Llewellyn>
+ * @git        WEBD-325-45 <https://git.vdm.dev/Llewellyn/WEBD-325-45>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Octoleo\CMS\Application;
+
+use Joomla\Filter\InputFilter as InputFilterAlias;
+use Octoleo\CMS\Filter\InputFilter;
+
+/**
+ * Trait for application classes which are identity (user) aware
+ *
+ * @since  1.0.0
+ */
+trait SessionMessageAwareTrait
+{
+	/**
+	 * Enqueue a system message.
+	 *
+	 * @param   string  $msg   The message to enqueue.
+	 * @param   string  $type  The message type. Default is message.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0.0
+	 */
+	public function enqueueMessage(string $msg, string $type = self::MSG_INFO)
+	{
+		// Don't add empty messages.
+		if ($msg === null || trim($msg) === '')
+		{
+			return;
+		}
+
+		$inputFilter = InputFilter::getInstance(
+			[],
+			[],
+			InputFilterAlias::ONLY_BLOCK_DEFINED_TAGS,
+			InputFilterAlias::ONLY_BLOCK_DEFINED_ATTRIBUTES
+		);
+
+		// Build the message array and apply the HTML InputFilter with the default blacklist to the message
+		$message = array(
+			'message' => $inputFilter->clean($msg, 'html'),
+			'type'    => $inputFilter->clean(strtolower($type), 'cmd'),
+		);
+
+		// For empty queue, if messages exists in the session, enqueue them first.
+		$messages = $this->getMessageQueue();
+
+		if (!\in_array($message, $messages))
+		{
+			// Enqueue the message.
+			$messages[] = $message;
+
+			// update the session
+			$this->getSession()->set('application.queue', $messages);
+		}
+	}
+
+	/**
+	 * Get the system message queue.
+	 *
+	 * @param   boolean  $clear  Clear the messages currently attached to the application object
+	 *
+	 * @return  array  The system message queue.
+	 *
+	 * @since   1.0.0
+	 */
+	public function getMessageQueue(bool $clear = false): array
+	{
+		// Get messages from Session
+		$sessionQueue = $this->getSession()->get('application.queue', []);
+
+		if ($clear)
+		{
+			$this->getSession()->set('application.queue', []);
+		}
+
+		return $sessionQueue;
+	}
+}

week-03/project/libraries/src/Application/SiteApplication.php

@@ -6,7 +6,7 @@
  * @license    http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License Version 2 or Later
  */
 
-namespace Joomla\FrameworkWebsite;
+namespace Octoleo\CMS\Application;
 
 use Joomla\Application\AbstractWebApplication;
 use Joomla\Application\Controller\ControllerResolverInterface;
@@ -17,9 +17,10 @@ use Joomla\Router\RouterInterface;
 use Psr\Http\Message\ResponseInterface;
 
 /**
- * Web application class
+ * Site application class
+ * source: https://github.com/joomla/framework.joomla.org/blob/master/src/WebApplication.php
  */
-class WebApplication extends AbstractWebApplication
+class SiteApplication extends AbstractWebApplication
 {
 	/**
 	 * The application's controller resolver.
@@ -82,4 +83,4 @@ class WebApplication extends AbstractWebApplication
 
 		\call_user_func($this->controllerResolver->resolve($route));
 	}
-}
+}

week-03/project/libraries/src/Asset/MixPathPackage.php

@@ -6,7 +6,7 @@
  * @license    http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License Version 2 or Later
  */
 
-namespace Joomla\FrameworkWebsite\Asset;
+namespace Octoleo\CMS\Asset;
 
 use Symfony\Component\Asset\Context\ContextInterface;
 use Symfony\Component\Asset\Package;
@@ -15,6 +15,7 @@ use Symfony\Component\Asset\VersionStrategy\VersionStrategyInterface;
 
 /**
  * Extended path package for resolving assets from a Laravel Mix manifest
+ * source: https://github.com/joomla/framework.joomla.org/blob/master/src/Asset/MixPathPackage.php
  */
 class MixPathPackage extends PathPackage
 {

week-03/project/libraries/src/Autoload/ClassLoader.php

@@ -6,17 +6,17 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace Joomla\CMS\Autoload;
+namespace Octoleo\CMS\Autoload;
 
-\defined('_JEXEC') or die;
+\defined('_LEXEC') or die;
 
 use Composer\Autoload\ClassLoader as ComposerClassLoader;
 
 /**
- * Decorate Composer ClassLoader for Joomla!
+ * Decorate Composer ClassLoader for Octoleo!
  *
  * For backward compatibility due to class aliasing in the CMS, the loadClass() method was modified to call
- * the JLoader::applyAliasFor() method.
+ * the LLoader::applyAliasFor() method.
  *
  * @since  3.4
  */
@@ -55,7 +55,7 @@ class ClassLoader
 	{
 		if ($result = $this->loader->loadClass($class))
 		{
-			\JLoader::applyAliasFor($class);
+			\LLoader::applyAliasFor($class);
 		}
 
 		return $result;

week-03/project/libraries/src/Controller/DashboardController.php

@@ -1,42 +1,47 @@
 <?php
 /**
- * Joomla! Framework Website
+ * @package    Octoleo CMS
  *
- * @copyright  Copyright (C) 2014 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license    http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License Version 2 or Later
+ * @created    9th April 2022
+ * @author     Llewellyn van der Merwe <https://git.vdm.dev/Llewellyn>
+ * @git        WEBD-325-45 <https://git.vdm.dev/Llewellyn/WEBD-325-45>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace Joomla\FrameworkWebsite\Controller;
+namespace Octoleo\CMS\Controller;
 
 use Joomla\Application\AbstractApplication;
 use Joomla\Controller\AbstractController;
-use Joomla\FrameworkWebsite\View\Package\PackageHtmlView;
 use Joomla\Input\Input;
+use Joomla\Uri\Uri;
+use Laminas\Diactoros\Response\RedirectResponse;
+use Octoleo\CMS\View\Admin\DashboardHtmlView;
 use Laminas\Diactoros\Response\HtmlResponse;
 
 /**
- * Controller handling a package's status data listing
+ * Controller handling the site's homepage
  *
- * @method         \Joomla\FrameworkWebsite\WebApplication  getApplication()  Get the application object.
- * @property-read  \Joomla\FrameworkWebsite\WebApplication  $app              Application object
+ * @method         \Octoleo\CMS\Application\AdminApplication  getApplication()  Get the application object.
+ * @property-read  \Octoleo\CMS\Application\AdminApplication  $app              Application object
  */
-class PackageController extends AbstractController
+class DashboardController extends AbstractController
 {
 	/**
 	 * The view object.
 	 *
-	 * @var  PackageHtmlView
+	 * @var  DashboardHtmlView
 	 */
 	private $view;
 
 	/**
 	 * Constructor.
 	 *
-	 * @param   PackageHtmlView      $view   The view object.
-	 * @param   Input                $input  The input object.
-	 * @param   AbstractApplication  $app    The application object.
+	 * @param   DashboardHtmlView    $view      The view object.
+	 * @param   Input                $user      The user object.
+	 * @param   Input                $input     The input object.
+	 * @param   AbstractApplication  $app       The application object.
 	 */
-	public function __construct(PackageHtmlView $view, Input $input = null, AbstractApplication $app = null)
+	public function __construct(DashboardHtmlView $view, Input $input = null, AbstractApplication $app = null)
 	{
 		parent::__construct($input, $app);
 
@@ -47,15 +52,61 @@ class PackageController extends AbstractController
 	 * Execute the controller.
 	 *
 	 * @return  boolean
+	 * @throws \Exception
 	 */
 	public function execute(): bool
 	{
+		// our little access controller TODO: we can do better
+		$has_access = false;
+
 		// Enable browser caching
 		$this->getApplication()->allowCache(true);
 
-		$this->view->setPackage($this->getInput()->getString('package'));
+		$dashboard = $this->getInput()->getString('dashboard', '');
+		$id = $this->getInput()->getInt('id', 0);
 
-		$this->getApplication()->setResponse(new HtmlResponse($this->view->render()));
+		$this->view->setActiveDashboard($dashboard);
+		$this->view->setActiveId($id);
+
+		/** @var \Octoleo\CMS\User\UserFactory $userFactory */
+		$userFactory = $this->getApplication()->getUserFactory();
+
+		// user actions [access, signup]
+		if ('access' === $dashboard || 'signup' === $dashboard || 'logout' === $dashboard)
+		{
+			if ('access' === $dashboard && $userFactory->login())
+			{
+				$has_access = true;
+			}
+			elseif ('signup' === $dashboard && $userFactory->create())
+			{
+				$has_access = true;
+			}
+			elseif ('logout' === $dashboard && $userFactory->logout())
+			{
+				$has_access = false;
+			}
+
+			// we by default always load the dashboard
+			$this->view->setActiveDashboard('dashboard');
+		}
+		elseif ($userFactory->active())
+		{
+			$has_access = true;
+		}
+
+		if ($has_access)
+		{
+			$this->getApplication()->setResponse(new HtmlResponse($this->view->render()));
+		}
+		else
+		{
+			// get uri request to get host
+			$uri = new Uri($this->getApplication()->get('uri.request'));
+
+			// Redirect to the administrator area
+			$this->getApplication()->redirect($uri->getScheme() . '://' . $uri->getHost() . '/administrator/');
+		}
 
 		return true;
 	}

week-03/project/libraries/src/Controller/HomepageController.php

@@ -1,46 +1,48 @@
 <?php
 /**
- * Joomla! Framework Website
+ * @package    Octoleo CMS
  *
- * @copyright  Copyright (C) 2014 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license    http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License Version 2 or Later
+ * @created    9th April 2022
+ * @author     Llewellyn van der Merwe <https://git.vdm.dev/Llewellyn>
+ * @git        WEBD-325-45 <https://git.vdm.dev/Llewellyn/WEBD-325-45>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace Joomla\FrameworkWebsite\Controller;
+namespace Octoleo\CMS\Controller;
 
 use Joomla\Application\AbstractApplication;
 use Joomla\Controller\AbstractController;
-use Joomla\FrameworkWebsite\View\Package\PackageHtmlView;
 use Joomla\Input\Input;
+use Joomla\Renderer\RendererInterface;
 use Laminas\Diactoros\Response\HtmlResponse;
 
 /**
- * Controller handling a package's status data listing
+ * Controller handling the site's homepage
  *
- * @method         \Joomla\FrameworkWebsite\WebApplication  getApplication()  Get the application object.
- * @property-read  \Joomla\FrameworkWebsite\WebApplication  $app              Application object
+ * @method         \Octoleo\CMS\Application\SiteApplication  getApplication()  Get the application object.
+ * @property-read  \Octoleo\CMS\Application\SiteApplication  $app              Application object
  */
-class PackageController extends AbstractController
+class HomepageController extends AbstractController
 {
 	/**
-	 * The view object.
+	 * The template renderer.
 	 *
-	 * @var  PackageHtmlView
+	 * @var  RendererInterface
 	 */
-	private $view;
+	private $renderer;
 
 	/**
 	 * Constructor.
 	 *
-	 * @param   PackageHtmlView      $view   The view object.
-	 * @param   Input                $input  The input object.
-	 * @param   AbstractApplication  $app    The application object.
+	 * @param   RendererInterface    $renderer  The template renderer.
+	 * @param   Input                $input     The input object.
+	 * @param   AbstractApplication  $app       The application object.
 	 */
-	public function __construct(PackageHtmlView $view, Input $input = null, AbstractApplication $app = null)
+	public function __construct(RendererInterface $renderer, Input $input = null, AbstractApplication $app = null)
 	{
 		parent::__construct($input, $app);
 
-		$this->view = $view;
+		$this->renderer = $renderer;
 	}
 
 	/**
@@ -53,9 +55,7 @@ class PackageController extends AbstractController
 		// Enable browser caching
 		$this->getApplication()->allowCache(true);
 
-		$this->view->setPackage($this->getInput()->getString('package'));
-
-		$this->getApplication()->setResponse(new HtmlResponse($this->view->render()));
+		$this->getApplication()->setResponse(new HtmlResponse($this->renderer->render('homepage.twig')));
 
 		return true;
 	}

week-03/project/libraries/src/Controller/LoginController.php

@@ -1,46 +1,48 @@
 <?php
 /**
- * Joomla! Framework Website
+ * @package    Octoleo CMS
  *
- * @copyright  Copyright (C) 2014 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license    http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License Version 2 or Later
+ * @created    9th April 2022
+ * @author     Llewellyn van der Merwe <https://git.vdm.dev/Llewellyn>
+ * @git        WEBD-325-45 <https://git.vdm.dev/Llewellyn/WEBD-325-45>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace Joomla\FrameworkWebsite\Controller;
+namespace Octoleo\CMS\Controller;
 
 use Joomla\Application\AbstractApplication;
 use Joomla\Controller\AbstractController;
-use Joomla\FrameworkWebsite\View\Package\PackageHtmlView;
 use Joomla\Input\Input;
+use Joomla\Renderer\RendererInterface;
 use Laminas\Diactoros\Response\HtmlResponse;
 
 /**
- * Controller handling a package's status data listing
+ * Controller handling the site's homepage
  *
- * @method         \Joomla\FrameworkWebsite\WebApplication  getApplication()  Get the application object.
- * @property-read  \Joomla\FrameworkWebsite\WebApplication  $app              Application object
+ * @method         \Octoleo\CMS\Application\SiteApplication  getApplication()  Get the application object.
+ * @property-read  \Octoleo\CMS\Application\SiteApplication  $app              Application object
  */
-class PackageController extends AbstractController
+class LoginController extends AbstractController
 {
 	/**
-	 * The view object.
+	 * The template renderer.
 	 *
-	 * @var  PackageHtmlView
+	 * @var  RendererInterface
 	 */
-	private $view;
+	private $renderer;
 
 	/**
 	 * Constructor.
 	 *
-	 * @param   PackageHtmlView      $view   The view object.
-	 * @param   Input                $input  The input object.
-	 * @param   AbstractApplication  $app    The application object.
+	 * @param   RendererInterface    $renderer  The template renderer.
+	 * @param   Input                $input     The input object.
+	 * @param   AbstractApplication  $app       The application object.
 	 */
-	public function __construct(PackageHtmlView $view, Input $input = null, AbstractApplication $app = null)
+	public function __construct(RendererInterface $renderer, Input $input = null, AbstractApplication $app = null)
 	{
 		parent::__construct($input, $app);
 
-		$this->view = $view;
+		$this->renderer = $renderer;
 	}
 
 	/**
@@ -53,9 +55,16 @@ class PackageController extends AbstractController
 		// Enable browser caching
 		$this->getApplication()->allowCache(true);
 
-		$this->view->setPackage($this->getInput()->getString('package'));
+		$task = $this->getInput()->getString('account', null);
 
-		$this->getApplication()->setResponse(new HtmlResponse($this->view->render()));
+		if ('signup' === $task)
+		{
+			$this->getApplication()->setResponse(new HtmlResponse($this->renderer->render('signup.twig')));
+		}
+		else
+		{
+			$this->getApplication()->setResponse(new HtmlResponse($this->renderer->render('login.twig')));
+		}
 
 		return true;
 	}

week-03/project/libraries/src/Controller/PageController.php

@@ -1,42 +1,46 @@
 <?php
 /**
- * Joomla! Framework Website
+ * @package    Octoleo CMS
  *
- * @copyright  Copyright (C) 2014 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license    http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License Version 2 or Later
+ * @created    9th April 2022
+ * @author     Llewellyn van der Merwe <https://git.vdm.dev/Llewellyn>
+ * @git        WEBD-325-45 <https://git.vdm.dev/Llewellyn/WEBD-325-45>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace Joomla\FrameworkWebsite\Controller;
+namespace Octoleo\CMS\Controller;
 
 use Joomla\Application\AbstractApplication;
 use Joomla\Controller\AbstractController;
-use Joomla\FrameworkWebsite\View\Package\PackageHtmlView;
 use Joomla\Input\Input;
+use Joomla\Uri\Uri;
+use Octoleo\CMS\View\Page\PageHtmlView;
 use Laminas\Diactoros\Response\HtmlResponse;
+use Laminas\Diactoros\Response\RedirectResponse;
 
 /**
- * Controller handling a package's status data listing
+ * Controller handling the site's simple text pages
  *
- * @method         \Joomla\FrameworkWebsite\WebApplication  getApplication()  Get the application object.
- * @property-read  \Joomla\FrameworkWebsite\WebApplication  $app              Application object
+ * @method         \Octoleo\CMS\Application\SiteApplication  getApplication()  Get the application object.
+ * @property-read  \Octoleo\CMS\Application\SiteApplication  $app              Application object
  */
-class PackageController extends AbstractController
+class PageController extends AbstractController
 {
 	/**
 	 * The view object.
 	 *
-	 * @var  PackageHtmlView
+	 * @var  PageHtmlView
 	 */
 	private $view;
 
 	/**
 	 * Constructor.
 	 *
-	 * @param   PackageHtmlView      $view   The view object.
-	 * @param   Input                $input  The input object.
-	 * @param   AbstractApplication  $app    The application object.
+	 * @param   PageHtmlView         $view   The view object.
+	 * @param   Input                $input     The input object.
+	 * @param   AbstractApplication  $app       The application object.
 	 */
-	public function __construct(PackageHtmlView $view, Input $input = null, AbstractApplication $app = null)
+	public function __construct(PageHtmlView $view, Input $input = null, AbstractApplication $app = null)
 	{
 		parent::__construct($input, $app);
 
@@ -53,9 +57,25 @@ class PackageController extends AbstractController
 		// Enable browser caching
 		$this->getApplication()->allowCache(true);
 
-		$this->view->setPackage($this->getInput()->getString('package'));
+		$page = $this->getInput()->getString('view', '');
+		$details = $this->getInput()->getString('details', '');
 
-		$this->getApplication()->setResponse(new HtmlResponse($this->view->render()));
+		// if for some reason the view value is administrator
+		if ('administrator' === $page)
+		{
+			// get uri request to get host
+			$uri = new Uri($this->getApplication()->get('uri.request'));
+
+			// Redirect to the administrator area
+			$this->getApplication()->setResponse(new RedirectResponse($uri->getScheme() . '://' . $uri->getHost() . '/administrator/', 301));
+		}
+		else
+		{
+			$this->view->setPage($page);
+			$this->view->setDetails($details);
+
+			$this->getApplication()->setResponse(new HtmlResponse($this->view->render()));
+		}
 
 		return true;
 	}

week-03/project/libraries/src/Controller/WrongCmsController.php

@@ -1,12 +1,14 @@
 <?php
 /**
- * Joomla! Framework Website
+ * @package    Octoleo CMS
  *
- * @copyright  Copyright (C) 2014 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license    http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License Version 2 or Later
+ * @created    9th April 2022
+ * @author     Llewellyn van der Merwe <https://git.vdm.dev/Llewellyn>
+ * @git        WEBD-325-45 <https://git.vdm.dev/Llewellyn/WEBD-325-45>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace Joomla\FrameworkWebsite\Controller;
+namespace Octoleo\CMS\Controller;
 
 use Joomla\Controller\AbstractController;
 use Laminas\Diactoros\Response\TextResponse;
@@ -14,8 +16,8 @@ use Laminas\Diactoros\Response\TextResponse;
 /**
  * Controller class to display a message to individuals looking for the wrong CMS
  *
- * @method         \Joomla\FrameworkWebsite\WebApplication  getApplication()  Get the application object.
- * @property-read  \Joomla\FrameworkWebsite\WebApplication  $app              Application object
+ * @method         \Octoleo\CMS\Application\SiteApplication  getApplication()  Get the application object.
+ * @property-read  \Octoleo\CMS\Application\SiteApplication  $app              Application object
  */
 class WrongCmsController extends AbstractController
 {

week-03/project/libraries/src/Date/Date.php

@@ -6,13 +6,10 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace Joomla\CMS\Date;
+namespace Octoleo\CMS\Date;
 
-\defined('JPATH_PLATFORM') or die;
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\Database\DatabaseDriver;
+use Joomla\Database\DatabaseInterface;
+use Octoleo\CMS\Factory;
 
 /**
  * Date is a class that stores a date and provides logic to manipulate
@@ -249,19 +246,19 @@ class Date extends \DateTime
 		switch ($day)
 		{
 			case 0:
-				return $abbr ? Text::_('SUN') : Text::_('SUNDAY');
+				return $abbr ? 'Sun' : 'Sunday';
 			case 1:
-				return $abbr ? Text::_('MON') : Text::_('MONDAY');
+				return $abbr ? 'Mon' : 'Monday';
 			case 2:
-				return $abbr ? Text::_('TUE') : Text::_('TUESDAY');
+				return $abbr ? 'Tue' : 'Tuesday';
 			case 3:
-				return $abbr ? Text::_('WED') : Text::_('WEDNESDAY');
+				return $abbr ? 'Wed' : 'Wednesday';
 			case 4:
-				return $abbr ? Text::_('THU') : Text::_('THURSDAY');
+				return $abbr ? 'Thu' : 'Thursday';
 			case 5:
-				return $abbr ? Text::_('FRI') : Text::_('FRIDAY');
+				return $abbr ? 'Fri' : 'Friday';
 			case 6:
-				return $abbr ? Text::_('SAT') : Text::_('SATURDAY');
+				return $abbr ? 'Sat' : 'Saturday';
 		}
 	}
 
@@ -374,29 +371,29 @@ class Date extends \DateTime
 		switch ($month)
 		{
 			case 1:
-				return $abbr ? Text::_('JANUARY_SHORT') : Text::_('JANUARY');
+				return $abbr ? 'Jan' : 'January'; //
 			case 2:
-				return $abbr ? Text::_('FEBRUARY_SHORT') : Text::_('FEBRUARY');
+				return $abbr ? 'Feb' : 'February';
 			case 3:
-				return $abbr ? Text::_('MARCH_SHORT') : Text::_('MARCH');
+				return $abbr ? 'Mar' : 'March';
 			case 4:
-				return $abbr ? Text::_('APRIL_SHORT') : Text::_('APRIL');
+				return $abbr ?  'Apr' : 'April';
 			case 5:
-				return $abbr ? Text::_('MAY_SHORT') : Text::_('MAY');
+				return 'May';
 			case 6:
-				return $abbr ? Text::_('JUNE_SHORT') : Text::_('JUNE');
+				return $abbr ? 'Jun' : 'June';
 			case 7:
-				return $abbr ? Text::_('JULY_SHORT') : Text::_('JULY');
+				return $abbr ? 'Jul' : 'July';
 			case 8:
-				return $abbr ? Text::_('AUGUST_SHORT') : Text::_('AUGUST');
+				return $abbr ? 'Aug' : 'August';
 			case 9:
-				return $abbr ? Text::_('SEPTEMBER_SHORT') : Text::_('SEPTEMBER');
+				return $abbr ? 'Sep' : 'September';
 			case 10:
-				return $abbr ? Text::_('OCTOBER_SHORT') : Text::_('OCTOBER');
+				return $abbr ? 'Oct' : 'October';
 			case 11:
-				return $abbr ? Text::_('NOVEMBER_SHORT') : Text::_('NOVEMBER');
+				return $abbr ? 'Nov' : 'November';
 			case 12:
-				return $abbr ? Text::_('DECEMBER_SHORT') : Text::_('DECEMBER');
+				return $abbr ? 'Dec' : 'December';
 		}
 	}
 
@@ -438,18 +435,20 @@ class Date extends \DateTime
 	 * Gets the date as an SQL datetime string.
 	 *
 	 * @param   boolean         $local  True to return the date string in the local time zone, false to return it in GMT.
-	 * @param   DatabaseDriver  $db     The database driver or null to use Factory::getDbo()
+	 * @param   DatabaseInterface  $db     The database driver or null to use Factory::getDbo()
 	 *
 	 * @return  string     The date string in SQL datetime format.
 	 *
-	 * @link    http://dev.mysql.com/doc/refman/5.0/en/datetime.html
+	 * @throws \Exception
 	 * @since   2.5.0
+	 * @link    http://dev.mysql.com/doc/refman/5.0/en/datetime.html
 	 */
-	public function toSql($local = false, DatabaseDriver $db = null)
+	public function toSql($local = false, DatabaseInterface $db = null)
 	{
 		if ($db === null)
 		{
-			$db = Factory::getDbo();
+			/** @var \Joomla\Database\DatabaseInterface $db */
+			$db = Factory::getContainer()->get(DatabaseInterface::class);
 		}
 
 		return $this->format($db->getDateFormat(), $local, false);

week-03/project/libraries/src/EventListener/ErrorSubscriber.php

@@ -1,19 +1,19 @@
 <?php
 /**
- * Joomla! Framework Website
- *
- * @copyright  Copyright (C) 2014 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license    http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License Version 2 or Later
- */
+* Joomla! Framework Website
+*
+* @copyright  Copyright (C) 2014 - 2017 Open Source Matters, Inc. All rights reserved.
+* @license    http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License Version 2 or Later
+*/
 
-namespace Joomla\FrameworkWebsite\EventListener;
+namespace Octoleo\CMS\EventListener;
 
 use Joomla\Application\ApplicationEvents;
 use Joomla\Application\Event\ApplicationErrorEvent;
 use Joomla\Console\ConsoleEvents;
 use Joomla\Console\Event\ApplicationErrorEvent as ConsoleApplicationErrorEvent;
 use Joomla\Event\SubscriberInterface;
-use Joomla\FrameworkWebsite\WebApplication;
+use Octoleo\CMS\Application\SiteApplication;
 use Joomla\Renderer\RendererInterface;
 use Joomla\Router\Exception\MethodNotAllowedException;
 use Joomla\Router\Exception\RouteNotFoundException;
@@ -24,6 +24,7 @@ use Psr\Log\LoggerAwareTrait;
 
 /**
  * Error handling event subscriber
+ * source: https://github.com/joomla/framework.joomla.org/blob/master/src/EventListener/ErrorSubscriber.php
  */
 class ErrorSubscriber implements SubscriberInterface, LoggerAwareInterface
 {
@@ -80,7 +81,7 @@ class ErrorSubscriber implements SubscriberInterface, LoggerAwareInterface
 	 */
 	public function handleWebError(ApplicationErrorEvent $event): void
 	{
-		/** @var WebApplication $app */
+		/** @var SiteApplication $app */
 		$app = $event->getApplication();
 
 		switch (true)
@@ -142,7 +143,7 @@ class ErrorSubscriber implements SubscriberInterface, LoggerAwareInterface
 	 */
 	private function prepareResponse(ApplicationErrorEvent $event): void
 	{
-		/** @var WebApplication $app */
+		/** @var SiteApplication $app */
 		$app = $event->getApplication();
 
 		$app->allowCache(false);

week-03/project/libraries/src/Factory.php

@@ -1,65 +1,45 @@
 <?php
 /**
- * Joomla! Content Management System
+ * @package    Octoleo CMS
  *
- * @copyright  (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
+ * @created    3rd April 2022
+ * @author     Llewellyn van der Merwe <https://git.vdm.dev/Llewellyn>
+ * @git        WEBD-325-45 <https://git.vdm.dev/Llewellyn/WEBD-325-45>
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace Joomla\CMS;
+namespace Octoleo\CMS;
 
-\defined('JPATH_PLATFORM') or die;
+\defined('LPATH_PLATFORM') or die;
 
-use Joomla\CMS\Application\CMSApplicationInterface;
-use Joomla\CMS\Cache\Cache;
-use Joomla\CMS\Cache\CacheControllerFactoryInterface;
-use Joomla\CMS\Client\ClientHelper;
-use Joomla\CMS\Date\Date;
-use Joomla\CMS\Document\Document;
-use Joomla\CMS\Document\FactoryInterface;
-use Joomla\CMS\Filesystem\Stream;
-use Joomla\CMS\Language\Language;
-use Joomla\CMS\Language\LanguageFactoryInterface;
-use Joomla\CMS\Log\Log;
-use Joomla\CMS\Mail\Mail;
-use Joomla\CMS\Mail\MailHelper;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\User\User;
-use Joomla\Database\DatabaseDriver;
-use Joomla\Database\DatabaseInterface;
+use Joomla\Application\WebApplicationInterface;
+use Joomla\Database\Service\DatabaseProvider;
 use Joomla\DI\Container;
 use Joomla\Registry\Registry;
 use PHPMailer\PHPMailer\Exception as phpmailerException;
 
 /**
- * Joomla Platform Factory class.
+ * Octoleo Platform Factory class.
  *
- * @since  1.7.0
+ * @since  1.0.0
+ *
+ * SOURCE: https://github.com/joomla/joomla-cms/blob/4.1-dev/libraries/src/Factory.php#L39
  */
 abstract class Factory
 {
 	/**
 	 * Global application object
 	 *
-	 * @var    CMSApplicationInterface
-	 * @since  1.7.0
+	 * @var    WebApplicationInterface
+	 * @since  1.0.0
 	 */
 	public static $application = null;
 
-	/**
-	 * Global cache object
-	 *
-	 * @var    Cache
-	 * @since  1.7.0
-	 */
-	public static $cache = null;
-
 	/**
 	 * Global configuration object
 	 *
-	 * @var         \JConfig
-	 * @since       1.7.0
-	 * @deprecated  5.0  Use the configuration object within the application
+	 * @var         \LConfig
+	 * @since       1.0.0
 	 */
 	public static $config = null;
 
@@ -67,71 +47,27 @@ abstract class Factory
 	 * Global container object
 	 *
 	 * @var    Container
-	 * @since  4.0.0
+	 * @since  1.0.0
 	 */
 	public static $container = null;
 
-	/**
-	 * Container for Date instances
-	 *
-	 * @var    array
-	 * @since  1.7.3
-	 */
-	public static $dates = array();
-
-	/**
-	 * Global session object
-	 *
-	 * @var         Session
-	 * @since       1.7.0
-	 * @deprecated  5.0  Use the session service in the DI container
-	 */
-	public static $session = null;
-
-	/**
-	 * Global language object
-	 *
-	 * @var         Language
-	 * @since       1.7.0
-	 * @deprecated  5.0  Use the language service in the DI container
-	 */
-	public static $language = null;
-
-	/**
-	 * Global document object
-	 *
-	 * @var         Document
-	 * @since       1.7.0
-	 * @deprecated  5.0  Use the document service in the DI container
-	 */
-	public static $document = null;
-
-	/**
-	 * Global database object
-	 *
-	 * @var         DatabaseDriver
-	 * @since       1.7.0
-	 * @deprecated  5.0  Use the database service in the DI container
-	 */
-	public static $database = null;
-
 	/**
 	 * Global mailer object
 	 *
 	 * @var    Mail
-	 * @since  1.7.0
+	 * @since  1.0.0
 	 */
 	public static $mailer = null;
 
 	/**
 	 * Get the global application object. When the global application doesn't exist, an exception is thrown.
 	 *
-	 * @return  CMSApplicationInterface object
+	 * @return  WebApplicationInterface object
 	 *
-	 * @since   1.7.0
+	 * @since   1.0.0
 	 * @throws  \Exception
 	 */
-	public static function getApplication()
+	public static function getApplication() : WebApplicationInterface
 	{
 		if (!self::$application)
 		{
@@ -141,54 +77,6 @@ abstract class Factory
 		return self::$application;
 	}
 
-	/**
-	 * Get a configuration object
-	 *
-	 * Returns the global {@link \JConfig} object, only creating it if it doesn't already exist.
-	 *
-	 * @param   string  $file       The path to the configuration file
-	 * @param   string  $type       The type of the configuration file
-	 * @param   string  $namespace  The namespace of the configuration file
-	 *
-	 * @return  Registry
-	 *
-	 * @see         Registry
-	 * @since       1.7.0
-	 * @deprecated  5.0  Use the configuration object within the application.
-	 */
-	public static function getConfig($file = null, $type = 'PHP', $namespace = '')
-	{
-		@trigger_error(
-			sprintf(
-				'%s() is deprecated. The configuration object should be read from the application.',
-				__METHOD__
-			),
-			E_USER_DEPRECATED
-		);
-
-		/**
-		 * If there is an application object, fetch the configuration from there.
-		 * Check it's not null because LanguagesModel can make it null and if it's null
-		 * we would want to re-init it from configuration.php.
-		 */
-		if (self::$application && self::$application->getConfig() !== null)
-		{
-			return self::$application->getConfig();
-		}
-
-		if (!self::$config)
-		{
-			if ($file === null)
-			{
-				$file = JPATH_CONFIGURATION . '/configuration.php';
-			}
-
-			self::$config = self::createConfig($file, $type, $namespace);
-		}
-
-		return self::$config;
-	}
-
 	/**
 	 * Get a container object
 	 *
@@ -224,219 +112,6 @@ abstract class Factory
 		return self::$container;
 	}
 
-	/**
-	 * Get a session object.
-	 *
-	 * Returns the global {@link Session} object, only creating it if it doesn't already exist.
-	 *
-	 * @param   array  $options  An array containing session options
-	 *
-	 * @return  Session object
-	 *
-	 * @see         Session
-	 * @since       1.7.0
-	 * @deprecated  5.0  Load the session service from the dependency injection container or via $app->getSession()
-	 */
-	public static function getSession(array $options = array())
-	{
-		@trigger_error(
-			sprintf(
-				'%1$s() is deprecated. Load the session from the dependency injection container or via %2$s::getApplication()->getSession().',
-				__METHOD__,
-				__CLASS__
-			),
-			E_USER_DEPRECATED
-		);
-
-		return self::getApplication()->getSession();
-	}
-
-	/**
-	 * Get a language object.
-	 *
-	 * Returns the global {@link Language} object, only creating it if it doesn't already exist.
-	 *
-	 * @return  Language object
-	 *
-	 * @see         Language
-	 * @since       1.7.0
-	 * @deprecated  5.0  Load the language service from the dependency injection container or via $app->getLanguage()
-	 */
-	public static function getLanguage()
-	{
-		@trigger_error(
-			sprintf(
-				'%1$s() is deprecated. Load the language from the dependency injection container or via %2$s::getApplication()->getLanguage().',
-				__METHOD__,
-				__CLASS__
-			),
-			E_USER_DEPRECATED
-		);
-
-		if (!self::$language)
-		{
-			self::$language = self::createLanguage();
-		}
-
-		return self::$language;
-	}
-
-	/**
-	 * Get a document object.
-	 *
-	 * Returns the global {@link \Joomla\CMS\Document\Document} object, only creating it if it doesn't already exist.
-	 *
-	 * @return  Document object
-	 *
-	 * @see         Document
-	 * @since       1.7.0
-	 * @deprecated  5.0  Load the document service from the dependency injection container or via $app->getDocument()
-	 */
-	public static function getDocument()
-	{
-		@trigger_error(
-			sprintf(
-				'%1$s() is deprecated. Load the document from the dependency injection container or via %2$s::getApplication()->getDocument().',
-				__METHOD__,
-				__CLASS__
-			),
-			E_USER_DEPRECATED
-		);
-
-		if (!self::$document)
-		{
-			self::$document = self::createDocument();
-		}
-
-		return self::$document;
-	}
-
-	/**
-	 * Get a user object.
-	 *
-	 * Returns the global {@link User} object, only creating it if it doesn't already exist.
-	 *
-	 * @param   integer  $id  The user to load - Can be an integer or string - If string, it is converted to ID automatically.
-	 *
-	 * @return  User object
-	 *
-	 * @see         User
-	 * @since       1.7.0
-	 * @deprecated  5.0  Load the user service from the dependency injection container or via $app->getIdentity()
-	 */
-	public static function getUser($id = null)
-	{
-		@trigger_error(
-			sprintf(
-				'%1$s() is deprecated. Load the user from the dependency injection container or via %2$s::getApplication()->getIdentity().',
-				__METHOD__,
-				__CLASS__
-			),
-			E_USER_DEPRECATED
-		);
-
-		$instance = self::getApplication()->getSession()->get('user');
-
-		if (\is_null($id))
-		{
-			if (!($instance instanceof User))
-			{
-				$instance = User::getInstance();
-			}
-		}
-		// Check if we have a string as the id or if the numeric id is the current instance
-		elseif (!($instance instanceof User) || \is_string($id) || $instance->id !== $id)
-		{
-			$instance = User::getInstance($id);
-		}
-
-		return $instance;
-	}
-
-	/**
-	 * Get a cache object
-	 *
-	 * Returns the global {@link CacheController} object
-	 *
-	 * @param   string  $group    The cache group name
-	 * @param   string  $handler  The handler to use
-	 * @param   string  $storage  The storage method
-	 *
-	 * @return  \Joomla\CMS\Cache\CacheController object
-	 *
-	 * @see         Cache
-	 * @since       1.7.0
-	 * @deprecated  5.0 Use the cache controller factory instead
-	 */
-	public static function getCache($group = '', $handler = 'callback', $storage = null)
-	{
-		@trigger_error(
-			sprintf(
-				'%s() is deprecated. The cache controller should be fetched from the factory.',
-				__METHOD__
-			),
-			E_USER_DEPRECATED
-		);
-
-		$hash = md5($group . $handler . $storage);
-
-		if (isset(self::$cache[$hash]))
-		{
-			return self::$cache[$hash];
-		}
-
-		$handler = ($handler === 'function') ? 'callback' : $handler;
-
-		$options = array('defaultgroup' => $group);
-
-		if (isset($storage))
-		{
-			$options['storage'] = $storage;
-		}
-
-		$cache = self::getContainer()->get(CacheControllerFactoryInterface::class)->createCacheController($handler, $options);
-
-		self::$cache[$hash] = $cache;
-
-		return self::$cache[$hash];
-	}
-
-	/**
-	 * Get a database object.
-	 *
-	 * Returns the global {@link DatabaseDriver} object, only creating it if it doesn't already exist.
-	 *
-	 * @return  DatabaseDriver
-	 *
-	 * @see         DatabaseDriver
-	 * @since       1.7.0
-	 * @deprecated  5.0  Load the database service from the dependency injection container
-	 */
-	public static function getDbo()
-	{
-		@trigger_error(
-			sprintf(
-				'%1$s() is deprecated. Load the database from the dependency injection container.',
-				__METHOD__
-			),
-			E_USER_DEPRECATED
-		);
-
-		if (!self::$database)
-		{
-			if (self::getContainer()->has('DatabaseDriver'))
-			{
-				self::$database = self::getContainer()->get('DatabaseDriver');
-			}
-			else
-			{
-				self::$database = self::createDbo();
-			}
-		}
-
-		return self::$database;
-	}
-
 	/**
 	 * Get a mailer object.
 	 *
@@ -460,56 +135,61 @@ abstract class Factory
 	}
 
 	/**
-	 * Return the {@link Date} object
+	 * Create a container object
 	 *
-	 * @param   mixed  $time      The initial time for the Date object
-	 * @param   mixed  $tzOffset  The timezone offset.
+	 * @return  Container
 	 *
-	 * @return  Date object
-	 *
-	 * @see     Date
-	 * @since   1.7.0
+	 * @since   4.0.0
 	 */
-	public static function getDate($time = 'now', $tzOffset = null)
+	protected static function createContainer(): Container
 	{
-		static $classname;
-		static $mainLocale;
+		return (new Container)
+			->registerServiceProvider(new Service\ConfigurationProvider(LPATH_CONFIGURATION . '/octoconfig.php'))
+			->registerServiceProvider(new Service\SessionProvider)
+			->registerServiceProvider(new Service\UserProvider)
+			->registerServiceProvider(new DatabaseProvider)
+			->registerServiceProvider(new Service\EventProvider)
+			->registerServiceProvider(new Service\HttpProvider)
+			->registerServiceProvider(new Service\LoggingProvider);
+	}
 
-		$language = self::getLanguage();
-		$locale = $language->getTag();
-
-		if (!isset($classname) || $locale != $mainLocale)
+	/**
+	 * Get a configuration object
+	 *
+	 * Returns the global {@link \JConfig} object, only creating it if it doesn't already exist.
+	 *
+	 * @param   string  $file       The path to the configuration file
+	 * @param   string  $type       The type of the configuration file
+	 * @param   string  $namespace  The namespace of the configuration file
+	 *
+	 * @return  Registry
+	 *
+	 * @see         Registry
+	 * @since       1.1.1
+	 */
+	public static function getConfig($file = null, $type = 'PHP', $namespace = '')
+	{
+		/**
+		 * If there is an application object, fetch the configuration from there.
+		 * Check it's not null because LanguagesModel can make it null and if it's null
+		 * we would want to re-init it from configuration.php.
+		 */
+		if (self::$application && self::$application->getConfig() !== null)
 		{
-			// Store the locale for future reference
-			$mainLocale = $locale;
-
-			if ($mainLocale !== false)
-			{
-				$classname = str_replace('-', '_', $mainLocale) . 'Date';
-
-				if (!class_exists($classname))
-				{
-					// The class does not exist, default to Date
-					$classname = 'Joomla\\CMS\\Date\\Date';
-				}
-			}
-			else
-			{
-				// No tag, so default to Date
-				$classname = 'Joomla\\CMS\\Date\\Date';
-			}
+			return self::$application->getConfig();
 		}
 
-		$key = $time . '-' . ($tzOffset instanceof \DateTimeZone ? $tzOffset->getName() : (string) $tzOffset);
-
-		if (!isset(self::$dates[$classname][$key]))
+		if (!self::$config)
 		{
-			self::$dates[$classname][$key] = new $classname($time, $tzOffset);
+			if ($file === null)
+			{
+				$file = JPATH_CONFIGURATION . '/octoconfig.php';
+			}
+
+			self::$config = self::createConfig($file, $type, $namespace);
 		}
 
-		$date = clone self::$dates[$classname][$key];
-
-		return $date;
+		return self::$config;
 	}
 
 	/**
@@ -522,19 +202,10 @@ abstract class Factory
 	 * @return  Registry
 	 *
 	 * @see         Registry
-	 * @since       1.7.0
-	 * @deprecated  5.0  Use the configuration object within the application.
+	 * @since       1.0.0
 	 */
 	protected static function createConfig($file, $type = 'PHP', $namespace = '')
 	{
-		@trigger_error(
-			sprintf(
-				'%s() is deprecated. The configuration object should be read from the application.',
-				__METHOD__
-			),
-			E_USER_DEPRECATED
-		);
-
 		if (is_file($file))
 		{
 			include_once $file;
@@ -547,12 +218,12 @@ abstract class Factory
 		$namespace = ucfirst((string) preg_replace('/[^A-Z_]/i', '', $namespace));
 
 		// Build the config name.
-		$name = 'JConfig' . $namespace;
+		$name = 'LConfig' . $namespace;
 
 		// Handle the PHP configuration type.
 		if ($type === 'PHP' && class_exists($name))
 		{
-			// Create the JConfig object
+			// Create the LConfig object
 			$config = new $name;
 
 			// Load the configuration values into the registry
@@ -562,289 +233,68 @@ abstract class Factory
 		return $registry;
 	}
 
-	/**
-	 * Create a container object
-	 *
-	 * @return  Container
-	 *
-	 * @since   4.0.0
-	 */
-	protected static function createContainer(): Container
-	{
-		$container = (new Container)
-			->registerServiceProvider(new \Joomla\CMS\Service\Provider\Application)
-			->registerServiceProvider(new \Joomla\CMS\Service\Provider\Authentication)
-			->registerServiceProvider(new \Joomla\CMS\Service\Provider\CacheController)
-			->registerServiceProvider(new \Joomla\CMS\Service\Provider\Config)
-			->registerServiceProvider(new \Joomla\CMS\Service\Provider\Console)
-			->registerServiceProvider(new \Joomla\CMS\Service\Provider\Database)
-			->registerServiceProvider(new \Joomla\CMS\Service\Provider\Dispatcher)
-			->registerServiceProvider(new \Joomla\CMS\Service\Provider\Document)
-			->registerServiceProvider(new \Joomla\CMS\Service\Provider\Form)
-			->registerServiceProvider(new \Joomla\CMS\Service\Provider\Logger)
-			->registerServiceProvider(new \Joomla\CMS\Service\Provider\Language)
-			->registerServiceProvider(new \Joomla\CMS\Service\Provider\Menu)
-			->registerServiceProvider(new \Joomla\CMS\Service\Provider\Pathway)
-			->registerServiceProvider(new \Joomla\CMS\Service\Provider\HTMLRegistry)
-			->registerServiceProvider(new \Joomla\CMS\Service\Provider\Session)
-			->registerServiceProvider(new \Joomla\CMS\Service\Provider\Toolbar)
-			->registerServiceProvider(new \Joomla\CMS\Service\Provider\WebAssetRegistry)
-			->registerServiceProvider(new \Joomla\CMS\Service\Provider\ApiRouter)
-			->registerServiceProvider(new \Joomla\CMS\Service\Provider\User);
-
-		return $container;
-	}
-
-	/**
-	 * Create a database object
-	 *
-	 * @return  DatabaseDriver
-	 *
-	 * @see         DatabaseDriver
-	 * @since       1.7.0
-	 * @deprecated  5.0  Use the database service in the DI container
-	 */
-	protected static function createDbo()
-	{
-		@trigger_error(
-			sprintf(
-				'%1$s() is deprecated, register a service provider to create a %2$s instance instead.',
-				__METHOD__,
-				DatabaseInterface::class
-			),
-			E_USER_DEPRECATED
-		);
-
-		$conf = self::getConfig();
-
-		$host = $conf->get('host');
-		$user = $conf->get('user');
-		$password = $conf->get('password');
-		$database = $conf->get('db');
-		$prefix = $conf->get('dbprefix');
-		$driver = $conf->get('dbtype');
-
-		$options = array('driver' => $driver, 'host' => $host, 'user' => $user, 'password' => $password, 'database' => $database, 'prefix' => $prefix);
-
-		if ((int) $conf->get('dbencryption') !== 0)
-		{
-			$options['ssl'] = [
-				'enable'             => true,
-				'verify_server_cert' => (bool) $conf->get('dbsslverifyservercert'),
-			];
-
-			foreach (['cipher', 'ca', 'key', 'cert'] as $value)
-			{
-				$confVal = trim($conf->get('dbssl' . $value, ''));
-
-				if ($confVal !== '')
-				{
-					$options['ssl'][$value] = $confVal;
-				}
-			}
-		}
-
-		try
-		{
-			$db = DatabaseDriver::getInstance($options);
-		}
-		catch (\RuntimeException $e)
-		{
-			if (!headers_sent())
-			{
-				header('HTTP/1.1 500 Internal Server Error');
-			}
-
-			jexit('Database Error: ' . $e->getMessage());
-		}
-
-		return $db;
-	}
-
 	/**
 	 * Create a mailer object
 	 *
 	 * @return  Mail object
 	 *
 	 * @see     Mail
-	 * @since   1.7.0
+	 * @since   1.0.0
 	 */
 	protected static function createMailer()
 	{
-		$conf = self::getConfig();
-
-		$smtpauth = ($conf->get('smtpauth') == 0) ? null : 1;
-		$smtpuser = $conf->get('smtpuser');
-		$smtppass = $conf->get('smtppass');
-		$smtphost = $conf->get('smtphost');
-		$smtpsecure = $conf->get('smtpsecure');
-		$smtpport = $conf->get('smtpport');
-		$mailfrom = $conf->get('mailfrom');
-		$fromname = $conf->get('fromname');
-		$mailer = $conf->get('mailer');
-
-		// Create a Mail object
-		$mail = Mail::getInstance();
-
-		// Clean the email address
-		$mailfrom = MailHelper::cleanLine($mailfrom);
-
-		// Set default sender without Reply-to if the mailfrom is a valid address
-		if (MailHelper::isEmailAddress($mailfrom))
-		{
-			// Wrap in try/catch to catch phpmailerExceptions if it is throwing them
-			try
-			{
-				// Check for a false return value if exception throwing is disabled
-				if ($mail->setFrom($mailfrom, MailHelper::cleanLine($fromname), false) === false)
-				{
-					Log::add(__METHOD__ . '() could not set the sender data.', Log::WARNING, 'mail');
-				}
-			}
-			catch (phpmailerException $e)
-			{
-				Log::add(__METHOD__ . '() could not set the sender data.', Log::WARNING, 'mail');
-			}
-		}
-
-		// Default mailer is to use PHP's mail function
-		switch ($mailer)
-		{
-			case 'smtp':
-				$mail->useSmtp($smtpauth, $smtphost, $smtpuser, $smtppass, $smtpsecure, $smtpport);
-				break;
-
-			case 'sendmail':
-				$mail->isSendmail();
-				break;
-
-			default:
-				$mail->isMail();
-				break;
-		}
-
-		return $mail;
-	}
-
-	/**
-	 * Create a language object
-	 *
-	 * @return  Language object
-	 *
-	 * @see         Language
-	 * @since       1.7.0
-	 * @deprecated  5.0  Load the language service from the dependency injection container or via $app->getLanguage()
-	 */
-	protected static function createLanguage()
-	{
-		@trigger_error(
-			sprintf(
-				'%1$s() is deprecated. Load the language from the dependency injection container or via %2$s::getApplication()->getLanguage().',
-				__METHOD__,
-				__CLASS__
-			),
-			E_USER_DEPRECATED
-		);
-
-		$conf = self::getConfig();
-		$locale = $conf->get('language');
-		$debug = $conf->get('debug_lang');
-		$lang = self::getContainer()->get(LanguageFactoryInterface::class)->createLanguage($locale, $debug);
-
-		return $lang;
-	}
-
-	/**
-	 * Create a document object
-	 *
-	 * @return  Document object
-	 *
-	 * @see         Document
-	 * @since       1.7.0
-	 * @deprecated  5.0  Load the document service from the dependency injection container or via $app->getDocument()
-	 */
-	protected static function createDocument()
-	{
-		@trigger_error(
-			sprintf(
-				'%1$s() is deprecated. Load the document from the dependency injection container or via %2$s::getApplication()->getDocument().',
-				__METHOD__,
-				__CLASS__
-			),
-			E_USER_DEPRECATED
-		);
-
-		$lang = self::getLanguage();
-
-		$input = self::getApplication()->input;
-		$type = $input->get('format', 'html', 'cmd');
-
-		$version = new Version;
-
-		$attributes = array(
-			'charset'      => 'utf-8',
-			'lineend'      => 'unix',
-			'tab'          => "\t",
-			'language'     => $lang->getTag(),
-			'direction'    => $lang->isRtl() ? 'rtl' : 'ltr',
-			'mediaversion' => $version->getMediaVersion(),
-		);
-
-		return self::getContainer()->get(FactoryInterface::class)->createDocument($type, $attributes);
-	}
-
-	/**
-	 * Creates a new stream object with appropriate prefix
-	 *
-	 * @param   boolean  $usePrefix        Prefix the connections for writing
-	 * @param   boolean  $useNetwork       Use network if available for writing; use false to disable (e.g. FTP, SCP)
-	 * @param   string   $userAgentSuffix  String to append to user agent
-	 * @param   boolean  $maskUserAgent    User agent masking (prefix Mozilla)
-	 *
-	 * @return  Stream
-	 *
-	 * @see     Stream
-	 * @since   1.7.0
-	 */
-	public static function getStream($usePrefix = true, $useNetwork = true, $userAgentSuffix = 'Joomla', $maskUserAgent = false)
-	{
-		// Setup the context; Joomla! UA and overwrite
-		$context = array();
-		$version = new Version;
-
-		// Set the UA for HTTP and overwrite for FTP
-		$context['http']['user_agent'] = $version->getUserAgent($userAgentSuffix, $maskUserAgent);
-		$context['ftp']['overwrite'] = true;
-
-		if ($usePrefix)
-		{
-			$FTPOptions = ClientHelper::getCredentials('ftp');
-			$SCPOptions = ClientHelper::getCredentials('scp');
-
-			if ($FTPOptions['enabled'] == 1 && $useNetwork)
-			{
-				$prefix = 'ftp://' . $FTPOptions['user'] . ':' . $FTPOptions['pass'] . '@' . $FTPOptions['host'];
-				$prefix .= $FTPOptions['port'] ? ':' . $FTPOptions['port'] : '';
-				$prefix .= $FTPOptions['root'];
-			}
-			elseif ($SCPOptions['enabled'] == 1 && $useNetwork)
-			{
-				$prefix = 'ssh2.sftp://' . $SCPOptions['user'] . ':' . $SCPOptions['pass'] . '@' . $SCPOptions['host'];
-				$prefix .= $SCPOptions['port'] ? ':' . $SCPOptions['port'] : '';
-				$prefix .= $SCPOptions['root'];
-			}
-			else
-			{
-				$prefix = JPATH_ROOT . '/';
-			}
-
-			$retval = new Stream($prefix, JPATH_ROOT, $context);
-		}
-		else
-		{
-			$retval = new Stream('', '', $context);
-		}
-
-		return $retval;
+//		$conf = self::getConfig();
+//
+//		$smtpauth = ($conf->get('smtpauth') == 0) ? null : 1;
+//		$smtpuser = $conf->get('smtpuser');
+//		$smtppass = $conf->get('smtppass');
+//		$smtphost = $conf->get('smtphost');
+//		$smtpsecure = $conf->get('smtpsecure');
+//		$smtpport = $conf->get('smtpport');
+//		$mailfrom = $conf->get('mailfrom');
+//		$fromname = $conf->get('fromname');
+//		$mailer = $conf->get('mailer');
+//
+//		// Create a Mail object
+//		$mail = Mail::getInstance();
+//
+//		// Clean the email address
+//		$mailfrom = MailHelper::cleanLine($mailfrom);
+//
+//		// Set default sender without Reply-to if the mailfrom is a valid address
+//		if (MailHelper::isEmailAddress($mailfrom))
+//		{
+//			// Wrap in try/catch to catch phpmailerExceptions if it is throwing them
+//			try
+//			{
+//				// Check for a false return value if exception throwing is disabled
+//				if ($mail->setFrom($mailfrom, MailHelper::cleanLine($fromname), false) === false)
+//				{
+//					Log::add(__METHOD__ . '() could not set the sender data.', Log::WARNING, 'mail');
+//				}
+//			}
+//			catch (phpmailerException $e)
+//			{
+//				Log::add(__METHOD__ . '() could not set the sender data.', Log::WARNING, 'mail');
+//			}
+//		}
+//
+//		// Default mailer is to use PHP's mail function
+//		switch ($mailer)
+//		{
+//			case 'smtp':
+//				$mail->useSmtp($smtpauth, $smtphost, $smtpuser, $smtppass, $smtpsecure, $smtpport);
+//				break;
+//
+//			case 'sendmail':
+//				$mail->isSendmail();
+//				break;
+//
+//			default:
+//				$mail->isMail();
+//				break;
+//		}
+//
+//		return $mail;
 	}
 }

week-03/project/libraries/src/Filter/InputFilter.php

@@ -6,11 +6,9 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace Joomla\CMS\Filter;
+namespace Octoleo\CMS\Filter;
 
-\defined('JPATH_PLATFORM') or die;
-
-use Joomla\CMS\String\PunycodeHelper;
+use Octoleo\CMS\String\PunycodeHelper;
 use Joomla\Filter\InputFilter as BaseInputFilter;
 
 /**

week-03/project/libraries/src/Model/DashboardModel.php

@@ -1,12 +1,14 @@
 <?php
 /**
- * Joomla! Framework Website
+ * @package    Octoleo CMS
  *
- * @copyright  Copyright (C) 2014 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license    http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License Version 2 or Later
+ * @created    9th April 2022
+ * @author     Llewellyn van der Merwe <https://git.vdm.dev/Llewellyn>
+ * @git        WEBD-325-45 <https://git.vdm.dev/Llewellyn/WEBD-325-45>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace Joomla\FrameworkWebsite\Model;
+namespace Octoleo\CMS\Model;
 
 use Joomla\Database\DatabaseDriver;
 use Joomla\Database\ParameterType;
@@ -14,12 +16,27 @@ use Joomla\Model\DatabaseModelInterface;
 use Joomla\Model\DatabaseModelTrait;
 
 /**
- * Model class for packages
+ * Model class for pages
+ * source: https://github.com/joomla/framework.joomla.org/blob/master/src/Model/PackageModel.php
  */
-class PackageModel implements DatabaseModelInterface
+class DashboardModel implements DatabaseModelInterface
 {
 	use DatabaseModelTrait;
 
+	/**
+	 * Array of legal dashboards
+	 *
+	 * @var array
+	 */
+	private $legalDashboards = [
+		'items' => 'items.twig',
+		'item' => 'edit.twig',
+		'menus' => 'menus.twig',
+		'menu' => 'edit.twig',
+		'users' => 'users.twig',
+		'user' => 'edit.twig'
+	];
+
 	/**
 	 * Instantiate the model.
 	 *
@@ -31,142 +48,20 @@ class PackageModel implements DatabaseModelInterface
 	}
 
 	/**
-	 * Add a package
+	 * Get a active dashboard template name
 	 *
-	 * @param   string   $packageName   The package name as registered with Packagist
-	 * @param   string   $displayName   The package's display name
-	 * @param   string   $repoName      The package's repo name
-	 * @param   boolean  $isStable      Flag indicating the package is stable
-	 * @param   boolean  $isDeprecated  Flag indicating the package is deprecated
-	 * @param   boolean  $isAbandoned   Flag indicating the package is abandoned
+	 * @param   string  $dashboardName  The dashboard to lookup
+	 *
+	 * @return  string
 	 *
-	 * @return  void
 	 */
-	public function addPackage(string $packageName, string $displayName, string $repoName, bool $isStable, bool $isDeprecated, bool $isAbandoned): void
+	public function getDashboard(string $dashboardName): string
 	{
-		$db = $this->getDb();
-
-		$data = (object) [
-			'package'    => $packageName,
-			'display'    => $displayName,
-			'repo'       => $repoName,
-			'stable'     => (int) $isStable,
-			'deprecated' => (int) $isDeprecated,
-			'abandoned'  => (int) $isAbandoned,
-		];
-
-		$db->insertObject('#__packages', $data);
-	}
-
-	/**
-	 * Get the active package data
-	 *
-	 * @return  array
-	 */
-	public function getActivePackages(): array
-	{
-		$abandoned = false;
-
-		$db = $this->getDb();
-
-		$query = $db->getQuery(true)
-			->select('*')
-			->from($db->quoteName('#__packages'))
-			->where($db->quoteName('abandoned') . ' = :abandoned')
-			->bind('abandoned', $abandoned, ParameterType::INTEGER);
-
-		return $db->setQuery($query)->loadObjectList('id');
-	}
-
-	/**
-	 * Get a package's data
-	 *
-	 * @param   string  $packageName  The package to lookup
-	 *
-	 * @return  \stdClass
-	 *
-	 * @throws  \RuntimeException
-	 */
-	public function getPackage(string $packageName): \stdClass
-	{
-		$db = $this->getDb();
-
-		$query = $db->getQuery(true)
-			->select('*')
-			->from($db->quoteName('#__packages'))
-			->where($db->quoteName('package') . ' = :package');
-
-		$query->bind('package', $packageName, ParameterType::STRING);
-
-		$package = $db->setQuery($query)->loadObject();
-
-		if (!$package)
+		if (!isset($this->legalDashboards[$dashboardName]))
 		{
-			throw new \RuntimeException(sprintf('Unable to find release data for the `%s` package', $package->display), 404);
+			return 'dashboard.twig';
 		}
 
-		return $package;
-	}
-
-	/**
-	 * Get the known package names
-	 *
-	 * @return  array
-	 */
-	public function getPackageNames(): array
-	{
-		$db = $this->getDb();
-
-		$query = $db->getQuery(true)
-			->select(['id', 'package'])
-			->from($db->quoteName('#__packages'));
-
-		return $db->setQuery($query)->loadAssocList('id', 'package');
-	}
-
-	/**
-	 * Get the known package data
-	 *
-	 * @return  array
-	 */
-	public function getPackages(): array
-	{
-		$db = $this->getDb();
-
-		$query = $db->getQuery(true)
-			->select('*')
-			->from($db->quoteName('#__packages'));
-
-		return $db->setQuery($query)->loadObjectList('id');
-	}
-
-	/**
-	 * Update a package
-	 *
-	 * @param   integer  $packageId     The local package ID
-	 * @param   string   $packageName   The package name as registered with Packagist
-	 * @param   string   $displayName   The package's display name
-	 * @param   string   $repoName      The package's repo name
-	 * @param   boolean  $isStable      Flag indicating the package is stable
-	 * @param   boolean  $isDeprecated  Flag indicating the package is deprecated
-	 * @param   boolean  $isAbandoned   Flag indicating the package is abandoned
-	 *
-	 * @return  void
-	 */
-	public function updatePackage(int $packageId, string $packageName, string $displayName, string $repoName, bool $isStable, bool $isDeprecated, bool $isAbandoned): void
-	{
-		$db = $this->getDb();
-
-		$data = (object) [
-			'id'         => $packageId,
-			'package'    => $packageName,
-			'display'    => $displayName,
-			'repo'       => $repoName,
-			'stable'     => (int) $isStable,
-			'deprecated' => (int) $isDeprecated,
-			'abandoned'  => (int) $isAbandoned,
-		];
-
-		$db->updateObject('#__packages', $data, 'id');
+		return $this->legalDashboards[$dashboardName];
 	}
 }

week-03/project/libraries/src/Model/PageModel.php

@@ -1,12 +1,14 @@
 <?php
 /**
- * Joomla! Framework Website
+ * @package    Octoleo CMS
  *
- * @copyright  Copyright (C) 2014 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license    http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License Version 2 or Later
+ * @created    9th April 2022
+ * @author     Llewellyn van der Merwe <https://git.vdm.dev/Llewellyn>
+ * @git        WEBD-325-45 <https://git.vdm.dev/Llewellyn/WEBD-325-45>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace Joomla\FrameworkWebsite\Model;
+namespace Octoleo\CMS\Model;
 
 use Joomla\Database\DatabaseDriver;
 use Joomla\Database\ParameterType;
@@ -14,12 +16,27 @@ use Joomla\Model\DatabaseModelInterface;
 use Joomla\Model\DatabaseModelTrait;
 
 /**
- * Model class for packages
+ * Model class for pages
+ * source: https://github.com/joomla/framework.joomla.org/blob/master/src/Model/PackageModel.php
  */
-class PackageModel implements DatabaseModelInterface
+class PageModel implements DatabaseModelInterface
 {
 	use DatabaseModelTrait;
 
+	/**
+	 * Array of legal pages
+	 *
+	 * @var array
+	 */
+	private $legalPages = ['products', 'blog', 'about-us', 'location', 'contact-us'];
+
+	/**
+	 * Array of legal details pages
+	 *
+	 * @var array
+	 */
+	private $legalDetailsPages = ['yachts', 'ski-boats', 'drones'];
+
 	/**
 	 * Instantiate the model.
 	 *
@@ -31,142 +48,40 @@ class PackageModel implements DatabaseModelInterface
 	}
 
 	/**
-	 * Add a package
+	 * Get a page's data
 	 *
-	 * @param   string   $packageName   The package name as registered with Packagist
-	 * @param   string   $displayName   The package's display name
-	 * @param   string   $repoName      The package's repo name
-	 * @param   boolean  $isStable      Flag indicating the package is stable
-	 * @param   boolean  $isDeprecated  Flag indicating the package is deprecated
-	 * @param   boolean  $isAbandoned   Flag indicating the package is abandoned
+	 * @param   string  $pageName  The page to lookup
 	 *
-	 * @return  void
-	 */
-	public function addPackage(string $packageName, string $displayName, string $repoName, bool $isStable, bool $isDeprecated, bool $isAbandoned): void
-	{
-		$db = $this->getDb();
-
-		$data = (object) [
-			'package'    => $packageName,
-			'display'    => $displayName,
-			'repo'       => $repoName,
-			'stable'     => (int) $isStable,
-			'deprecated' => (int) $isDeprecated,
-			'abandoned'  => (int) $isAbandoned,
-		];
-
-		$db->insertObject('#__packages', $data);
-	}
-
-	/**
-	 * Get the active package data
-	 *
-	 * @return  array
-	 */
-	public function getActivePackages(): array
-	{
-		$abandoned = false;
-
-		$db = $this->getDb();
-
-		$query = $db->getQuery(true)
-			->select('*')
-			->from($db->quoteName('#__packages'))
-			->where($db->quoteName('abandoned') . ' = :abandoned')
-			->bind('abandoned', $abandoned, ParameterType::INTEGER);
-
-		return $db->setQuery($query)->loadObjectList('id');
-	}
-
-	/**
-	 * Get a package's data
-	 *
-	 * @param   string  $packageName  The package to lookup
-	 *
-	 * @return  \stdClass
+	 * @return  string
 	 *
 	 * @throws  \RuntimeException
 	 */
-	public function getPackage(string $packageName): \stdClass
+	public function getPage(string $pageName): string
 	{
-		$db = $this->getDb();
-
-		$query = $db->getQuery(true)
-			->select('*')
-			->from($db->quoteName('#__packages'))
-			->where($db->quoteName('package') . ' = :package');
-
-		$query->bind('package', $packageName, ParameterType::STRING);
-
-		$package = $db->setQuery($query)->loadObject();
-
-		if (!$package)
+		if (!in_array($pageName, $this->legalPages))
 		{
-			throw new \RuntimeException(sprintf('Unable to find release data for the `%s` package', $package->display), 404);
+			throw new \RuntimeException(sprintf('Unable to find page data for the `%s`', $pageName), 404);
 		}
 
-		return $package;
+		return $pageName;
 	}
 
 	/**
-	 * Get the known package names
+	 * Get a page's details data
 	 *
-	 * @return  array
+	 * @param   string  $detailsName  The page details to lookup
+	 *
+	 * @return  string
+	 *
+	 * @throws  \RuntimeException
 	 */
-	public function getPackageNames(): array
+	public function getDetails(string $detailsName): string
 	{
-		$db = $this->getDb();
+		if (strlen($detailsName) && !in_array($detailsName, $this->legalDetailsPages))
+		{
+			throw new \RuntimeException(sprintf('Unable to find page details data for the `%s`', $detailsName), 404);
+		}
 
-		$query = $db->getQuery(true)
-			->select(['id', 'package'])
-			->from($db->quoteName('#__packages'));
-
-		return $db->setQuery($query)->loadAssocList('id', 'package');
-	}
-
-	/**
-	 * Get the known package data
-	 *
-	 * @return  array
-	 */
-	public function getPackages(): array
-	{
-		$db = $this->getDb();
-
-		$query = $db->getQuery(true)
-			->select('*')
-			->from($db->quoteName('#__packages'));
-
-		return $db->setQuery($query)->loadObjectList('id');
-	}
-
-	/**
-	 * Update a package
-	 *
-	 * @param   integer  $packageId     The local package ID
-	 * @param   string   $packageName   The package name as registered with Packagist
-	 * @param   string   $displayName   The package's display name
-	 * @param   string   $repoName      The package's repo name
-	 * @param   boolean  $isStable      Flag indicating the package is stable
-	 * @param   boolean  $isDeprecated  Flag indicating the package is deprecated
-	 * @param   boolean  $isAbandoned   Flag indicating the package is abandoned
-	 *
-	 * @return  void
-	 */
-	public function updatePackage(int $packageId, string $packageName, string $displayName, string $repoName, bool $isStable, bool $isDeprecated, bool $isAbandoned): void
-	{
-		$db = $this->getDb();
-
-		$data = (object) [
-			'id'         => $packageId,
-			'package'    => $packageName,
-			'display'    => $displayName,
-			'repo'       => $repoName,
-			'stable'     => (int) $isStable,
-			'deprecated' => (int) $isDeprecated,
-			'abandoned'  => (int) $isAbandoned,
-		];
-
-		$db->updateObject('#__packages', $data, 'id');
+		return $detailsName;
 	}
 }

week-03/project/libraries/src/Renderer/ApplicationContext.php

@@ -6,7 +6,7 @@
  * @license    http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License Version 2 or Later
  */
 
-namespace Joomla\FrameworkWebsite\Renderer;
+namespace Octoleo\CMS\Renderer;
 
 use Joomla\Application\AbstractApplication;
 use Joomla\Application\AbstractWebApplication;
@@ -14,6 +14,7 @@ use Symfony\Component\Asset\Context\ContextInterface;
 
 /**
  * Joomla! application aware context
+ * source: https://github.com/joomla/framework.joomla.org/blob/master/src/Renderer/ApplicationContext.php
  */
 class ApplicationContext implements ContextInterface
 {
@@ -58,4 +59,4 @@ class ApplicationContext implements ContextInterface
 
 		return false;
 	}
-}
+}

week-03/project/libraries/src/Renderer/FrameworkExtension.php

@@ -6,7 +6,7 @@
  * @license    http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License Version 2 or Later
  */
 
-namespace Joomla\FrameworkWebsite\Renderer;
+namespace Octoleo\CMS\Renderer;
 
 use Symfony\Component\Asset\Packages;
 use Twig\Extension\AbstractExtension;
@@ -15,6 +15,7 @@ use Twig\TwigFunction;
 
 /**
  * Framework site's Twig extension class
+ * source: https://github.com/joomla/framework.joomla.org/blob/master/src/Renderer/FrameworkExtension.php
  */
 class FrameworkExtension extends AbstractExtension
 {

week-03/project/libraries/src/Renderer/FrameworkTwigRuntime.php

@@ -6,13 +6,14 @@
  * @license    http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License Version 2 or Later
  */
 
-namespace Joomla\FrameworkWebsite\Renderer;
+namespace Octoleo\CMS\Renderer;
 
 use Joomla\Application\AbstractApplication;
 use Joomla\Preload\PreloadManager;
 
 /**
  * Twig runtime class
+ * source: https://github.com/joomla/framework.joomla.org/blob/master/src/Renderer/FrameworkTwigRuntime.php
  */
 class FrameworkTwigRuntime
 {
@@ -157,4 +158,4 @@ class FrameworkTwigRuntime
 
 		return $uri;
 	}
-}
+}

week-03/project/libraries/src/Service/AdminApplicationProvider.php

@@ -1,65 +1,44 @@
 <?php
 /**
- * Joomla! Framework Website
+ * @package    Octoleo CMS
  *
- * @copyright  Copyright (C) 2014 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license    http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License Version 2 or Later
+ * @created    9th April 2022
+ * @author     Llewellyn van der Merwe <https://git.vdm.dev/Llewellyn>
+ * @git        WEBD-325-45 <https://git.vdm.dev/Llewellyn/WEBD-325-45>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace Joomla\FrameworkWebsite\Service;
+namespace Octoleo\CMS\Service;
 
 use Joomla\Application\AbstractWebApplication;
 use Joomla\Application\Controller\ContainerControllerResolver;
 use Joomla\Application\Controller\ControllerResolverInterface;
 use Joomla\Application\Web\WebClient;
-use Joomla\Console\Application as ConsoleApplication;
-use Joomla\Console\Loader\ContainerLoader;
-use Joomla\Console\Loader\LoaderInterface;
 use Joomla\Database\DatabaseInterface;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
-use Joomla\Event\Command\DebugEventDispatcherCommand;
 use Joomla\Event\DispatcherInterface;
-use Joomla\FrameworkWebsite\Command\GenerateSriCommand;
-use Joomla\FrameworkWebsite\Command\Package\SyncCommand as PackageSyncCommand;
-use Joomla\FrameworkWebsite\Command\Packagist\DownloadsCommand;
-use Joomla\FrameworkWebsite\Command\Packagist\SyncCommand as PackagistSyncCommand;
-use Joomla\FrameworkWebsite\Command\Twig\ResetCacheCommand;
-use Joomla\FrameworkWebsite\Command\UpdateCommand;
-use Joomla\FrameworkWebsite\Controller\Api\PackageControllerGet;
-use Joomla\FrameworkWebsite\Controller\Api\StatusControllerGet;
-use Joomla\FrameworkWebsite\Controller\HomepageController;
-use Joomla\FrameworkWebsite\Controller\PackageController;
-use Joomla\FrameworkWebsite\Controller\PageController;
-use Joomla\FrameworkWebsite\Controller\StatusController;
-use Joomla\FrameworkWebsite\Controller\WrongCmsController;
-use Joomla\FrameworkWebsite\Helper;
-use Joomla\FrameworkWebsite\Helper\PackagistHelper;
-use Joomla\FrameworkWebsite\Model\PackageModel;
-use Joomla\FrameworkWebsite\Model\ReleaseModel;
-use Joomla\FrameworkWebsite\View\Package\PackageHtmlView;
-use Joomla\FrameworkWebsite\View\Package\PackageJsonView;
-use Joomla\FrameworkWebsite\View\Status\StatusHtmlView;
-use Joomla\FrameworkWebsite\View\Status\StatusJsonView;
-use Joomla\FrameworkWebsite\WebApplication;
-use Joomla\Http\Http;
+
+use Joomla\Session\SessionInterface;
+use Octoleo\CMS\Controller\DashboardController;
+use Octoleo\CMS\Controller\LoginController;
+use Octoleo\CMS\Controller\WrongCmsController;
+use Octoleo\CMS\Model\DashboardModel;
+use Octoleo\CMS\User\UserFactoryInterface;
+use Octoleo\CMS\View\Admin\DashboardHtmlView;
+use Octoleo\CMS\Application\AdminApplication;
+
 use Joomla\Input\Input;
-use Joomla\Registry\Registry;
 use Joomla\Renderer\RendererInterface;
-use Joomla\Renderer\TwigRenderer;
-use Joomla\Router\Command\DebugRouterCommand;
-use Joomla\Router\Route;
 use Joomla\Router\Router;
 use Joomla\Router\RouterInterface;
 use Psr\Log\LoggerInterface;
-use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\Console\Output\ConsoleOutput;
-use TheIconic\Tracking\GoogleAnalytics\Analytics;
 
 /**
  * Application service provider
+ * source: https://github.com/joomla/framework.joomla.org/blob/master/src/Service/ApplicationProvider.php
  */
-class ApplicationProvider implements ServiceProviderInterface
+class AdminApplicationProvider implements ServiceProviderInterface
 {
 	/**
 	 * Registers the service provider with a DI container.
@@ -74,34 +53,18 @@ class ApplicationProvider implements ServiceProviderInterface
 		 * Application Classes
 		 */
 
-		$container->share(ConsoleApplication::class, [$this, 'getConsoleApplicationService'], true);
-
 		// This service cannot be protected as it is decorated when the debug bar is available
-		$container->alias(WebApplication::class, AbstractWebApplication::class)
-			->share(AbstractWebApplication::class, [$this, 'getWebApplicationClassService']);
+		$container->alias(AdminApplication::class, AbstractWebApplication::class)
+			->share(AbstractWebApplication::class, [$this, 'getAdminApplicationClassService']);
 
 		/*
 		 * Application Helpers and Dependencies
 		 */
 
-		$container->alias(Analytics::class, 'analytics')
-			->share('analytics', [$this, 'getAnalyticsService'], true);
-
-		$container->alias(ContainerLoader::class, LoaderInterface::class)
-			->share(LoaderInterface::class, [$this, 'getCommandLoaderService'], true);
-
 		// This service cannot be protected as it is decorated when the debug bar is available
 		$container->alias(ContainerControllerResolver::class, ControllerResolverInterface::class)
 			->share(ControllerResolverInterface::class, [$this, 'getControllerResolverService']);
 
-		$container->alias(Helper::class, 'application.helper')
-			->share('application.helper', [$this, 'getApplicationHelperService'], true);
-
-		$container->alias(PackagistHelper::class, 'application.helper.packagist')
-			->share('application.helper.packagist', [$this, 'getApplicationHelperPackagistService'], true);
-
-		$container->share('application.packages', [$this, 'getApplicationPackagesService'], true);
-
 		$container->share(WebClient::class, [$this, 'getWebClientService'], true);
 
 		// This service cannot be protected as it is decorated when the debug bar is available
@@ -111,118 +74,27 @@ class ApplicationProvider implements ServiceProviderInterface
 
 		$container->share(Input::class, [$this, 'getInputClassService'], true);
 
-		/*
-		 * Console Commands
-		 */
-
-		$container->share(DebugEventDispatcherCommand::class, [$this, 'getDebugEventDispatcherCommandService'], true);
-		$container->share(DebugRouterCommand::class, [$this, 'getDebugRouterCommandService'], true);
-		$container->share(DownloadsCommand::class, [$this, 'getDownloadsCommandService'], true);
-		$container->share(GenerateSriCommand::class, [$this, 'getGenerateSriCommandService'], true);
-		$container->share(PackageSyncCommand::class, [$this, 'getPackageSyncCommandService'], true);
-		$container->share(PackagistSyncCommand::class, [$this, 'getPackagistSyncCommandService'], true);
-		$container->share(ResetCacheCommand::class, [$this, 'getResetCacheCommandService'], true);
-		$container->share(UpdateCommand::class, [$this, 'getUpdateCommandService'], true);
-
 		/*
 		 * MVC Layer
 		 */
 
 		// Controllers
-		$container->alias(PackageControllerGet::class, 'controller.api.package')
-			->share('controller.api.package', [$this, 'getControllerApiPackageService'], true);
+		$container->alias(DashboardController::class, 'controller.dashboard')
+			->share('controller.dashboard', [$this, 'getControllerDashboardService'], true);
 
-		$container->alias(StatusControllerGet::class, 'controller.api.status')
-			->share('controller.api.status', [$this, 'getControllerApiStatusService'], true);
-
-		$container->alias(HomepageController::class, 'controller.homepage')
-			->share('controller.homepage', [$this, 'getControllerHomepageService'], true);
-
-		$container->alias(PackageController::class, 'controller.package')
-			->share('controller.package', [$this, 'getControllerPackageService'], true);
-
-		$container->alias(PageController::class, 'controller.page')
-			->share('controller.page', [$this, 'getControllerPageService'], true);
-
-		$container->alias(StatusController::class, 'controller.status')
-			->share('controller.status', [$this, 'getControllerStatusService'], true);
+		$container->alias(LoginController::class, 'controller.login')
+			->share('controller.login', [$this, 'getControllerLoginService'], true);
 
 		$container->alias(WrongCmsController::class, 'controller.wrong.cms')
 			->share('controller.wrong.cms', [$this, 'getControllerWrongCmsService'], true);
 
 		// Models
-		$container->alias(PackageModel::class, 'model.package')
-			->share('model.package', [$this, 'getModelPackageService'], true);
-
-		$container->alias(ReleaseModel::class, 'model.release')
-			->share('model.release', [$this, 'getModelReleaseService'], true);
+		$container->alias(DashboardModel::class, 'model.dashboard')
+			->share('model.dashboard', [$this, 'getModelDashboardService'], true);
 
 		// Views
-		$container->alias(PackageHtmlView::class, 'view.package.html')
-			->share('view.package.html', [$this, 'getViewPackageHtmlService'], true);
-
-		$container->alias(PackageJsonView::class, 'view.package.json')
-			->share('view.package.json', [$this, 'getViewPackageJsonService'], true);
-
-		$container->alias(StatusHtmlView::class, 'view.status.html')
-			->share('view.status.html', [$this, 'getViewStatusHtmlService'], true);
-
-		$container->alias(StatusJsonView::class, 'view.status.json')
-			->share('view.status.json', [$this, 'getViewStatusJsonService'], true);
-	}
-
-	/**
-	 * Get the Analytics class service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  Analytics
-	 */
-	public function getAnalyticsService(Container $container)
-	{
-		return new Analytics(true);
-	}
-
-	/**
-	 * Get the `application.helper` service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  Helper
-	 */
-	public function getApplicationHelperService(Container $container): Helper
-	{
-		$helper = new Helper;
-		$helper->setPackages($container->get('application.packages'));
-
-		return $helper;
-	}
-
-	/**
-	 * Get the `application.helper.packagist` service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  PackagistHelper
-	 */
-	public function getApplicationHelperPackagistService(Container $container): PackagistHelper
-	{
-		$helper = new PackagistHelper($container->get(Http::class), $container->get(DatabaseInterface::class));
-		$helper->setPackages($container->get('application.packages'));
-
-		return $helper;
-	}
-
-	/**
-	 * Get the `application.packages` service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  Registry
-	 */
-	public function getApplicationPackagesService(Container $container): Registry
-	{
-		return (new Registry)->loadFile(JPATH_ROOT . '/packages.yml', 'YAML');
+		$container->alias(DashboardHtmlView::class, 'view.dashboard.html')
+			->share('view.dashboard.html', [$this, 'getViewDashboardHtmlService'], true);
 	}
 
 	/**
@@ -239,232 +111,47 @@ class ApplicationProvider implements ServiceProviderInterface
 		/*
 		 * CMS Admin Panels
 		 */
-		$router->get(
-			'/administrator',
-			WrongCmsController::class
+		$router->all(
+			'/index.php?dashboard=*',
+			DashboardController::class
 		);
-
 		$router->get(
-			'/administrator/*',
-			WrongCmsController::class
-		);
-
-		$router->get(
-			'/wp-admin',
-			WrongCmsController::class
-		);
-
-		$router->get(
-			'/wp-admin/*',
-			WrongCmsController::class
-		);
-
-		$router->get(
-			'wp-login.php',
-			WrongCmsController::class
-		);
-
-		/*
-		 * Web routes
-		 */
-		$router->addRoute(new Route(['GET', 'HEAD'], '/', HomepageController::class));
-
-		$router->get(
-			'/status',
-			StatusController::class
-		);
-
-		$router->get(
-			'/:view',
-			PageController::class
-		);
-
-		$router->get(
-			'/status/:package',
-			PackageController::class
-		);
-
-		/*
-		 * API routes
-		 */
-		$router->get(
-			'/api/v1/packages',
-			StatusControllerGet::class,
-			[],
-			[
-				'_format' => 'json',
-			]
-		);
-
-		$router->get(
-			'/api/v1/packages/:package',
-			PackageControllerGet::class,
-			[],
-			[
-				'_format' => 'json',
-			]
+			'/*',
+			LoginController::class
 		);
 
 		return $router;
 	}
 
 	/**
-	 * Get the LoaderInterface service
+	 * Get the `controller.login` service
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
-	 * @return  LoaderInterface
+	 * @return  LoginController
 	 */
-	public function getCommandLoaderService(Container $container): LoaderInterface
+	public function getControllerLoginService(Container $container): LoginController
 	{
-		$mapping = [
-			DebugEventDispatcherCommand::getDefaultName() => DebugEventDispatcherCommand::class,
-			DebugRouterCommand::getDefaultName()          => DebugRouterCommand::class,
-			DownloadsCommand::getDefaultName()            => DownloadsCommand::class,
-			PackageSyncCommand::getDefaultName()          => PackageSyncCommand::class,
-			PackagistSyncCommand::getDefaultName()        => PackagistSyncCommand::class,
-			GenerateSriCommand::getDefaultName()          => GenerateSriCommand::class,
-			ResetCacheCommand::getDefaultName()           => ResetCacheCommand::class,
-			UpdateCommand::getDefaultName()               => UpdateCommand::class,
-		];
-
-		return new ContainerLoader($container, $mapping);
-	}
-
-	/**
-	 * Get the ConsoleApplication service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  ConsoleApplication
-	 */
-	public function getConsoleApplicationService(Container $container): ConsoleApplication
-	{
-		$application = new ConsoleApplication(new ArgvInput, new ConsoleOutput, $container->get('config'));
-
-		$application->setCommandLoader($container->get(LoaderInterface::class));
-		$application->setDispatcher($container->get(DispatcherInterface::class));
-		$application->setLogger($container->get(LoggerInterface::class));
-		$application->setName('Joomla! Framework Website');
-
-		return $application;
-	}
-
-	/**
-	 * Get the `controller.api.package` service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  PackageControllerGet
-	 */
-	public function getControllerApiPackageService(Container $container): PackageControllerGet
-	{
-		$controller = new PackageControllerGet(
-			$container->get(PackageJsonView::class),
-			$container->get(Analytics::class),
-			$container->get(Input::class),
-			$container->get(WebApplication::class)
-		);
-
-		$controller->setLogger($container->get(LoggerInterface::class));
-
-		return $controller;
-	}
-
-	/**
-	 * Get the `controller.api.status` service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  StatusControllerGet
-	 */
-	public function getControllerApiStatusService(Container $container): StatusControllerGet
-	{
-		$controller = new StatusControllerGet(
-			$container->get(StatusJsonView::class),
-			$container->get(Analytics::class),
-			$container->get(Input::class),
-			$container->get(WebApplication::class)
-		);
-
-		$controller->setLogger($container->get(LoggerInterface::class));
-
-		return $controller;
-	}
-
-	/**
-	 * Get the `controller.homepage` service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  HomepageController
-	 */
-	public function getControllerHomepageService(Container $container): HomepageController
-	{
-		return new HomepageController(
+		return new LoginController(
 			$container->get(RendererInterface::class),
 			$container->get(Input::class),
-			$container->get(WebApplication::class)
+			$container->get(AdminApplication::class)
 		);
 	}
 
 	/**
-	 * Get the `controller.package` service
+	 * Get the `controller.dashboard` service
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
-	 * @return  PackageController
+	 * @return  DashboardController
 	 */
-	public function getControllerPackageService(Container $container): PackageController
+	public function getControllerDashboardService(Container $container): DashboardController
 	{
-		return new PackageController(
-			$container->get(PackageHtmlView::class),
+		return new DashboardController(
+			$container->get(DashboardHtmlView::class),
 			$container->get(Input::class),
-			$container->get(WebApplication::class)
-		);
-	}
-
-	/**
-	 * Get the `controller.page` service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  PageController
-	 */
-	public function getControllerPageService(Container $container): PageController
-	{
-		return new PageController(
-			$container->get(RendererInterface::class),
-			$container->get(Input::class),
-			$container->get(WebApplication::class)
-		);
-	}
-
-	/**
-	 * Get the controller resolver service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  ControllerResolverInterface
-	 */
-	public function getControllerResolverService(Container $container): ControllerResolverInterface
-	{
-		return new ContainerControllerResolver($container);
-	}
-
-	/**
-	 * Get the `controller.status` service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  StatusController
-	 */
-	public function getControllerStatusService(Container $container): StatusController
-	{
-		return new StatusController(
-			$container->get(StatusHtmlView::class),
-			$container->get(Input::class),
-			$container->get(WebApplication::class)
+			$container->get(AdminApplication::class)
 		);
 	}
 
@@ -479,64 +166,10 @@ class ApplicationProvider implements ServiceProviderInterface
 	{
 		return new WrongCmsController(
 			$container->get(Input::class),
-			$container->get(WebApplication::class)
+			$container->get(AdminApplication::class)
 		);
 	}
 
-	/**
-	 * Get the DebugEventDispatcherCommand service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  DebugEventDispatcherCommand
-	 */
-	public function getDebugEventDispatcherCommandService(Container $container): DebugEventDispatcherCommand
-	{
-		return new DebugEventDispatcherCommand(
-			$container->get(DispatcherInterface::class)
-		);
-	}
-
-	/**
-	 * Get the DebugRouterCommand service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  DebugRouterCommand
-	 */
-	public function getDebugRouterCommandService(Container $container): DebugRouterCommand
-	{
-		return new DebugRouterCommand(
-			$container->get(Router::class)
-		);
-	}
-
-	/**
-	 * Get the DownloadsCommand service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  DownloadsCommand
-	 */
-	public function getDownloadsCommandService(Container $container): DownloadsCommand
-	{
-		return new DownloadsCommand(
-			$container->get(PackagistHelper::class)
-		);
-	}
-
-	/**
-	 * Get the GenerateSriCommand service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  GenerateSriCommand
-	 */
-	public function getGenerateSriCommandService(Container $container): GenerateSriCommand
-	{
-		return new GenerateSriCommand;
-	}
-
 	/**
 	 * Get the Input class service
 	 *
@@ -550,156 +183,15 @@ class ApplicationProvider implements ServiceProviderInterface
 	}
 
 	/**
-	 * Get the `model.package` service
+	 * Get the `model.dashboard` service
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
-	 * @return  PackageModel
+	 * @return  DashboardModel
 	 */
-	public function getModelPackageService(Container $container): PackageModel
+	public function getModelDashboardService(Container $container): DashboardModel
 	{
-		return new PackageModel($container->get(DatabaseInterface::class));
-	}
-
-	/**
-	 * Get the `model.release` service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  ReleaseModel
-	 */
-	public function getModelReleaseService(Container $container): ReleaseModel
-	{
-		return new ReleaseModel($container->get(DatabaseInterface::class));
-	}
-
-	/**
-	 * Get the PackageSyncCommand service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  PackageSyncCommand
-	 */
-	public function getPackageSyncCommandService(Container $container): PackageSyncCommand
-	{
-		return new PackageSyncCommand(
-			$container->get(Helper::class),
-			$container->get(PackageModel::class)
-		);
-	}
-
-	/**
-	 * Get the PackagistSyncCommand service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  PackagistSyncCommand
-	 */
-	public function getPackagistSyncCommandService(Container $container): PackagistSyncCommand
-	{
-		return new PackagistSyncCommand(
-			$container->get(Http::class),
-			$container->get(PackageModel::class),
-			$container->get(ReleaseModel::class)
-		);
-	}
-
-	/**
-	 * Get the ResetCacheCommand service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  ResetCacheCommand
-	 */
-	public function getResetCacheCommandService(Container $container): ResetCacheCommand
-	{
-		return new ResetCacheCommand(
-			$container->get(TwigRenderer::class),
-			$container->get('config')
-		);
-	}
-
-	/**
-	 * Get the UpdateCommand service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  UpdateCommand
-	 */
-	public function getUpdateCommandService(Container $container): UpdateCommand
-	{
-		return new UpdateCommand;
-	}
-
-	/**
-	 * Get the `view.package.html` service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  PackageHtmlView
-	 */
-	public function getViewPackageHtmlService(Container $container): PackageHtmlView
-	{
-		$view = new PackageHtmlView(
-			$container->get('model.package'),
-			$container->get('model.release'),
-			$container->get(Helper::class),
-			$container->get('renderer')
-		);
-
-		$view->setLayout('package.twig');
-
-		return $view;
-	}
-
-	/**
-	 * Get the `view.package.json` service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  PackageJsonView
-	 */
-	public function getViewPackageJsonService(Container $container): PackageJsonView
-	{
-		return new PackageJsonView(
-			$container->get('model.package'),
-			$container->get('model.release')
-		);
-	}
-
-	/**
-	 * Get the `view.status.html` service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  StatusHtmlView
-	 */
-	public function getViewStatusHtmlService(Container $container): StatusHtmlView
-	{
-		$view = new StatusHtmlView(
-			$container->get('model.package'),
-			$container->get('model.release'),
-			$container->get('renderer')
-		);
-
-		$view->setLayout('status.twig');
-
-		return $view;
-	}
-
-	/**
-	 * Get the `view.status.json` service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  StatusJsonView
-	 */
-	public function getViewStatusJsonService(Container $container): StatusJsonView
-	{
-		return new StatusJsonView(
-			$container->get('model.package'),
-			$container->get('model.release')
-		);
+		return new DashboardModel($container->get(DatabaseInterface::class));
 	}
 
 	/**
@@ -707,11 +199,12 @@ class ApplicationProvider implements ServiceProviderInterface
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
-	 * @return  WebApplication
+	 * @return  AdminApplication
 	 */
-	public function getWebApplicationClassService(Container $container): WebApplication
+	public function getAdminApplicationClassService(Container $container): AdminApplication
 	{
-		$application = new WebApplication(
+		/** @var \Octoleo\CMS\Application\AdminApplication $application */
+		$application = new AdminApplication(
 			$container->get(ControllerResolverInterface::class),
 			$container->get(RouterInterface::class),
 			$container->get(Input::class),
@@ -724,10 +217,39 @@ class ApplicationProvider implements ServiceProviderInterface
 		// Inject extra services
 		$application->setDispatcher($container->get(DispatcherInterface::class));
 		$application->setLogger($container->get(LoggerInterface::class));
+		$application->setSession($container->get(SessionInterface::class));
+		$application->setUserFactory($container->get(UserFactoryInterface::class));
 
 		return $application;
 	}
 
+	/**
+	 * Get the controller resolver service
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  ControllerResolverInterface
+	 */
+	public function getControllerResolverService(Container $container): ControllerResolverInterface
+	{
+		return new ContainerControllerResolver($container);
+	}
+
+	/**
+	 * Get the `view.page.html` service
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  DashboardHtmlView
+	 */
+	public function getViewDashboardHtmlService(Container $container): DashboardHtmlView
+	{
+		return new DashboardHtmlView(
+			$container->get('model.dashboard'),
+			$container->get('renderer')
+		);
+	}
+
 	/**
 	 * Get the web client service
 	 *

week-03/project/libraries/src/Service/ConfigurationProvider.php

@@ -1,20 +1,19 @@
 <?php
 /**
- * Joomla! Framework Website
+ * @package    Octoleo CMS
  *
- * @copyright  Copyright (C) 2014 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license    http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License Version 2 or Later
+ * @created    9th April 2022
+ * @author     Llewellyn van der Merwe <https://git.vdm.dev/Llewellyn>
+ * @git        WEBD-325-45 <https://git.vdm.dev/Llewellyn/WEBD-325-45>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace Joomla\FrameworkWebsite\Service;
+namespace Octoleo\CMS\Service;
 
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
 use Joomla\Registry\Registry;
 
-/**
- * Configuration service provider
- */
 class ConfigurationProvider implements ServiceProviderInterface
 {
 	/**
@@ -39,10 +38,21 @@ class ConfigurationProvider implements ServiceProviderInterface
 			throw new \RuntimeException('Configuration file does not exist or is unreadable.');
 		}
 
-		$this->config = (new Registry)->loadFile($file);
+		// load the class
+		include_once $file;
+		$this->config = new Registry(new \LConfig());
 
-		// Hardcode database driver option
-		$this->config->set('database.driver', 'mysql');
+		// Set database values based on config values
+		$this->config->loadObject( (object) ['database' => [
+			'driver' => 'mysql',
+			'host' => $this->config->get('host'),
+			'port' => $this->config->get('port', ''),
+			'user' => $this->config->get('user'),
+			'password' => $this->config->get('password'),
+			'database' => $this->config->get('db'),
+			'prefix' => $this->config->get('dbprefix')
+			]
+		]);
 	}
 
 	/**

week-03/project/libraries/src/Service/EventProvider.php

@@ -1,23 +1,24 @@
 <?php
 /**
- * Joomla! Framework Website
- *
- * @copyright  Copyright (C) 2014 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license    http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License Version 2 or Later
- */
+* Joomla! Framework Website
+*
+* @copyright  Copyright (C) 2014 - 2017 Open Source Matters, Inc. All rights reserved.
+* @license    http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License Version 2 or Later
+*/
 
-namespace Joomla\FrameworkWebsite\Service;
+namespace Octoleo\CMS\Service;
 
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
 use Joomla\Event\Dispatcher;
 use Joomla\Event\DispatcherInterface;
-use Joomla\FrameworkWebsite\EventListener\ErrorSubscriber;
+use Octoleo\CMS\EventListener\ErrorSubscriber;
 use Joomla\Renderer\RendererInterface;
 use Psr\Log\LoggerInterface;
 
 /**
  * Event service provider
+ * source: https://github.com/joomla/framework.joomla.org/blob/master/src/Service/EventProvider.php
  */
 class EventProvider implements ServiceProviderInterface
 {

week-03/project/libraries/src/Service/HttpProvider.php

@@ -1,12 +1,12 @@
 <?php
 /**
- * Joomla! Framework Website
- *
- * @copyright  Copyright (C) 2014 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license    http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License Version 2 or Later
- */
+* Joomla! Framework Website
+*
+* @copyright  Copyright (C) 2014 - 2017 Open Source Matters, Inc. All rights reserved.
+* @license    http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License Version 2 or Later
+*/
 
-namespace Joomla\FrameworkWebsite\Service;
+namespace Octoleo\CMS\Service;
 
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
@@ -15,6 +15,7 @@ use Joomla\Http\HttpFactory;
 
 /**
  * HTTP service provider
+ * source: https://github.com/joomla/framework.joomla.org/blob/master/src/Service/HttpProvider.php
  */
 class HttpProvider implements ServiceProviderInterface
 {
@@ -60,4 +61,4 @@ class HttpProvider implements ServiceProviderInterface
 	{
 		return new HttpFactory;
 	}
-}
+}

week-03/project/libraries/src/Service/LoggingProvider.php

@@ -6,7 +6,7 @@
  * @license    http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License Version 2 or Later
  */
 
-namespace Joomla\FrameworkWebsite\Service;
+namespace Octoleo\CMS\Service;
 
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
@@ -17,6 +17,7 @@ use Monolog\Processor\WebProcessor;
 
 /**
  * Logging service provider
+ * source: https://github.com/joomla/framework.joomla.org/blob/master/src/Service/LoggingProvider.php
  */
 class LoggingProvider implements ServiceProviderInterface
 {
@@ -61,7 +62,7 @@ class LoggingProvider implements ServiceProviderInterface
 
 		$level = strtoupper($config->get('log.application', $config->get('log.level', 'error')));
 
-		return new StreamHandler(JPATH_ROOT . '/logs/framework.log', \constant('\\Monolog\\Logger::' . $level));
+		return new StreamHandler(LPATH_ROOT . '/logs/framework.log', \constant('\\Monolog\\Logger::' . $level));
 	}
 
 	/**
@@ -128,4 +129,4 @@ class LoggingProvider implements ServiceProviderInterface
 	{
 		return new WebProcessor;
 	}
-}
+}

week-03/project/libraries/src/Service/SessionProvider.php

@@ -1,47 +1,32 @@
 <?php
 /**
- * Joomla! Content Management System
+ * @package    Octoleo CMS
  *
- * @copyright   (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @created    9th April 2022
+ * @author     Llewellyn van der Merwe <https://git.vdm.dev/Llewellyn>
+ * @git        WEBD-325-45 <https://git.vdm.dev/Llewellyn/WEBD-325-45>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace Joomla\CMS\Service\Provider;
+namespace Octoleo\CMS\Service;
 
-\defined('JPATH_PLATFORM') or die;
-
-use Joomla\CMS\Application\AdministratorApplication;
-use Joomla\CMS\Application\ApplicationHelper;
-use Joomla\CMS\Application\CMSApplicationInterface;
-use Joomla\CMS\Application\ConsoleApplication;
-use Joomla\CMS\Application\SiteApplication;
-use Joomla\CMS\Factory;
-use Joomla\CMS\Installation\Application\InstallationApplication;
-use Joomla\CMS\Session\EventListener\MetadataManagerListener;
-use Joomla\CMS\Session\MetadataManager;
-use Joomla\CMS\Session\SessionFactory;
-use Joomla\CMS\Session\SessionManager;
-use Joomla\CMS\Session\Storage\JoomlaStorage;
+use Joomla\Application\AbstractWebApplication;
 use Joomla\Database\DatabaseInterface;
 use Joomla\DI\Container;
-use Joomla\DI\Exception\DependencyResolutionException;
 use Joomla\DI\ServiceProviderInterface;
-use Joomla\Event\DispatcherInterface;
-use Joomla\Event\LazyServiceEventListener;
-use Joomla\Event\Priority;
-use Joomla\Registry\Registry;
-use Joomla\Session\HandlerInterface;
-use Joomla\Session\SessionEvents;
+use Joomla\Event\Dispatcher;
+use Joomla\Session\Session;
 use Joomla\Session\SessionInterface;
-use Joomla\Session\Storage\RuntimeStorage;
+use Joomla\Session\Storage\NativeStorage as SessionNativeStorage;
 use Joomla\Session\StorageInterface;
+use Joomla\Session\Handler\DatabaseHandler as SessionDatabaseHandler;
+use Joomla\Session\HandlerInterface;
+use Octoleo\CMS\Session\MetadataManager;
 
 /**
- * Service provider for the application's session dependency
- *
- * @since  4.0.0
+ * Session service provider
  */
-class Session implements ServiceProviderInterface
+class SessionProvider implements ServiceProviderInterface
 {
 	/**
 	 * Registers the service provider with a DI container.
@@ -49,312 +34,95 @@ class Session implements ServiceProviderInterface
 	 * @param   Container  $container  The DI container.
 	 *
 	 * @return  void
-	 *
-	 * @since   4.0.0
 	 */
-	public function register(Container $container)
+	public function register(Container $container): void
 	{
-		$container->share(
-			'session.web.administrator',
-			function (Container $container)
-			{
-				/** @var Registry $config */
-				$config = $container->get('config');
-				$app    = Factory::getApplication();
 
-				// Generate a session name.
-				$name = ApplicationHelper::getHash($config->get('session_name', AdministratorApplication::class));
+		$container->alias(SessionDatabaseHandler::class, HandlerInterface::class)
+			->share(HandlerInterface::class, [$this, 'getSessionDatabaseHandlerClassService'], true);
 
-				// Calculate the session lifetime.
-				$lifetime = $config->get('lifetime') ? $config->get('lifetime') * 60 : 900;
+		$container->alias(SessionNativeStorage::class, StorageInterface::class)
+			->share(StorageInterface::class, [$this, 'getSessionNativeStorageClassService'], true);
 
-				// Initialize the options for the Session object.
-				$options = [
-					'name'   => $name,
-					'expire' => $lifetime,
-				];
+		$container->alias(Session::class, SessionInterface::class)
+			->share(SessionInterface::class, [$this, 'getSessionClassService'], true);
 
-				if ($config->get('force_ssl') >= 1)
-				{
-					$options['force_ssl'] = true;
-				}
-
-				$handler = $container->get('session.factory')->createSessionHandler($options);
-
-				if (!$container->has('session.handler'))
-				{
-					$this->registerSessionHandlerAsService($container, $handler);
-				}
-
-				return $this->buildSession(
-					new JoomlaStorage($app->input, $handler),
-					$app,
-					$container->get(DispatcherInterface::class),
-					$options
-				);
-			},
-			true
-		);
-
-		$container->share(
-			'session.web.installation',
-			function (Container $container)
-			{
-				/** @var Registry $config */
-				$config = $container->get('config');
-				$app    = Factory::getApplication();
-
-				/**
-				 * Session handler for the session is always filesystem so it doesn't flip to the database after
-				 * configuration.php has been written to
-				 */
-				$config->set('session_handler', 'filesystem');
-
-				/**
-				 * Generate a session name - unlike all the other apps we don't have either a secret or a session name
-				 * (that's not the app name) until we complete installation which then leads to us dropping things like
-				 * language preferences after installation as the app refreshes.
-				 */
-				$name = md5(serialize(JPATH_ROOT . InstallationApplication::class));
-
-				// Calculate the session lifetime.
-				$lifetime = $config->get('lifetime') ? $config->get('lifetime') * 60 : 900;
-
-				// Initialize the options for the Session object.
-				$options = [
-					'name'   => $name,
-					'expire' => $lifetime,
-				];
-
-				$handler = $container->get('session.factory')->createSessionHandler($options);
-
-				if (!$container->has('session.handler'))
-				{
-					$this->registerSessionHandlerAsService($container, $handler);
-				}
-
-				return $this->buildSession(
-					new JoomlaStorage($app->input, $handler),
-					$app,
-					$container->get(DispatcherInterface::class),
-					$options
-				);
-			},
-			true
-		);
-
-		$container->share(
-			'session.web.site',
-			function (Container $container)
-			{
-				/** @var Registry $config */
-				$config = $container->get('config');
-				$app    = Factory::getApplication();
-
-				// Generate a session name.
-				$name = ApplicationHelper::getHash($config->get('session_name', SiteApplication::class));
-
-				// Calculate the session lifetime.
-				$lifetime = $config->get('lifetime') ? $config->get('lifetime') * 60 : 900;
-
-				// Initialize the options for the Session object.
-				$options = [
-					'name'   => $name,
-					'expire' => $lifetime,
-				];
-
-				if ($config->get('force_ssl') == 2)
-				{
-					$options['force_ssl'] = true;
-				}
-
-				$handler = $container->get('session.factory')->createSessionHandler($options);
-
-				if (!$container->has('session.handler'))
-				{
-					$this->registerSessionHandlerAsService($container, $handler);
-				}
-
-				return $this->buildSession(
-					new JoomlaStorage($app->input, $handler),
-					$app,
-					$container->get(DispatcherInterface::class),
-					$options
-				);
-			},
-			true
-		);
-
-		$container->share(
-			'session.cli',
-			function (Container $container)
-			{
-				/** @var Registry $config */
-				$config = $container->get('config');
-				$app    = Factory::getApplication();
-
-				// Generate a session name.
-				$name = ApplicationHelper::getHash($config->get('session_name', ConsoleApplication::class));
-
-				// Calculate the session lifetime.
-				$lifetime = $config->get('lifetime') ? $config->get('lifetime') * 60 : 900;
-
-				// Initialize the options for the Session object.
-				$options = [
-					'name'   => $name,
-					'expire' => $lifetime,
-				];
-
-				// Unlike the web apps, we will only toggle the force SSL setting based on it being enabled and not based on client
-				if ($config->get('force_ssl') >= 1)
-				{
-					$options['force_ssl'] = true;
-				}
-
-				$handler = $container->get('session.factory')->createSessionHandler($options);
-
-				if (!$container->has('session.handler'))
-				{
-					$this->registerSessionHandlerAsService($container, $handler);
-				}
-
-				return $this->buildSession(
-					new RuntimeStorage,
-					$app,
-					$container->get(DispatcherInterface::class),
-					$options
-				);
-			},
-			true
-		);
-
-		$container->alias(SessionFactory::class, 'session.factory')
-			->share(
-				'session.factory',
-				function (Container $container)
-				{
-					$factory = new SessionFactory;
-					$factory->setContainer($container);
-
-					return $factory;
-				},
-				true
-			);
-
-		$container->alias(SessionManager::class, 'session.manager')
-			->share(
-				'session.manager',
-				function (Container $container)
-				{
-					if (!$container->has('session.handler'))
-					{
-						throw new DependencyResolutionException(
-							'The "session.handler" service has not been created, make sure you have created the "session" service first.'
-						);
-					}
-
-					return new SessionManager($container->get('session.handler'));
-				},
-				true
-			);
-
-		$container->alias(MetadataManager::class, 'session.metadata_manager')
-			->share(
-				'session.metadata_manager',
-				function (Container $container)
-				{
-					/*
-					 * Normally we should inject the application as a dependency via $container->get() however there is not
-					 * a 'app' or CMSApplicationInterface::class key for the primary application of the request so we need to
-					 * rely on the application having been injected to the global Factory otherwise we cannot build the service
-					 */
-					if (!Factory::$application)
-					{
-						throw new DependencyResolutionException(
-							sprintf(
-								'Creating the "session.metadata_manager" service requires %s::$application be initialised.',
-								Factory::class
-							)
-						);
-					}
-
-					return new MetadataManager(Factory::$application, $container->get(DatabaseInterface::class));
-				},
-				true
-			);
-
-		$container->alias(MetadataManagerListener::class, 'session.event_listener.metadata_manager')
-			->share(
-				'session.event_listener.metadata_manager',
-				function (Container $container)
-				{
-					return new MetadataManagerListener($container->get(MetadataManager::class), $container->get('config'));
-				},
-				true
-			);
-
-		$listener = new LazyServiceEventListener($container, 'session.event_listener.metadata_manager', 'onAfterSessionStart');
-
-		/** @var DispatcherInterface $dispatcher */
-		$dispatcher = $container->get(DispatcherInterface::class);
-		$dispatcher->addListener(SessionEvents::START, $listener);
+		$container->alias(MetadataManager::class, MetadataManager::class)
+			->share(MetadataManager::class, [$this, 'getMetadataManagerClassService'], true);
 	}
 
 	/**
-	 * Build the root session service
+	 * Get the session metadata manager service
 	 *
-	 * @param   StorageInterface         $storage     The session storage engine.
-	 * @param   CMSApplicationInterface  $app         The application instance.
-	 * @param   DispatcherInterface      $dispatcher  The event dispatcher.
-	 * @param   array                    $options     The configured session options.
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  MetadataManager
+	 */
+	public function getMetadataManagerClassService(Container $container): MetadataManager
+	{
+		return new MetadataManager(
+			$container->get(DatabaseInterface::class)
+		);
+	}
+
+	/**
+	 * Get the `admin.session` service
+	 *
+	 * @param   Container  $container  The DI container.
 	 *
 	 * @return  SessionInterface
-	 *
-	 * @since   4.0.0
+	 * @throws \Exception
 	 */
-	private function buildSession(
-		StorageInterface $storage,
-		CMSApplicationInterface $app,
-		DispatcherInterface $dispatcher,
-		array $options
-	): SessionInterface
+	public function getSessionClassService(Container $container): SessionInterface
 	{
-		$input = $app->input;
+		/** @var \Joomla\Session\Session; $session */
+		$session = new Session($container->get(SessionNativeStorage::class), $container->get(Dispatcher::class));
 
-		if (method_exists($app, 'afterSessionStart'))
+		// Start session if not already started
+		if (empty($session->getId()))
 		{
-			$dispatcher->addListener(SessionEvents::START, [$app, 'afterSessionStart'], Priority::HIGH);
+			$session->start();
 		}
 
-		$session = new \Joomla\CMS\Session\Session($storage, $dispatcher, $options);
-
 		return $session;
 	}
 
 	/**
-	 * Registers the session handler as a service
+	 * Get the Session Database Handler service
 	 *
-	 * @param   Container                 $container       The container to register the service to.
-	 * @param   \SessionHandlerInterface  $sessionHandler  The session handler.
+	 * @param   Container  $container  The DI container.
 	 *
-	 * @return  void
-	 *
-	 * @since   4.0.0
+	 * @return  HandlerInterface
 	 */
-	private function registerSessionHandlerAsService(Container $container, \SessionHandlerInterface $sessionHandler): void
+	public function getSessionDatabaseHandlerClassService(Container $container): HandlerInterface
 	{
-		// Alias the session handler to the core SessionHandlerInterface for improved autowiring and discoverability
-		$container->alias(\SessionHandlerInterface::class, 'session.handler')
-			->share(
-				'session.handler',
-				$sessionHandler,
-				true
-			);
+		return new SessionDatabaseHandler($container->get(DatabaseInterface::class));
+	}
 
-		// If the session handler implements the extended interface, register an alias for that as well
-		if ($sessionHandler instanceof HandlerInterface)
-		{
-			$container->alias(HandlerInterface::class, 'session.handler');
-		}
+	/**
+	 * Get the `admin.session` service
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  StorageInterface
+	 */
+	public function getSessionNativeStorageClassService(Container $container): StorageInterface
+	{
+		/** @var \Joomla\Registry\Registry $config */
+		$config = $container->get('config');
+
+		// Generate a session name. (not secure enough)
+		$name = md5('octoleoAdmin');
+
+		// Calculate the session lifetime.
+		$lifetime = $config->get('lifetime') ? $config->get('lifetime') * 60 : 900;
+
+		// Initialize the options for the Session object.
+		$options = [
+			'name'   => $name,
+			'expire' => $lifetime
+		];
+
+		return new SessionNativeStorage($container->get(SessionDatabaseHandler::class), $options);
 	}
 }

week-03/project/libraries/src/Service/SiteApplicationProvider.php

@@ -1,65 +1,43 @@
 <?php
 /**
- * Joomla! Framework Website
+ * @package    Octoleo CMS
  *
- * @copyright  Copyright (C) 2014 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license    http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License Version 2 or Later
+ * @created    9th April 2022
+ * @author     Llewellyn van der Merwe <https://git.vdm.dev/Llewellyn>
+ * @git        WEBD-325-45 <https://git.vdm.dev/Llewellyn/WEBD-325-45>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace Joomla\FrameworkWebsite\Service;
+namespace Octoleo\CMS\Service;
 
 use Joomla\Application\AbstractWebApplication;
 use Joomla\Application\Controller\ContainerControllerResolver;
 use Joomla\Application\Controller\ControllerResolverInterface;
 use Joomla\Application\Web\WebClient;
-use Joomla\Console\Application as ConsoleApplication;
-use Joomla\Console\Loader\ContainerLoader;
-use Joomla\Console\Loader\LoaderInterface;
 use Joomla\Database\DatabaseInterface;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
-use Joomla\Event\Command\DebugEventDispatcherCommand;
 use Joomla\Event\DispatcherInterface;
-use Joomla\FrameworkWebsite\Command\GenerateSriCommand;
-use Joomla\FrameworkWebsite\Command\Package\SyncCommand as PackageSyncCommand;
-use Joomla\FrameworkWebsite\Command\Packagist\DownloadsCommand;
-use Joomla\FrameworkWebsite\Command\Packagist\SyncCommand as PackagistSyncCommand;
-use Joomla\FrameworkWebsite\Command\Twig\ResetCacheCommand;
-use Joomla\FrameworkWebsite\Command\UpdateCommand;
-use Joomla\FrameworkWebsite\Controller\Api\PackageControllerGet;
-use Joomla\FrameworkWebsite\Controller\Api\StatusControllerGet;
-use Joomla\FrameworkWebsite\Controller\HomepageController;
-use Joomla\FrameworkWebsite\Controller\PackageController;
-use Joomla\FrameworkWebsite\Controller\PageController;
-use Joomla\FrameworkWebsite\Controller\StatusController;
-use Joomla\FrameworkWebsite\Controller\WrongCmsController;
-use Joomla\FrameworkWebsite\Helper;
-use Joomla\FrameworkWebsite\Helper\PackagistHelper;
-use Joomla\FrameworkWebsite\Model\PackageModel;
-use Joomla\FrameworkWebsite\Model\ReleaseModel;
-use Joomla\FrameworkWebsite\View\Package\PackageHtmlView;
-use Joomla\FrameworkWebsite\View\Package\PackageJsonView;
-use Joomla\FrameworkWebsite\View\Status\StatusHtmlView;
-use Joomla\FrameworkWebsite\View\Status\StatusJsonView;
-use Joomla\FrameworkWebsite\WebApplication;
-use Joomla\Http\Http;
+
+use Octoleo\CMS\Controller\HomepageController;
+use Octoleo\CMS\Controller\WrongCmsController;
+use Octoleo\CMS\Controller\PageController;
+use Octoleo\CMS\Model\PageModel;
+use Octoleo\CMS\View\Page\PageHtmlView;
+use Octoleo\CMS\Application\SiteApplication;
+
 use Joomla\Input\Input;
-use Joomla\Registry\Registry;
 use Joomla\Renderer\RendererInterface;
-use Joomla\Renderer\TwigRenderer;
-use Joomla\Router\Command\DebugRouterCommand;
 use Joomla\Router\Route;
 use Joomla\Router\Router;
 use Joomla\Router\RouterInterface;
 use Psr\Log\LoggerInterface;
-use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\Console\Output\ConsoleOutput;
-use TheIconic\Tracking\GoogleAnalytics\Analytics;
 
 /**
  * Application service provider
+ * source: https://github.com/joomla/framework.joomla.org/blob/master/src/Service/ApplicationProvider.php
  */
-class ApplicationProvider implements ServiceProviderInterface
+class SiteApplicationProvider implements ServiceProviderInterface
 {
 	/**
 	 * Registers the service provider with a DI container.
@@ -74,34 +52,18 @@ class ApplicationProvider implements ServiceProviderInterface
 		 * Application Classes
 		 */
 
-		$container->share(ConsoleApplication::class, [$this, 'getConsoleApplicationService'], true);
-
 		// This service cannot be protected as it is decorated when the debug bar is available
-		$container->alias(WebApplication::class, AbstractWebApplication::class)
-			->share(AbstractWebApplication::class, [$this, 'getWebApplicationClassService']);
+		$container->alias(SiteApplication::class, AbstractWebApplication::class)
+			->share(AbstractWebApplication::class, [$this, 'getSiteApplicationClassService']);
 
 		/*
 		 * Application Helpers and Dependencies
 		 */
 
-		$container->alias(Analytics::class, 'analytics')
-			->share('analytics', [$this, 'getAnalyticsService'], true);
-
-		$container->alias(ContainerLoader::class, LoaderInterface::class)
-			->share(LoaderInterface::class, [$this, 'getCommandLoaderService'], true);
-
 		// This service cannot be protected as it is decorated when the debug bar is available
 		$container->alias(ContainerControllerResolver::class, ControllerResolverInterface::class)
 			->share(ControllerResolverInterface::class, [$this, 'getControllerResolverService']);
 
-		$container->alias(Helper::class, 'application.helper')
-			->share('application.helper', [$this, 'getApplicationHelperService'], true);
-
-		$container->alias(PackagistHelper::class, 'application.helper.packagist')
-			->share('application.helper.packagist', [$this, 'getApplicationHelperPackagistService'], true);
-
-		$container->share('application.packages', [$this, 'getApplicationPackagesService'], true);
-
 		$container->share(WebClient::class, [$this, 'getWebClientService'], true);
 
 		// This service cannot be protected as it is decorated when the debug bar is available
@@ -111,118 +73,27 @@ class ApplicationProvider implements ServiceProviderInterface
 
 		$container->share(Input::class, [$this, 'getInputClassService'], true);
 
-		/*
-		 * Console Commands
-		 */
-
-		$container->share(DebugEventDispatcherCommand::class, [$this, 'getDebugEventDispatcherCommandService'], true);
-		$container->share(DebugRouterCommand::class, [$this, 'getDebugRouterCommandService'], true);
-		$container->share(DownloadsCommand::class, [$this, 'getDownloadsCommandService'], true);
-		$container->share(GenerateSriCommand::class, [$this, 'getGenerateSriCommandService'], true);
-		$container->share(PackageSyncCommand::class, [$this, 'getPackageSyncCommandService'], true);
-		$container->share(PackagistSyncCommand::class, [$this, 'getPackagistSyncCommandService'], true);
-		$container->share(ResetCacheCommand::class, [$this, 'getResetCacheCommandService'], true);
-		$container->share(UpdateCommand::class, [$this, 'getUpdateCommandService'], true);
-
 		/*
 		 * MVC Layer
 		 */
 
 		// Controllers
-		$container->alias(PackageControllerGet::class, 'controller.api.package')
-			->share('controller.api.package', [$this, 'getControllerApiPackageService'], true);
-
-		$container->alias(StatusControllerGet::class, 'controller.api.status')
-			->share('controller.api.status', [$this, 'getControllerApiStatusService'], true);
-
 		$container->alias(HomepageController::class, 'controller.homepage')
 			->share('controller.homepage', [$this, 'getControllerHomepageService'], true);
 
-		$container->alias(PackageController::class, 'controller.package')
-			->share('controller.package', [$this, 'getControllerPackageService'], true);
-
 		$container->alias(PageController::class, 'controller.page')
 			->share('controller.page', [$this, 'getControllerPageService'], true);
 
-		$container->alias(StatusController::class, 'controller.status')
-			->share('controller.status', [$this, 'getControllerStatusService'], true);
-
 		$container->alias(WrongCmsController::class, 'controller.wrong.cms')
 			->share('controller.wrong.cms', [$this, 'getControllerWrongCmsService'], true);
 
 		// Models
-		$container->alias(PackageModel::class, 'model.package')
-			->share('model.package', [$this, 'getModelPackageService'], true);
-
-		$container->alias(ReleaseModel::class, 'model.release')
-			->share('model.release', [$this, 'getModelReleaseService'], true);
+		$container->alias(PageModel::class, 'model.page')
+			->share('model.page', [$this, 'getModelPageService'], true);
 
 		// Views
-		$container->alias(PackageHtmlView::class, 'view.package.html')
-			->share('view.package.html', [$this, 'getViewPackageHtmlService'], true);
-
-		$container->alias(PackageJsonView::class, 'view.package.json')
-			->share('view.package.json', [$this, 'getViewPackageJsonService'], true);
-
-		$container->alias(StatusHtmlView::class, 'view.status.html')
-			->share('view.status.html', [$this, 'getViewStatusHtmlService'], true);
-
-		$container->alias(StatusJsonView::class, 'view.status.json')
-			->share('view.status.json', [$this, 'getViewStatusJsonService'], true);
-	}
-
-	/**
-	 * Get the Analytics class service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  Analytics
-	 */
-	public function getAnalyticsService(Container $container)
-	{
-		return new Analytics(true);
-	}
-
-	/**
-	 * Get the `application.helper` service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  Helper
-	 */
-	public function getApplicationHelperService(Container $container): Helper
-	{
-		$helper = new Helper;
-		$helper->setPackages($container->get('application.packages'));
-
-		return $helper;
-	}
-
-	/**
-	 * Get the `application.helper.packagist` service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  PackagistHelper
-	 */
-	public function getApplicationHelperPackagistService(Container $container): PackagistHelper
-	{
-		$helper = new PackagistHelper($container->get(Http::class), $container->get(DatabaseInterface::class));
-		$helper->setPackages($container->get('application.packages'));
-
-		return $helper;
-	}
-
-	/**
-	 * Get the `application.packages` service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  Registry
-	 */
-	public function getApplicationPackagesService(Container $container): Registry
-	{
-		return (new Registry)->loadFile(JPATH_ROOT . '/packages.yml', 'YAML');
+		$container->alias(PageHtmlView::class, 'view.page.html')
+			->share('view.page.html', [$this, 'getViewPageHtmlService'], true);
 	}
 
 	/**
@@ -239,16 +110,6 @@ class ApplicationProvider implements ServiceProviderInterface
 		/*
 		 * CMS Admin Panels
 		 */
-		$router->get(
-			'/administrator',
-			WrongCmsController::class
-		);
-
-		$router->get(
-			'/administrator/*',
-			WrongCmsController::class
-		);
-
 		$router->get(
 			'/wp-admin',
 			WrongCmsController::class
@@ -270,8 +131,8 @@ class ApplicationProvider implements ServiceProviderInterface
 		$router->addRoute(new Route(['GET', 'HEAD'], '/', HomepageController::class));
 
 		$router->get(
-			'/status',
-			StatusController::class
+			'/:view',
+			PageController::class
 		);
 
 		$router->get(
@@ -280,118 +141,13 @@ class ApplicationProvider implements ServiceProviderInterface
 		);
 
 		$router->get(
-			'/status/:package',
-			PackageController::class
-		);
-
-		/*
-		 * API routes
-		 */
-		$router->get(
-			'/api/v1/packages',
-			StatusControllerGet::class,
-			[],
-			[
-				'_format' => 'json',
-			]
-		);
-
-		$router->get(
-			'/api/v1/packages/:package',
-			PackageControllerGet::class,
-			[],
-			[
-				'_format' => 'json',
-			]
+			'/:view/:details',
+			PageController::class
 		);
 
 		return $router;
 	}
 
-	/**
-	 * Get the LoaderInterface service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  LoaderInterface
-	 */
-	public function getCommandLoaderService(Container $container): LoaderInterface
-	{
-		$mapping = [
-			DebugEventDispatcherCommand::getDefaultName() => DebugEventDispatcherCommand::class,
-			DebugRouterCommand::getDefaultName()          => DebugRouterCommand::class,
-			DownloadsCommand::getDefaultName()            => DownloadsCommand::class,
-			PackageSyncCommand::getDefaultName()          => PackageSyncCommand::class,
-			PackagistSyncCommand::getDefaultName()        => PackagistSyncCommand::class,
-			GenerateSriCommand::getDefaultName()          => GenerateSriCommand::class,
-			ResetCacheCommand::getDefaultName()           => ResetCacheCommand::class,
-			UpdateCommand::getDefaultName()               => UpdateCommand::class,
-		];
-
-		return new ContainerLoader($container, $mapping);
-	}
-
-	/**
-	 * Get the ConsoleApplication service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  ConsoleApplication
-	 */
-	public function getConsoleApplicationService(Container $container): ConsoleApplication
-	{
-		$application = new ConsoleApplication(new ArgvInput, new ConsoleOutput, $container->get('config'));
-
-		$application->setCommandLoader($container->get(LoaderInterface::class));
-		$application->setDispatcher($container->get(DispatcherInterface::class));
-		$application->setLogger($container->get(LoggerInterface::class));
-		$application->setName('Joomla! Framework Website');
-
-		return $application;
-	}
-
-	/**
-	 * Get the `controller.api.package` service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  PackageControllerGet
-	 */
-	public function getControllerApiPackageService(Container $container): PackageControllerGet
-	{
-		$controller = new PackageControllerGet(
-			$container->get(PackageJsonView::class),
-			$container->get(Analytics::class),
-			$container->get(Input::class),
-			$container->get(WebApplication::class)
-		);
-
-		$controller->setLogger($container->get(LoggerInterface::class));
-
-		return $controller;
-	}
-
-	/**
-	 * Get the `controller.api.status` service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  StatusControllerGet
-	 */
-	public function getControllerApiStatusService(Container $container): StatusControllerGet
-	{
-		$controller = new StatusControllerGet(
-			$container->get(StatusJsonView::class),
-			$container->get(Analytics::class),
-			$container->get(Input::class),
-			$container->get(WebApplication::class)
-		);
-
-		$controller->setLogger($container->get(LoggerInterface::class));
-
-		return $controller;
-	}
-
 	/**
 	 * Get the `controller.homepage` service
 	 *
@@ -404,23 +160,7 @@ class ApplicationProvider implements ServiceProviderInterface
 		return new HomepageController(
 			$container->get(RendererInterface::class),
 			$container->get(Input::class),
-			$container->get(WebApplication::class)
-		);
-	}
-
-	/**
-	 * Get the `controller.package` service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  PackageController
-	 */
-	public function getControllerPackageService(Container $container): PackageController
-	{
-		return new PackageController(
-			$container->get(PackageHtmlView::class),
-			$container->get(Input::class),
-			$container->get(WebApplication::class)
+			$container->get(SiteApplication::class)
 		);
 	}
 
@@ -434,37 +174,9 @@ class ApplicationProvider implements ServiceProviderInterface
 	public function getControllerPageService(Container $container): PageController
 	{
 		return new PageController(
-			$container->get(RendererInterface::class),
+			$container->get(PageHtmlView::class),
 			$container->get(Input::class),
-			$container->get(WebApplication::class)
-		);
-	}
-
-	/**
-	 * Get the controller resolver service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  ControllerResolverInterface
-	 */
-	public function getControllerResolverService(Container $container): ControllerResolverInterface
-	{
-		return new ContainerControllerResolver($container);
-	}
-
-	/**
-	 * Get the `controller.status` service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  StatusController
-	 */
-	public function getControllerStatusService(Container $container): StatusController
-	{
-		return new StatusController(
-			$container->get(StatusHtmlView::class),
-			$container->get(Input::class),
-			$container->get(WebApplication::class)
+			$container->get(SiteApplication::class)
 		);
 	}
 
@@ -479,64 +191,10 @@ class ApplicationProvider implements ServiceProviderInterface
 	{
 		return new WrongCmsController(
 			$container->get(Input::class),
-			$container->get(WebApplication::class)
+			$container->get(SiteApplication::class)
 		);
 	}
 
-	/**
-	 * Get the DebugEventDispatcherCommand service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  DebugEventDispatcherCommand
-	 */
-	public function getDebugEventDispatcherCommandService(Container $container): DebugEventDispatcherCommand
-	{
-		return new DebugEventDispatcherCommand(
-			$container->get(DispatcherInterface::class)
-		);
-	}
-
-	/**
-	 * Get the DebugRouterCommand service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  DebugRouterCommand
-	 */
-	public function getDebugRouterCommandService(Container $container): DebugRouterCommand
-	{
-		return new DebugRouterCommand(
-			$container->get(Router::class)
-		);
-	}
-
-	/**
-	 * Get the DownloadsCommand service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  DownloadsCommand
-	 */
-	public function getDownloadsCommandService(Container $container): DownloadsCommand
-	{
-		return new DownloadsCommand(
-			$container->get(PackagistHelper::class)
-		);
-	}
-
-	/**
-	 * Get the GenerateSriCommand service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  GenerateSriCommand
-	 */
-	public function getGenerateSriCommandService(Container $container): GenerateSriCommand
-	{
-		return new GenerateSriCommand;
-	}
-
 	/**
 	 * Get the Input class service
 	 *
@@ -550,156 +208,15 @@ class ApplicationProvider implements ServiceProviderInterface
 	}
 
 	/**
-	 * Get the `model.package` service
+	 * Get the `model.page` service
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
-	 * @return  PackageModel
+	 * @return  PageModel
 	 */
-	public function getModelPackageService(Container $container): PackageModel
+	public function getModelPageService(Container $container): PageModel
 	{
-		return new PackageModel($container->get(DatabaseInterface::class));
-	}
-
-	/**
-	 * Get the `model.release` service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  ReleaseModel
-	 */
-	public function getModelReleaseService(Container $container): ReleaseModel
-	{
-		return new ReleaseModel($container->get(DatabaseInterface::class));
-	}
-
-	/**
-	 * Get the PackageSyncCommand service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  PackageSyncCommand
-	 */
-	public function getPackageSyncCommandService(Container $container): PackageSyncCommand
-	{
-		return new PackageSyncCommand(
-			$container->get(Helper::class),
-			$container->get(PackageModel::class)
-		);
-	}
-
-	/**
-	 * Get the PackagistSyncCommand service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  PackagistSyncCommand
-	 */
-	public function getPackagistSyncCommandService(Container $container): PackagistSyncCommand
-	{
-		return new PackagistSyncCommand(
-			$container->get(Http::class),
-			$container->get(PackageModel::class),
-			$container->get(ReleaseModel::class)
-		);
-	}
-
-	/**
-	 * Get the ResetCacheCommand service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  ResetCacheCommand
-	 */
-	public function getResetCacheCommandService(Container $container): ResetCacheCommand
-	{
-		return new ResetCacheCommand(
-			$container->get(TwigRenderer::class),
-			$container->get('config')
-		);
-	}
-
-	/**
-	 * Get the UpdateCommand service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  UpdateCommand
-	 */
-	public function getUpdateCommandService(Container $container): UpdateCommand
-	{
-		return new UpdateCommand;
-	}
-
-	/**
-	 * Get the `view.package.html` service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  PackageHtmlView
-	 */
-	public function getViewPackageHtmlService(Container $container): PackageHtmlView
-	{
-		$view = new PackageHtmlView(
-			$container->get('model.package'),
-			$container->get('model.release'),
-			$container->get(Helper::class),
-			$container->get('renderer')
-		);
-
-		$view->setLayout('package.twig');
-
-		return $view;
-	}
-
-	/**
-	 * Get the `view.package.json` service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  PackageJsonView
-	 */
-	public function getViewPackageJsonService(Container $container): PackageJsonView
-	{
-		return new PackageJsonView(
-			$container->get('model.package'),
-			$container->get('model.release')
-		);
-	}
-
-	/**
-	 * Get the `view.status.html` service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  StatusHtmlView
-	 */
-	public function getViewStatusHtmlService(Container $container): StatusHtmlView
-	{
-		$view = new StatusHtmlView(
-			$container->get('model.package'),
-			$container->get('model.release'),
-			$container->get('renderer')
-		);
-
-		$view->setLayout('status.twig');
-
-		return $view;
-	}
-
-	/**
-	 * Get the `view.status.json` service
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  StatusJsonView
-	 */
-	public function getViewStatusJsonService(Container $container): StatusJsonView
-	{
-		return new StatusJsonView(
-			$container->get('model.package'),
-			$container->get('model.release')
-		);
+		return new PageModel($container->get(DatabaseInterface::class));
 	}
 
 	/**
@@ -707,11 +224,11 @@ class ApplicationProvider implements ServiceProviderInterface
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
-	 * @return  WebApplication
+	 * @return  SiteApplication
 	 */
-	public function getWebApplicationClassService(Container $container): WebApplication
+	public function getSiteApplicationClassService(Container $container): SiteApplication
 	{
-		$application = new WebApplication(
+		$application = new SiteApplication(
 			$container->get(ControllerResolverInterface::class),
 			$container->get(RouterInterface::class),
 			$container->get(Input::class),
@@ -728,6 +245,37 @@ class ApplicationProvider implements ServiceProviderInterface
 		return $application;
 	}
 
+	/**
+	 * Get the controller resolver service
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  ControllerResolverInterface
+	 */
+	public function getControllerResolverService(Container $container): ControllerResolverInterface
+	{
+		return new ContainerControllerResolver($container);
+	}
+
+	/**
+	 * Get the `view.page.html` service
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  PageHtmlView
+	 */
+	public function getViewPageHtmlService(Container $container): PageHtmlView
+	{
+		$view = new PageHtmlView(
+			$container->get('model.page'),
+			$container->get('renderer')
+		);
+
+		$view->setLayout('page.twig');
+
+		return $view;
+	}
+
 	/**
 	 * Get the web client service
 	 *

week-03/project/libraries/src/Service/TemplatingProvider.php

@@ -6,15 +6,15 @@
  * @license    http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License Version 2 or Later
  */
 
-namespace Joomla\FrameworkWebsite\Service;
+namespace Octoleo\CMS\Service;
 
 use Joomla\Application\AbstractApplication;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
-use Joomla\FrameworkWebsite\Asset\MixPathPackage;
-use Joomla\FrameworkWebsite\Renderer\ApplicationContext;
-use Joomla\FrameworkWebsite\Renderer\FrameworkExtension;
-use Joomla\FrameworkWebsite\Renderer\FrameworkTwigRuntime;
+use Octoleo\CMS\Asset\MixPathPackage;
+use Octoleo\CMS\Renderer\ApplicationContext;
+use Octoleo\CMS\Renderer\FrameworkExtension;
+use Octoleo\CMS\Renderer\FrameworkTwigRuntime;
 use Joomla\Preload\PreloadManager;
 use Joomla\Renderer\RendererInterface;
 use Joomla\Renderer\TwigRenderer;
@@ -35,6 +35,7 @@ use Twig\RuntimeLoader\ContainerRuntimeLoader;
 
 /**
  * Templating service provider
+ * source: https://github.com/joomla/framework.joomla.org/blob/master/src/Service/TemplatingProvider.php
  */
 class TemplatingProvider implements ServiceProviderInterface
 {
@@ -113,7 +114,7 @@ class TemplatingProvider implements ServiceProviderInterface
 		$mixStrategy = new MixPathPackage(
 			$defaultPackage,
 			$mediaPath,
-			new JsonManifestVersionStrategy(JPATH_ROOT . '/www/media/mix-manifest.json'),
+			new JsonManifestVersionStrategy(LPATH_ROOT . '/media/mix-manifest.json'),
 			$context
 		);
 
@@ -156,7 +157,7 @@ class TemplatingProvider implements ServiceProviderInterface
 
 		if ($debug === false && $cacheEnabled !== false)
 		{
-			return new FilesystemCache(JPATH_ROOT . '/' . $cachePath);
+			return new FilesystemCache(LPATH_ROOT . '/' . $cachePath);
 		}
 
 		return new NullCache;
@@ -242,7 +243,7 @@ class TemplatingProvider implements ServiceProviderInterface
 	 */
 	public function getTwigLoaderService(Container $container): \Twig_LoaderInterface
 	{
-		return new FilesystemLoader([JPATH_TEMPLATES]);
+		return new FilesystemLoader([LPATH_TEMPLATES]);
 	}
 
 	/**
@@ -269,7 +270,7 @@ class TemplatingProvider implements ServiceProviderInterface
 		return new FrameworkTwigRuntime(
 			$container->get(AbstractApplication::class),
 			$container->get(PreloadManager::class),
-			JPATH_ROOT . '/www/media/sri-manifest.json'
+			LPATH_ROOT . '/media/sri-manifest.json'
 		);
 	}
 
@@ -308,4 +309,4 @@ class TemplatingProvider implements ServiceProviderInterface
 
 		$container->tag('twig.extension', $twigExtensions);
 	}
-}
+}

week-03/project/libraries/src/Service/UserProvider.php

@@ -1,27 +1,31 @@
 <?php
 /**
- * Joomla! Content Management System
+ * @package    Octoleo CMS
  *
- * @copyright  (C) 2019 Open Source Matters, Inc. <https://www.joomla.org>
+ * @created    9th April 2022
+ * @author     Llewellyn van der Merwe <https://git.vdm.dev/Llewellyn>
+ * @git        WEBD-325-45 <https://git.vdm.dev/Llewellyn/WEBD-325-45>
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace Joomla\CMS\Service\Provider;
+namespace Octoleo\CMS\Service;
 
-\defined('JPATH_PLATFORM') or die;
-
-use Joomla\CMS\User\UserFactory;
-use Joomla\CMS\User\UserFactoryInterface;
+use Joomla\Authentication\AuthenticationStrategyInterface;
+use Joomla\Authentication\Strategies\DatabaseStrategy;
+use Joomla\Input\Input;
+use Octoleo\CMS\User\UserFactory;
+use Octoleo\CMS\User\UserFactoryInterface;
 use Joomla\Database\DatabaseInterface;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
 
 /**
- * Service provider for the user dependency
- *
- * @since  4.0.0
- */
-class User implements ServiceProviderInterface
+* Service provider for the user dependency
+*
+* @since  1.0.0
+* source: https://github.com/joomla/joomla-cms/blob/4.2-dev/libraries/src/Service/Provider/User.php
+*/
+class UserProvider implements ServiceProviderInterface
 {
 	/**
 	 * Registers the service provider with a DI container.
@@ -36,13 +40,40 @@ class User implements ServiceProviderInterface
 	{
 		$container->alias('user.factory', UserFactoryInterface::class)
 			->alias(UserFactory::class, UserFactoryInterface::class)
-			->share(
-				UserFactoryInterface::class,
-				function (Container $container)
-				{
-					return new UserFactory($container->get(DatabaseInterface::class));
-				},
-				true
-			);
+			->share(UserFactoryInterface::class, [$this, 'getUserFactoryService'], true);
+
+		$container->alias(DatabaseStrategy::class, AuthenticationStrategyInterface::class)
+			->share(AuthenticationStrategyInterface::class, [$this, 'getAuthenticationStrategyService'], true);
+	}
+
+	/**
+	 * Get the UserFactoryInterface class service
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  UserFactoryInterface
+	 * @throws \Exception
+	 */
+	public function getUserFactoryService(Container $container): UserFactoryInterface
+	{
+		return new UserFactory(
+			$container->get(DatabaseInterface::class),
+			$container->get(AuthenticationStrategyInterface::class)
+		);
+	}
+
+	/**
+	 * Get the AuthenticationStrategyInterface class service
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  AuthenticationStrategyInterface
+	 */
+	public function getAuthenticationStrategyService(Container $container): AuthenticationStrategyInterface
+	{
+		return new DatabaseStrategy(
+			$container->get(Input::class),
+			$container->get(DatabaseInterface::class)
+		);
 	}
 }

week-03/project/libraries/src/Session/MetadataManager.php

@@ -6,13 +6,9 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace Joomla\CMS\Session;
+namespace Octoleo\CMS\Session;
 
-\defined('JPATH_PLATFORM') or die;
-
-use Joomla\Application\AbstractApplication;
-use Joomla\CMS\Application\CMSApplication;
-use Joomla\CMS\User\User;
+use Octoleo\CMS\User\User;
 use Joomla\Database\DatabaseInterface;
 use Joomla\Database\Exception\ExecutionFailureException;
 use Joomla\Database\ParameterType;
@@ -53,14 +49,6 @@ final class MetadataManager
 	 */
 	private static $sessionRecordUnknown = -1;
 
-	/**
-	 * Application object.
-	 *
-	 * @var    AbstractApplication
-	 * @since  3.8.6
-	 */
-	private $app;
-
 	/**
 	 * Database driver.
 	 *
@@ -72,14 +60,12 @@ final class MetadataManager
 	/**
 	 * MetadataManager constructor.
 	 *
-	 * @param   AbstractApplication  $app  Application object.
 	 * @param   DatabaseInterface    $db   Database driver.
 	 *
 	 * @since   3.8.6
 	 */
-	public function __construct(AbstractApplication $app, DatabaseInterface $db)
+	public function __construct(DatabaseInterface $db)
 	{
-		$this->app = $app;
 		$this->db  = $db;
 	}
 
@@ -166,6 +152,29 @@ final class MetadataManager
 		}
 	}
 
+	/**
+	 * Get session record exists
+	 *
+	 * @param   string  $sessionId  The session ID to check
+	 *
+	 * @return mixed  on success value for record presence
+	 *
+	 * @since   1.0.0
+	 */
+	public function getSessionRecord(string $sessionId)
+	{
+		$query = $this->db->getQuery(true)
+			->select('*')
+			->from($this->db->quoteName('#__session'))
+			->where($this->db->quoteName('session_id') . ' = :session_id')
+			->bind(':session_id', $sessionId)
+			->setLimit(1);
+
+		$this->db->setQuery($query);
+
+		return $this->db->loadObject();
+	}
+
 	/**
 	 * Check if the session record exists
 	 *
@@ -238,9 +247,9 @@ final class MetadataManager
 
 		// Bind query values
 		$sessionId   = $session->getId();
-		$userIsGuest = $user->guest;
-		$userId      = $user->id;
-		$username    = $user->username === null ? '' : $user->username;
+		$userIsGuest = $user->get('guest', 0);
+		$userId      = $user->get('id', 0);
+		$username    = $user->get('username', '');
 
 		$query->bind(':session_id', $sessionId)
 			->bind(':guest', $userIsGuest, ParameterType::INTEGER)
@@ -248,16 +257,6 @@ final class MetadataManager
 			->bind(':user_id', $userId, ParameterType::INTEGER)
 			->bind(':username', $username);
 
-		if ($this->app instanceof CMSApplication && !$this->app->get('shared_session', false))
-		{
-			$clientId = $this->app->getClientId();
-
-			$columns[] = $this->db->quoteName('client_id');
-			$values[] = ':client_id';
-
-			$query->bind(':client_id', $clientId, ParameterType::INTEGER);
-		}
-
 		$query->insert($this->db->quoteName('#__session'))
 			->columns($columns)
 			->values(implode(', ', $values));
@@ -299,9 +298,9 @@ final class MetadataManager
 
 		// Bind query values
 		$sessionId   = $session->getId();
-		$userIsGuest = $user->guest;
-		$userId      = $user->id;
-		$username    = $user->username === null ? '' : $user->username;
+		$userIsGuest = $user->get('guest', 0);
+		$userId      = $user->get('id', 0);
+		$username    = $user->get('username', '');
 
 		$query->bind(':session_id', $sessionId)
 			->bind(':guest', $userIsGuest, ParameterType::INTEGER)
@@ -309,15 +308,6 @@ final class MetadataManager
 			->bind(':user_id', $userId, ParameterType::INTEGER)
 			->bind(':username', $username);
 
-		if ($this->app instanceof CMSApplication && !$this->app->get('shared_session', false))
-		{
-			$clientId = $this->app->getClientId();
-
-			$setValues[] = $this->db->quoteName('client_id') . ' = :client_id';
-
-			$query->bind(':client_id', $clientId, ParameterType::INTEGER);
-		}
-
 		$query->update($this->db->quoteName('#__session'))
 			->set($setValues)
 			->where($this->db->quoteName('session_id') . ' = :session_id');
@@ -333,4 +323,4 @@ final class MetadataManager
 			// This failure isn't critical, we can go on without the metadata
 		}
 	}
-}
+}

week-03/project/libraries/src/String/PunycodeHelper.php

@@ -6,9 +6,7 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace Joomla\CMS\String;
-
-\defined('JPATH_PLATFORM') or die;
+namespace Octoleo\CMS\String;
 
 use Algo26\IdnaConvert\ToIdn;
 use Algo26\IdnaConvert\ToUnicode;

week-03/project/libraries/src/User/User.php

@@ -1,934 +1,76 @@
 <?php
 /**
- * Joomla! Content Management System
+ * @package    Octoleo CMS
  *
- * @copyright  (C) 2006 Open Source Matters, Inc. <https://www.joomla.org>
+ * @created    9th April 2022
+ * @author     Llewellyn van der Merwe <https://git.vdm.dev/Llewellyn>
+ * @git        WEBD-325-45 <https://git.vdm.dev/Llewellyn/WEBD-325-45>
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace Joomla\CMS\User;
+namespace Octoleo\CMS\User;
 
-\defined('JPATH_PLATFORM') or die;
-
-use Joomla\CMS\Access\Access;
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Log\Log;
-use Joomla\CMS\Object\CMSObject;
-use Joomla\CMS\Plugin\PluginHelper;
-use Joomla\CMS\Table\Table;
 use Joomla\Registry\Registry;
-use Joomla\Utilities\ArrayHelper;
+use Joomla\Database\DatabaseInterface;
+use Octoleo\CMS\Factory;
 
 /**
  * User class.  Handles all application interaction with a user
  *
- * @since  1.7.0
+ * @since  1.0.0
  */
-class User extends CMSObject
+class User extends Registry
 {
-	/**
-	 * A cached switch for if this user has root access rights.
-	 *
-	 * @var    boolean
-	 * @since  1.7.0
-	 */
-	protected $isRoot = null;
-
-	/**
-	 * Unique id
-	 *
-	 * @var    integer
-	 * @since  1.7.0
-	 */
-	public $id = null;
-
-	/**
-	 * The user's real name (or nickname)
-	 *
-	 * @var    string
-	 * @since  1.7.0
-	 */
-	public $name = null;
-
-	/**
-	 * The login name
-	 *
-	 * @var    string
-	 * @since  1.7.0
-	 */
-	public $username = null;
-
-	/**
-	 * The email
-	 *
-	 * @var    string
-	 * @since  1.7.0
-	 */
-	public $email = null;
-
-	/**
-	 * MD5 encrypted password
-	 *
-	 * @var    string
-	 * @since  1.7.0
-	 */
-	public $password = null;
-
-	/**
-	 * Clear password, only available when a new password is set for a user
-	 *
-	 * @var    string
-	 * @since  1.7.0
-	 */
-	public $password_clear = '';
-
-	/**
-	 * Block status
-	 *
-	 * @var    integer
-	 * @since  1.7.0
-	 */
-	public $block = null;
-
-	/**
-	 * Should this user receive system email
-	 *
-	 * @var    integer
-	 * @since  1.7.0
-	 */
-	public $sendEmail = null;
-
-	/**
-	 * Date the user was registered
-	 *
-	 * @var    string
-	 * @since  1.7.0
-	 */
-	public $registerDate = null;
-
-	/**
-	 * Date of last visit
-	 *
-	 * @var    string
-	 * @since  1.7.0
-	 */
-	public $lastvisitDate = null;
-
-	/**
-	 * Activation hash
-	 *
-	 * @var    string
-	 * @since  1.7.0
-	 */
-	public $activation = null;
-
-	/**
-	 * User parameters
-	 *
-	 * @var    Registry
-	 * @since  1.7.0
-	 */
-	public $params = null;
-
-	/**
-	 * Associative array of user names => group ids
-	 *
-	 * @var    array
-	 * @since  1.7.0
-	 */
-	public $groups = array();
-
-	/**
-	 * Guest status
-	 *
-	 * @var    integer
-	 * @since  1.7.0
-	 */
-	public $guest = null;
-
-	/**
-	 * Last Reset Time
-	 *
-	 * @var    string
-	 * @since  3.0.1
-	 */
-	public $lastResetTime = null;
-
-	/**
-	 * Count since last Reset Time
-	 *
-	 * @var    integer
-	 * @since  3.0.1
-	 */
-	public $resetCount = null;
-
-	/**
-	 * Flag to require the user's password be reset
-	 *
-	 * @var    integer
-	 * @since  3.2
-	 */
-	public $requireReset = null;
-
-	/**
-	 * User parameters
-	 *
-	 * @var    Registry
-	 * @since  1.7.0
-	 */
-	protected $_params = null;
-
-	/**
-	 * Authorised access groups
-	 *
-	 * @var    array
-	 * @since  1.7.0
-	 */
-	protected $_authGroups = null;
-
-	/**
-	 * Authorised access levels
-	 *
-	 * @var    array
-	 * @since  1.7.0
-	 */
-	protected $_authLevels = null;
-
-	/**
-	 * Authorised access actions
-	 *
-	 * @var    array
-	 * @since  1.7.0
-	 */
-	protected $_authActions = null;
-
-	/**
-	 * Error message
-	 *
-	 * @var    string
-	 * @since  1.7.0
-	 */
-	protected $_errorMsg = null;
-
-	/**
-	 * @var    array  User instances container.
-	 * @since  1.7.3
-	 */
-	protected static $instances = array();
-
 	/**
 	 * Constructor activating the default information of the language
 	 *
 	 * @param   integer  $identifier  The primary key of the user to load (optional).
 	 *
-	 * @since   1.7.0
+	 * @throws \Exception
+	 * @since   1.1.0
 	 */
 	public function __construct($identifier = 0)
 	{
-		// Create the user parameters object
-		$this->_params = new Registry;
-
 		// Load the user if it exists
 		if (!empty($identifier))
 		{
-			$this->load($identifier);
+			$data = $this->load($identifier);
+			// not a guest
+			$data->guest = 0;
 		}
 		else
 		{
-			// Initialise
-			$this->id = 0;
-			$this->sendEmail = 0;
-			$this->aid = 0;
-			$this->guest = 1;
+			// Initialise guest
+			$data = (object) ['id' => 0, 'sendEmail' => 0, 'aid' => 0, 'guest' => 1];
 		}
-	}
-
-	/**
-	 * Returns the global User object, only creating it if it doesn't already exist.
-	 *
-	 * @param   integer  $identifier  The primary key of the user to load (optional).
-	 *
-	 * @return  User  The User object.
-	 *
-	 * @since       1.7.0
-	 * @deprecated  5.0  Load the user service from the dependency injection container or via $app->getIdentity()
-	 */
-	public static function getInstance($identifier = 0)
-	{
-		@trigger_error(
-			sprintf(
-				'%1$s() is deprecated. Load the user from the dependency injection container or via %2$s::getApplication()->getIdentity().',
-				__METHOD__,
-				__CLASS__
-			),
-			E_USER_DEPRECATED
-		);
-
-		// Find the user id
-		if (!is_numeric($identifier))
-		{
-			return Factory::getContainer()->get(UserFactoryInterface::class)->loadUserByUsername($identifier);
-		}
-		else
-		{
-			$id = $identifier;
-		}
-
-		// If the $id is zero, just return an empty User.
-		// Note: don't cache this user because it'll have a new ID on save!
-		if ($id === 0)
-		{
-			return Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById($id);
-		}
-
-		// Check if the user ID is already cached.
-		if (empty(self::$instances[$id]))
-		{
-			self::$instances[$id] = Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById($id);
-		}
-
-		return self::$instances[$id];
-	}
-
-	/**
-	 * Method to get a parameter value
-	 *
-	 * @param   string  $key      Parameter key
-	 * @param   mixed   $default  Parameter default value
-	 *
-	 * @return  mixed  The value or the default if it did not exist
-	 *
-	 * @since   1.7.0
-	 */
-	public function getParam($key, $default = null)
-	{
-		return $this->_params->get($key, $default);
-	}
-
-	/**
-	 * Method to set a parameter
-	 *
-	 * @param   string  $key    Parameter key
-	 * @param   mixed   $value  Parameter value
-	 *
-	 * @return  mixed  Set parameter value
-	 *
-	 * @since   1.7.0
-	 */
-	public function setParam($key, $value)
-	{
-		return $this->_params->set($key, $value);
-	}
-
-	/**
-	 * Method to set a default parameter if it does not exist
-	 *
-	 * @param   string  $key    Parameter key
-	 * @param   mixed   $value  Parameter value
-	 *
-	 * @return  mixed  Set parameter value
-	 *
-	 * @since   1.7.0
-	 */
-	public function defParam($key, $value)
-	{
-		return $this->_params->def($key, $value);
-	}
-
-	/**
-	 * Method to check User object authorisation against an access control
-	 * object and optionally an access extension object
-	 *
-	 * @param   string  $action     The name of the action to check for permission.
-	 * @param   string  $assetname  The name of the asset on which to perform the action.
-	 *
-	 * @return  boolean  True if authorised
-	 *
-	 * @since   1.7.0
-	 */
-	public function authorise($action, $assetname = null)
-	{
-		// Make sure we only check for core.admin once during the run.
-		if ($this->isRoot === null)
-		{
-			$this->isRoot = false;
-
-			// Check for the configuration file failsafe.
-			$rootUser = Factory::getApplication()->get('root_user');
-
-			// The root_user variable can be a numeric user ID or a username.
-			if (is_numeric($rootUser) && $this->id > 0 && $this->id == $rootUser)
-			{
-				$this->isRoot = true;
-			}
-			elseif ($this->username && $this->username == $rootUser)
-			{
-				$this->isRoot = true;
-			}
-			elseif ($this->id > 0)
-			{
-				// Get all groups against which the user is mapped.
-				$identities = $this->getAuthorisedGroups();
-				array_unshift($identities, $this->id * -1);
-
-				if (Access::getAssetRules(1)->allow('core.admin', $identities))
-				{
-					$this->isRoot = true;
-
-					return true;
-				}
-			}
-		}
-
-		return $this->isRoot ? true : (bool) Access::check($this->id, $action, $assetname);
-	}
-
-	/**
-	 * Method to return a list of all categories that a user has permission for a given action
-	 *
-	 * @param   string  $component  The component from which to retrieve the categories
-	 * @param   string  $action     The name of the section within the component from which to retrieve the actions.
-	 *
-	 * @return  array  List of categories that this group can do this action to (empty array if none). Categories must be published.
-	 *
-	 * @since   1.7.0
-	 */
-	public function getAuthorisedCategories($component, $action)
-	{
-		// Brute force method: get all published category rows for the component and check each one
-		// @todo: Modify the way permissions are stored in the db to allow for faster implementation and better scaling
-		$db = Factory::getDbo();
-
-		$subQuery = $db->getQuery(true)
-			->select($db->quoteName(['id', 'asset_id']))
-			->from($db->quoteName('#__categories'))
-			->where(
-				[
-					$db->quoteName('extension') . ' = :component',
-					$db->quoteName('published') . ' = 1',
-				]
-			);
-
-		$query = $db->getQuery(true)
-			->select($db->quoteName(['c.id', 'a.name']))
-			->from('(' . $subQuery . ') AS ' . $db->quoteName('c'))
-			->join('INNER', $db->quoteName('#__assets', 'a'), $db->quoteName('c.asset_id') . ' = ' . $db->quoteName('a.id'))
-			->bind(':component', $component);
-		$db->setQuery($query);
-		$allCategories = $db->loadObjectList('id');
-		$allowedCategories = array();
-
-		foreach ($allCategories as $category)
-		{
-			if ($this->authorise($action, $category->name))
-			{
-				$allowedCategories[] = (int) $category->id;
-			}
-		}
-
-		return $allowedCategories;
-	}
-
-	/**
-	 * Gets an array of the authorised access levels for the user
-	 *
-	 * @return  array
-	 *
-	 * @since   1.7.0
-	 */
-	public function getAuthorisedViewLevels()
-	{
-		if ($this->_authLevels === null)
-		{
-			$this->_authLevels = array();
-		}
-
-		if (empty($this->_authLevels))
-		{
-			$this->_authLevels = Access::getAuthorisedViewLevels($this->id);
-		}
-
-		return $this->_authLevels;
-	}
-
-	/**
-	 * Gets an array of the authorised user groups
-	 *
-	 * @return  array
-	 *
-	 * @since   1.7.0
-	 */
-	public function getAuthorisedGroups()
-	{
-		if ($this->_authGroups === null)
-		{
-			$this->_authGroups = array();
-		}
-
-		if (empty($this->_authGroups))
-		{
-			$this->_authGroups = Access::getGroupsByUser($this->id);
-		}
-
-		return $this->_authGroups;
-	}
-
-	/**
-	 * Clears the access rights cache of this user
-	 *
-	 * @return  void
-	 *
-	 * @since   3.4.0
-	 */
-	public function clearAccessRights()
-	{
-		$this->_authLevels = null;
-		$this->_authGroups = null;
-		$this->isRoot = null;
-		Access::clearStatics();
-	}
-
-	/**
-	 * Pass through method to the table for setting the last visit date
-	 *
-	 * @param   integer  $timestamp  The timestamp, defaults to 'now'.
-	 *
-	 * @return  boolean  True on success.
-	 *
-	 * @since   1.7.0
-	 */
-	public function setLastVisit($timestamp = null)
-	{
-		// Create the user table object
-		/** @var \Joomla\CMS\Table\User $table */
-		$table = $this->getTable();
-		$table->load($this->id);
-
-		return $table->setLastVisit($timestamp);
-	}
-
-	/**
-	 * Method to get the user timezone.
-	 *
-	 * If the user didn't set a timezone, it will return the server timezone
-	 *
-	 * @return \DateTimeZone
-	 *
-	 * @since 3.7.0
-	 */
-	public function getTimezone()
-	{
-		$timezone = $this->getParam('timezone', Factory::getApplication()->get('offset', 'GMT'));
-
-		return new \DateTimeZone($timezone);
-	}
-
-	/**
-	 * Method to get the user parameters
-	 *
-	 * @param   object  $params  The user parameters object
-	 *
-	 * @return  void
-	 *
-	 * @since   1.7.0
-	 */
-	public function setParameters($params)
-	{
-		$this->_params = $params;
-	}
-
-	/**
-	 * Method to get the user table object
-	 *
-	 * This function uses a static variable to store the table name of the user table to
-	 * instantiate. You can call this function statically to set the table name if
-	 * needed.
-	 *
-	 * @param   string  $type    The user table name to be used
-	 * @param   string  $prefix  The user table prefix to be used
-	 *
-	 * @return  Table  The user table object
-	 *
-	 * @note    At 4.0 this method will no longer be static
-	 * @since   1.7.0
-	 */
-	public static function getTable($type = null, $prefix = 'JTable')
-	{
-		static $tabletype;
-
-		// Set the default tabletype;
-		if (!isset($tabletype))
-		{
-			$tabletype['name'] = 'user';
-			$tabletype['prefix'] = 'JTable';
-		}
-
-		// Set a custom table type is defined
-		if (isset($type))
-		{
-			$tabletype['name'] = $type;
-			$tabletype['prefix'] = $prefix;
-		}
-
-		// Create the user table object
-		return Table::getInstance($tabletype['name'], $tabletype['prefix']);
-	}
-
-	/**
-	 * Method to bind an associative array of data to a user object
-	 *
-	 * @param   array  &$array  The associative array to bind to the object
-	 *
-	 * @return  boolean  True on success
-	 *
-	 * @since   1.7.0
-	 */
-	public function bind(&$array)
-	{
-		// Let's check to see if the user is new or not
-		if (empty($this->id))
-		{
-			// Check the password and create the crypted password
-			if (empty($array['password']))
-			{
-				$array['password']  = UserHelper::genRandomPassword(32);
-				$array['password2'] = $array['password'];
-			}
-
-			// Not all controllers check the password, although they should.
-			// Hence this code is required:
-			if (isset($array['password2']) && $array['password'] != $array['password2'])
-			{
-				Factory::getApplication()->enqueueMessage(Text::_('JLIB_USER_ERROR_PASSWORD_NOT_MATCH'), 'error');
-
-				return false;
-			}
-
-			$this->password_clear = ArrayHelper::getValue($array, 'password', '', 'string');
-
-			$array['password'] = UserHelper::hashPassword($array['password']);
-
-			// Set the registration timestamp
-			$this->set('registerDate', Factory::getDate()->toSql());
-		}
-		else
-		{
-			// Updating an existing user
-			if (!empty($array['password']))
-			{
-				if ($array['password'] != $array['password2'])
-				{
-					$this->setError(Text::_('JLIB_USER_ERROR_PASSWORD_NOT_MATCH'));
-
-					return false;
-				}
-
-				$this->password_clear = ArrayHelper::getValue($array, 'password', '', 'string');
-
-				// Check if the user is reusing the current password if required to reset their password
-				if ($this->requireReset == 1 && UserHelper::verifyPassword($this->password_clear, $this->password))
-				{
-					$this->setError(Text::_('JLIB_USER_ERROR_CANNOT_REUSE_PASSWORD'));
-
-					return false;
-				}
-
-				$array['password'] = UserHelper::hashPassword($array['password']);
-
-				// Reset the change password flag
-				$array['requireReset'] = 0;
-			}
-			else
-			{
-				$array['password'] = $this->password;
-			}
-
-			// Prevent updating internal fields
-			unset($array['registerDate']);
-			unset($array['lastvisitDate']);
-			unset($array['lastResetTime']);
-			unset($array['resetCount']);
-		}
-
-		if (\array_key_exists('params', $array))
-		{
-			$this->_params->loadArray($array['params']);
-
-			if (\is_array($array['params']))
-			{
-				$params = (string) $this->_params;
-			}
-			else
-			{
-				$params = $array['params'];
-			}
-
-			$this->params = $params;
-		}
-
-		// Bind the array
-		if (!$this->setProperties($array))
-		{
-			$this->setError(Text::_('JLIB_USER_ERROR_BIND_ARRAY'));
-
-			return false;
-		}
-
-		// Make sure its an integer
-		$this->id = (int) $this->id;
-
-		return true;
-	}
-
-	/**
-	 * Method to save the User object to the database
-	 *
-	 * @param   boolean  $updateOnly  Save the object only if not a new user
-	 *                                Currently only used in the user reset password method.
-	 *
-	 * @return  boolean  True on success
-	 *
-	 * @since   1.7.0
-	 * @throws  \RuntimeException
-	 */
-	public function save($updateOnly = false)
-	{
-		// Create the user table object
-		$table = $this->getTable();
-		$this->params = (string) $this->_params;
-		$table->bind($this->getProperties());
-
-		// Allow an exception to be thrown.
-		try
-		{
-			// Check and store the object.
-			if (!$table->check())
-			{
-				$this->setError($table->getError());
-
-				return false;
-			}
-
-			// If user is made a Super Admin group and user is NOT a Super Admin
-
-			// @todo ACL - this needs to be acl checked
-
-			$my = Factory::getUser();
-
-			// Are we creating a new user
-			$isNew = empty($this->id);
-
-			// If we aren't allowed to create new users return
-			if ($isNew && $updateOnly)
-			{
-				return true;
-			}
-
-			// Get the old user
-			$oldUser = new User($this->id);
-
-			// Access Checks
-
-			// The only mandatory check is that only Super Admins can operate on other Super Admin accounts.
-			// To add additional business rules, use a user plugin and throw an Exception with onUserBeforeSave.
-
-			// Check if I am a Super Admin
-			$iAmSuperAdmin = $my->authorise('core.admin');
-
-			$iAmRehashingSuperadmin = false;
-
-			if (($my->id == 0 && !$isNew) && $this->id == $oldUser->id && $oldUser->authorise('core.admin') && $oldUser->password != $this->password)
-			{
-				$iAmRehashingSuperadmin = true;
-			}
-
-			// Check if we are using a CLI application
-			$isCli = false;
-
-			if (Factory::getApplication()->isCli())
-			{
-				$isCli = true;
-			}
-
-			// We are only worried about edits to this account if I am not a Super Admin.
-			if ($iAmSuperAdmin != true && $iAmRehashingSuperadmin != true && $isCli != true)
-			{
-				// I am not a Super Admin, and this one is, so fail.
-				if (!$isNew && Access::check($this->id, 'core.admin'))
-				{
-					throw new \RuntimeException('User not Super Administrator');
-				}
-
-				if ($this->groups != null)
-				{
-					// I am not a Super Admin and I'm trying to make one.
-					foreach ($this->groups as $groupId)
-					{
-						if (Access::checkGroup($groupId, 'core.admin'))
-						{
-							throw new \RuntimeException('User not Super Administrator');
-						}
-					}
-				}
-			}
-
-			// Fire the onUserBeforeSave event.
-			PluginHelper::importPlugin('user');
-
-			$result = Factory::getApplication()->triggerEvent('onUserBeforeSave', array($oldUser->getProperties(), $isNew, $this->getProperties()));
-
-			if (\in_array(false, $result, true))
-			{
-				// Plugin will have to raise its own error or throw an exception.
-				return false;
-			}
-
-			// Store the user data in the database
-			$result = $table->store();
-
-			// Set the id for the User object in case we created a new user.
-			if (empty($this->id))
-			{
-				$this->id = $table->get('id');
-			}
-
-			if ($my->id == $table->id)
-			{
-				$registry = new Registry($table->params);
-				$my->setParameters($registry);
-			}
-
-			// Fire the onUserAfterSave event
-			Factory::getApplication()->triggerEvent('onUserAfterSave', array($this->getProperties(), $isNew, $result, $this->getError()));
-		}
-		catch (\Exception $e)
-		{
-			$this->setError($e->getMessage());
-
-			return false;
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Method to delete the User object from the database
-	 *
-	 * @return  boolean  True on success
-	 *
-	 * @since   1.7.0
-	 */
-	public function delete()
-	{
-		PluginHelper::importPlugin('user');
-
-		// Trigger the onUserBeforeDelete event
-		Factory::getApplication()->triggerEvent('onUserBeforeDelete', array($this->getProperties()));
-
-		// Create the user table object
-		$table = $this->getTable();
-
-		if (!$result = $table->delete($this->id))
-		{
-			$this->setError($table->getError());
-		}
-
-		// Trigger the onUserAfterDelete event
-		Factory::getApplication()->triggerEvent('onUserAfterDelete', array($this->getProperties(), $result, $this->getError()));
-
-		return $result;
+		// set the data
+		parent::__construct($data);
 	}
 
 	/**
 	 * Method to load a User object by user id number
 	 *
-	 * @param   mixed  $id  The user id of the user to load
+	 * @param   int  $id  The user id of the user to load
 	 *
-	 * @return  boolean  True on success
+	 * @return  Object  on success
 	 *
-	 * @since   1.7.0
+	 * @throws \Exception
+	 * @since   1.0.0
 	 */
-	public function load($id)
+	protected function load( int $id): object
 	{
-		// Create the user table object
-		$table = $this->getTable();
+		// Get the database
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
-		// Load the UserModel object based on the user id or throw a warning.
-		if (!$table->load($id))
-		{
-			// Reset to guest user
-			$this->guest = 1;
-
-			Log::add(Text::sprintf('JLIB_USER_ERROR_UNABLE_TO_LOAD_USER', $id), Log::WARNING, 'jerror');
-
-			return false;
-		}
-
-		/*
-		 * Set the user parameters using the default XML file.  We might want to
-		 * extend this in the future to allow for the ability to have custom
-		 * user parameters, but for right now we'll leave it how it is.
-		 */
-
-		if ($table->params)
-		{
-			$this->_params->loadString($table->params);
-		}
-
-		// Assuming all is well at this point let's bind the data
-		$this->setProperties($table->getProperties());
-
-		// The user is no longer a guest
-		if ($this->id != 0)
-		{
-			$this->guest = 0;
-		}
-		else
-		{
-			$this->guest = 1;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Method to allow serialize the object with minimal properties.
-	 *
-	 * @return  array  The names of the properties to include in serialization.
-	 *
-	 * @since   3.6.0
-	 */
-	public function __sleep()
-	{
-		return array('id');
-	}
-
-	/**
-	 * Method to recover the full object on unserialize.
-	 *
-	 * @return  void
-	 *
-	 * @since   3.6.0
-	 */
-	public function __wakeup()
-	{
 		// Initialise some variables
-		$this->_params = new Registry;
+		$query = $db->getQuery(true)
+			->select('*')
+			->from($db->quoteName('#__users'))
+			->where($db->quoteName('id') . ' = :id')
+			->bind(':id', $id)
+			->setLimit(1);
+		$db->setQuery($query);
 
-		// Load the user if it exists
-		if (!empty($this->id) && $this->load($this->id))
-		{
-			// Push user into cached instances.
-			self::$instances[$this->id] = $this;
-		}
-		else
-		{
-			// Initialise
-			$this->id = 0;
-			$this->sendEmail = 0;
-			$this->aid = 0;
-			$this->guest = 1;
-		}
+		return $db->loadObject();
 	}
 }

week-03/project/libraries/src/User/UserFactory.php

@@ -1,21 +1,31 @@
 <?php
 /**
- * Joomla! Content Management System
+ * @package    Octoleo CMS
  *
- * @copyright  (C) 2019 Open Source Matters, Inc. <https://www.joomla.org>
+ * @created    9th April 2022
+ * @author     Llewellyn van der Merwe <https://git.vdm.dev/Llewellyn>
+ * @git        WEBD-325-45 <https://git.vdm.dev/Llewellyn/WEBD-325-45>
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace Joomla\CMS\User;
-
-\defined('_JEXEC') or die;
+namespace Octoleo\CMS\User;
 
+use Joomla\Authentication\AuthenticationStrategyInterface;
 use Joomla\Database\DatabaseInterface;
+use Joomla\Authentication\Password\BCryptHandler;
+use Joomla\Filter\InputFilter as InputFilterAlias;
+use Joomla\String\StringHelper;
+use Octoleo\CMS\Application\AdminApplication;
+use Octoleo\CMS\Date\Date;
+use Octoleo\CMS\Factory;
+use Octoleo\CMS\Filter\InputFilter;
+use Octoleo\CMS\Session\MetadataManager;
 
 /**
  * Default factory for creating User objects
  *
- * @since  4.0.0
+ * @since  1.0.0
+ * source: https://github.com/joomla/joomla-cms/blob/4.2-dev/libraries/src/User/UserFactory.php
  */
 class UserFactory implements UserFactoryInterface
 {
@@ -26,14 +36,47 @@ class UserFactory implements UserFactoryInterface
 	 */
 	private $db;
 
+	/**
+	 * @var AuthenticationStrategyInterface
+	 */
+	private $authentication;
+
+	/**
+	 * @var InputFilter
+	 */
+	private $inputFilter;
+
+	/**
+	 * @var string[]
+	 */
+	private $userFilter = [
+		'name' => 'STRING',
+	    'username' => 'USERNAME',
+		'email' => 'STRING',
+		'password' => 'RAW',
+		'password2' => 'RAW'
+	];
+	/**
+	 * @var BCryptHandler
+	 */
+	private $secure;
+
 	/**
 	 * UserFactory constructor.
 	 *
-	 * @param   DatabaseInterface  $db  The database
+	 * @param   DatabaseInterface|null                $db  The database
+	 * @param   AuthenticationStrategyInterface|null  $authentication
+	 *
+	 * @throws \Exception
 	 */
-	public function __construct(DatabaseInterface $db)
+	public function __construct(
+		DatabaseInterface $db = null,
+		AuthenticationStrategyInterface $authentication = null,
+		BCryptHandler $secure = null)
 	{
-		$this->db = $db;
+		$this->db             = ($db) ?: Factory::getApplication()->get(DatabaseInterface::class);
+		$this->authentication = ($authentication) ?: Factory::getApplication()->get(AuthenticationStrategyInterface::class);
+		$this->secure         = ($secure) ?: new BCryptHandler();
 	}
 
 	/**
@@ -43,7 +86,8 @@ class UserFactory implements UserFactoryInterface
 	 *
 	 * @return  User
 	 *
-	 * @since   4.0.0
+	 * @throws \Exception
+	 * @since   1.0.0
 	 */
 	public function loadUserById(int $id): User
 	{
@@ -57,7 +101,8 @@ class UserFactory implements UserFactoryInterface
 	 *
 	 * @return  User
 	 *
-	 * @since   4.0.0
+	 * @throws \Exception
+	 * @since   1.0.0
 	 */
 	public function loadUserByUsername(string $username): User
 	{
@@ -72,4 +117,365 @@ class UserFactory implements UserFactoryInterface
 
 		return $this->loadUserById((int) $this->db->loadResult());
 	}
+
+	/**
+	 * Check if user is active
+	 *
+	 * @return bool
+	 * @throws \Exception
+	 */
+	public function active(): bool
+	{
+		/** @var \Octoleo\CMS\Application\AdminApplication $application */
+		$application = Factory::getApplication();
+
+		$session = $application->getSession();
+
+		// Grab the current session ID
+		$sessionId = $session->getId();
+
+		/** @var \Octoleo\CMS\Session\MetadataManager $manager */
+		$manager = Factory::getContainer()->get(MetadataManager::class);
+
+		$active = $manager->getSessionRecord($sessionId);
+
+		// if no active session is found...
+		if (!$active)
+		{
+			return false;
+		}
+
+		// if user above 0 the active
+		if ($active->guest == 0 && $active->userid > 0)
+		{
+			return true;
+		}
+
+		// Purge the session
+		$query = $this->db->getQuery(true)
+			->delete($this->db->quoteName('#__session'))
+			->where($this->db->quoteName('session_id') . ' = :sessionid')
+			->bind(':sessionid', $sessionId);
+		try
+		{
+			$this->db->setQuery($query)->execute();
+		}
+		catch (\RuntimeException $e)
+		{
+			// The old session is already invalidated, don't let this block logging in
+		}
+
+		// destroy session
+		$session->destroy();
+
+		// very basic for now....
+		return false;
+	}
+
+	/**
+	 * Check if a user exist based on give key value pair
+	 *
+	 * @param   string  $value
+	 * @param   string  $key
+	 *
+	 * @return false|mixed  on success return user ID
+	 */
+	public function exist(string $value, string $key = 'username')
+	{
+		try
+		{
+			$id = $this->db->setQuery(
+				$this->db->getQuery(true)
+					->select($this->db->quoteName('id'))
+					->from($this->db->quoteName('#__users'))
+					->where($this->db->quoteName($key) . ' = ?')
+					->bind(1, $value)
+			)->loadResult();
+		}
+		catch (\RuntimeException $exception)
+		{
+			return false;
+		}
+
+		if ($id > 0)
+		{
+			return $id;
+		}
+		return false;
+	}
+
+	/**
+	 * Attempt to authenticate the username and password pair.
+	 *
+	 * @return  string|boolean  A string containing a username if authentication is successful, false otherwise.
+	 *
+	 * @since   1.1.0
+	 */
+	public function authenticate()
+	{
+		return $this->authentication->authenticate();
+	}
+
+	/**
+	 * Attempt to login user
+	 *
+	 * @return  boolean  true on success
+	 *
+	 * @throws \Exception
+	 * @since   1.0.0
+	 */
+	public function login(): bool
+	{
+		/** @var \Octoleo\CMS\Application\AdminApplication $application */
+		$application = Factory::getApplication();
+
+		if (($username = $this->authenticate()) !== false)
+		{
+			$user = $this->loadUserByUsername($username);
+
+			// If loadUserByUsername returned an error, then pass it back.
+			if ($user instanceof \Exception)
+			{
+				$application->enqueueMessage('Login failure', 'Error');
+
+				return false;
+			}
+
+			// If loadUserByUsername returned an error, then pass it back.
+			if ($user->get('block', true))
+			{
+				$application->enqueueMessage('Login failure, user is blocked.', 'Warning');
+
+				return false;
+			}
+
+			return $this->setUserSession($application, $user->toArray());
+		}
+		// set authentication failure message
+		$application->enqueueMessage('Login failure, please try again.', 'Warning');
+
+		return false;
+	}
+
+	/**
+	 * Logout user
+	 *
+	 * @return bool
+	 * @throws \Exception
+	 */
+	public function logout(): bool
+	{
+		/** @var \Octoleo\CMS\Application\AdminApplication $application */
+		$application = Factory::getApplication();
+
+		$session = $application->getSession();
+
+		// Grab the current session ID
+		$sessionId = $session->getId();
+
+		// Purge the session
+		$query = $this->db->getQuery(true)
+			->delete($this->db->quoteName('#__session'))
+			->where($this->db->quoteName('session_id') . ' = :sessionid')
+			->bind(':sessionid', $sessionId);
+		try
+		{
+			$this->db->setQuery($query)->execute();
+		}
+		catch (\RuntimeException $e)
+		{
+			// The old session is already invalidated, don't let this block logging in
+		}
+
+		// destroy session
+		$session->destroy();
+
+		// very basic for now....
+		return true;
+	}
+
+	/**
+	 * Attempt to great user
+	 *
+	 * @param   string|null  $name
+	 * @param   string|null  $username
+	 * @param   string|null  $email
+	 * @param   string|null  $password
+	 * @param   string|null  $password2
+	 *
+	 * @return  boolean  true on success
+	 *
+	 * @throws \Exception
+	 * @since   1.0.0
+	 */
+	public function create(
+		string $name = null,
+		string $username = null,
+		string $email = null,
+		string $password = null,
+		string $password2 = null): bool
+	{
+		/** @var \Octoleo\CMS\Application\AdminApplication $application */
+		$application = Factory::getApplication();
+
+		/** @var \Joomla\Input\Input $input */
+		$input = $application->getInput();
+
+		$user = [];
+		$user['name']      = ($name) ?: $input->getString('name', '');
+		$user['username']  = ($username) ?: $input->getString('username', '');
+		$user['email']     = ($email) ?: $input->getString('email', '');
+		$user['password']  = ($password) ?: $input->getString('password', '');
+		$user['password2'] = ($password2) ?: $input->getString('password2', '');
+
+		// check if username exist
+		if (!empty($user['username']) && $this->exist($user['username']))
+		{
+			$application->enqueueMessage('Username already exist, try another username.', 'Warning');
+
+			return false;
+		}
+		// check if email exist
+		if (!empty($user['email']) && $this->exist($user['email'], 'email'))
+		{
+			$application->enqueueMessage('Email already exist, try another email.', 'Warning');
+
+			return false;
+		}
+
+		// load our filter
+		$this->inputFilter = InputFilter::getInstance(
+			[],
+			[],
+			InputFilterAlias::ONLY_BLOCK_DEFINED_TAGS,
+			InputFilterAlias::ONLY_BLOCK_DEFINED_ATTRIBUTES
+		);
+
+		// check that we have all the values set
+		$valid = true;
+		foreach ($user as $key => $detail)
+		{
+			// check if its empty
+			if (empty($detail))
+			{
+				$valid = false;
+				$application->enqueueMessage($key . ' is required', 'error');
+			}
+			// check if its valid
+			if (!$this->valid($key, $detail))
+			{
+				$valid = false;
+				$application->enqueueMessage($key . ' is not valid', 'error');
+			}
+		}
+
+		// check passwords TODO: check that we have a valid email
+		if (isset($user['password2']) && $user['password'] != $user['password2'])
+		{
+			$valid = false;
+			$application->enqueueMessage('Passwords do not match', 'error');
+		}
+		unset ($user['password2']);
+
+		// continue only if valid
+		if ($valid)
+		{
+			// hash the password
+			$user['password'] = $this->secure->hashPassword($user['password']);
+
+			// set the registration date
+			$user['registerDate'] = (new Date())->toSql();
+
+			// set other defaults for now
+			$user['sendEmail'] = 1;
+			$user['block'] = 0;
+			$user['params'] = '';
+
+			$insert = (object) $user;
+
+			try
+			{
+				// Insert the user
+				$result = $this->db->insertObject('#__users', $insert, 'id');
+			}
+			catch (\RuntimeException $exception)
+			{
+				throw new \RuntimeException($exception->getMessage(), 404);
+
+				return false;
+			}
+
+			// only set session if success
+			if ($result)
+			{
+				$user['id'] = $this->db->insertid();
+				return $this->setUserSession($application, $user);
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Attempt validate user input (BASIC)
+	 *
+	 * @param   string  $key
+	 * @param   string  $detail
+	 *
+	 * @return bool
+	 */
+	private function valid(string $key, string $detail): bool
+	{
+		if (isset($this->userFilter[$key]))
+		{
+			$valid = $this->inputFilter->clean($detail, $this->userFilter[$key]);
+
+			if (StringHelper::strcmp($valid, $detail) == 0)
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * @param   AdminApplication  $application
+	 * @param   array             $user
+	 *
+	 * @return bool
+	 * @throws \Exception
+	 */
+	private function setUserSession(AdminApplication $application, array $user): bool
+	{
+		$session = $application->getSession();
+
+		// Grab the current session ID
+		$oldSessionId = $session->getId();
+
+		// Fork the session
+		$session->fork();
+
+		// Register the needed session variables
+		$session->set('user', $user);
+
+		// Purge the old session
+		$query = $this->db->getQuery(true)
+			->delete($this->db->quoteName('#__session'))
+			->where($this->db->quoteName('session_id') . ' = :sessionid')
+			->bind(':sessionid', $oldSessionId);
+		try
+		{
+			$this->db->setQuery($query)->execute();
+		}
+		catch (\RuntimeException $e)
+		{
+			// The old session is already invalidated, don't let this block logging in
+		}
+
+		/** @var \Octoleo\CMS\Session\MetadataManager $manager */
+		$manager = Factory::getContainer()->get(MetadataManager::class);
+
+		$manager->createOrUpdateRecord($session, $this->loadUserById($user['id']));
+
+		return true;
+	}
 }

week-03/project/libraries/src/User/UserFactoryInterface.php

@@ -6,14 +6,12 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace Joomla\CMS\User;
-
-\defined('_JEXEC') or die;
+namespace Octoleo\CMS\User;
 
 /**
  * Interface defining a factory which can create User objects
  *
- * @since  4.0.0
+ * @since  1.0.0
  */
 interface UserFactoryInterface
 {
@@ -24,7 +22,7 @@ interface UserFactoryInterface
 	 *
 	 * @return  User
 	 *
-	 * @since   4.0.0
+	 * @since   1.0.0
 	 */
 	public function loadUserById(int $id): User;
 
@@ -35,7 +33,16 @@ interface UserFactoryInterface
 	 *
 	 * @return  User
 	 *
-	 * @since   4.0.0
+	 * @since   1.0.0
 	 */
 	public function loadUserByUsername(string $username): User;
+
+	/**
+	 * Attempt to authenticate the username and password pair.
+	 *
+	 * @return  string|boolean  A string containing a username if authentication is successful, false otherwise.
+	 *
+	 * @since   1.1.0
+	 */
+	public function authenticate();
 }

week-03/project/libraries/src/View/Admin/DashboardHtmlView.php

@@ -1,67 +1,49 @@
 <?php
 /**
- * Joomla! Framework Website
+ * @package    Octoleo CMS
  *
- * @copyright  Copyright (C) 2014 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license    http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License Version 2 or Later
+ * @created    9th April 2022
+ * @author     Llewellyn van der Merwe <https://git.vdm.dev/Llewellyn>
+ * @git        WEBD-325-45 <https://git.vdm.dev/Llewellyn/WEBD-325-45>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace Joomla\FrameworkWebsite\View\Package;
+namespace Octoleo\CMS\View\Admin;
 
-use Joomla\FrameworkWebsite\Helper;
-use Joomla\FrameworkWebsite\Model\PackageModel;
-use Joomla\FrameworkWebsite\Model\ReleaseModel;
+use Octoleo\CMS\Model\DashboardModel;
 use Joomla\Renderer\RendererInterface;
 use Joomla\View\HtmlView;
 
 /**
- * Package HTML view class for the application
+ * Dashboard HTML view class for the application
  */
-class PackageHtmlView extends HtmlView
+class DashboardHtmlView extends HtmlView
 {
 	/**
-	 * Helper object
+	 * The id of item/user/menu
 	 *
-	 * @var  Helper
+	 * @var int
 	 */
-	private $helper;
+	private $id;
 
 	/**
-	 * The active package
+	 * The page model object.
 	 *
-	 * @var  string
+	 * @var  DashboardModel
 	 */
-	private $package = '';
-
-	/**
-	 * The package model object.
-	 *
-	 * @var  PackageModel
-	 */
-	private $packageModel;
-
-	/**
-	 * The release model object.
-	 *
-	 * @var  ReleaseModel
-	 */
-	private $releaseModel;
+	private $dashboardModel;
 
 	/**
 	 * Instantiate the view.
 	 *
-	 * @param   PackageModel       $packageModel     The package model object.
-	 * @param   ReleaseModel       $releaseModel     The release model object.
-	 * @param   Helper             $helper           Helper object.
+	 * @param   DashboardModel     $dashboardModel   The page model object.
 	 * @param   RendererInterface  $renderer         The renderer object.
 	 */
-	public function __construct(PackageModel $packageModel, ReleaseModel $releaseModel, Helper $helper, RendererInterface $renderer)
+	public function __construct(DashboardModel $dashboardModel, RendererInterface $renderer)
 	{
 		parent::__construct($renderer);
 
-		$this->helper       = $helper;
-		$this->packageModel = $packageModel;
-		$this->releaseModel = $releaseModel;
+		$this->dashboardModel = $dashboardModel;
 	}
 
 	/**
@@ -71,27 +53,31 @@ class PackageHtmlView extends HtmlView
 	 */
 	public function render()
 	{
-		$package = $this->packageModel->getPackage($this->package);
-
-		$this->setData(
-			[
-				'releases' => $this->releaseModel->getPackageHistory($package),
-				'package'  => $package,
-			]
-		);
-
+		$this->setData(['page' => $this->id]);
 		return parent::render();
 	}
 
 	/**
-	 * Set the active package
+	 * Set the active dashboard
 	 *
-	 * @param   string  $package  The active package name
+	 * @param   string  $name  The active page name
 	 *
 	 * @return  void
 	 */
-	public function setPackage(string $package): void
+	public function setActiveDashboard(string $name): void
 	{
-		$this->package = $package;
+		$this->setLayout($this->dashboardModel->getDashboard($name));
+	}
+
+	/**
+	 * Set the active page details
+	 *
+	 * @param   int  $id  The selected item/user/menu
+	 *
+	 * @return  void
+	 */
+	public function setActiveId(int $id): void
+	{
+		$this->id = $id;
 	}
 }

week-03/project/libraries/src/View/Page/PageHtmlView.php

@@ -1,67 +1,56 @@
 <?php
 /**
- * Joomla! Framework Website
+ * @package    Octoleo CMS
  *
- * @copyright  Copyright (C) 2014 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license    http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License Version 2 or Later
+ * @created    9th April 2022
+ * @author     Llewellyn van der Merwe <https://git.vdm.dev/Llewellyn>
+ * @git        WEBD-325-45 <https://git.vdm.dev/Llewellyn/WEBD-325-45>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace Joomla\FrameworkWebsite\View\Package;
+namespace Octoleo\CMS\View\Page;
 
-use Joomla\FrameworkWebsite\Helper;
-use Joomla\FrameworkWebsite\Model\PackageModel;
-use Joomla\FrameworkWebsite\Model\ReleaseModel;
+use Octoleo\CMS\Model\PageModel;
 use Joomla\Renderer\RendererInterface;
 use Joomla\View\HtmlView;
 
 /**
- * Package HTML view class for the application
+ * Page HTML view class for the application
  */
-class PackageHtmlView extends HtmlView
+class PageHtmlView extends HtmlView
 {
 	/**
-	 * Helper object
-	 *
-	 * @var  Helper
-	 */
-	private $helper;
-
-	/**
-	 * The active package
+	 * The active page
 	 *
 	 * @var  string
 	 */
-	private $package = '';
+	private $page = '';
 
 	/**
-	 * The package model object.
+	 * The active page details
 	 *
-	 * @var  PackageModel
+	 * @var string
 	 */
-	private $packageModel;
+	private $details;
 
 	/**
-	 * The release model object.
+	 * The page model object.
 	 *
-	 * @var  ReleaseModel
+	 * @var  PageModel
 	 */
-	private $releaseModel;
+	private $pageModel;
 
 	/**
 	 * Instantiate the view.
 	 *
-	 * @param   PackageModel       $packageModel     The package model object.
-	 * @param   ReleaseModel       $releaseModel     The release model object.
-	 * @param   Helper             $helper           Helper object.
+	 * @param   PageModel          $pageModel     The page model object.
 	 * @param   RendererInterface  $renderer         The renderer object.
 	 */
-	public function __construct(PackageModel $packageModel, ReleaseModel $releaseModel, Helper $helper, RendererInterface $renderer)
+	public function __construct(PageModel $pageModel, RendererInterface $renderer)
 	{
 		parent::__construct($renderer);
 
-		$this->helper       = $helper;
-		$this->packageModel = $packageModel;
-		$this->releaseModel = $releaseModel;
+		$this->pageModel = $pageModel;
 	}
 
 	/**
@@ -71,12 +60,10 @@ class PackageHtmlView extends HtmlView
 	 */
 	public function render()
 	{
-		$package = $this->packageModel->getPackage($this->package);
-
 		$this->setData(
 			[
-				'releases' => $this->releaseModel->getPackageHistory($package),
-				'package'  => $package,
+				'page' => $this->pageModel->getPage($this->page),
+				'details' => $this->pageModel->getDetails($this->details)
 			]
 		);
 
@@ -84,14 +71,26 @@ class PackageHtmlView extends HtmlView
 	}
 
 	/**
-	 * Set the active package
+	 * Set the active page
 	 *
-	 * @param   string  $package  The active package name
+	 * @param   string  $page  The active page name
 	 *
 	 * @return  void
 	 */
-	public function setPackage(string $package): void
+	public function setPage(string $page): void
 	{
-		$this->package = $package;
+		$this->page = $page;
+	}
+
+	/**
+	 * Set the active page details
+	 *
+	 * @param   string  $page  The active page name
+	 *
+	 * @return  void
+	 */
+	public function setDetails(string $details): void
+	{
+		$this->details = $details;
 	}
 }

week-03/project/logs/index.html

@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>

week-03/project/octoconfig.php.example

@@ -0,0 +1,95 @@
+<?php
+/**
+ * @package    Octoleo CMS
+ *
+ * @created    9th April 2022
+ * @author     Llewellyn van der Merwe <https://git.vdm.dev/Llewellyn>
+ * @git        WEBD-325-45 <https://git.vdm.dev/Llewellyn/WEBD-325-45>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ * -------------------------------------------------------------------------
+ * THIS SHOULD ONLY BE USED AS A LAST RESORT WHEN THE WEB INSTALLER FAILS
+ *
+ * If you are installing Octoleo! manually ie not using the web browser installer
+ * then rename this file to octoconfig.php eg
+ *
+ * UNIX -> mv octoconfig.php.example octoconfig.php
+ * Windows -> rename octoconfig.php.example octoconfig.php
+ *
+ * Now edit this file and configure the parameters for your site and
+ * database.
+ *
+ * Finally move this file to the root folder of your Octoleo installation eg
+ *
+ * UNIX -> mv octoconfig.php ../
+ * Windows -> copy octoconfig.php ../
+ *
+ * SOURCE: https://github.com/joomla/joomla-cms/blob/4.1-dev/installation/configuration.php-dist
+ *
+ */
+class LConfig
+{
+	public $sitename = 'Octoleo!';            // Name of Octoleo site
+
+	/* Database Settings */
+	public $dbtype = 'mysqli';               // Normally mysqli
+	public $host = 'localhost';              // This is normally set to localhost
+	public $user = '';                       // Database username
+	public $password = '';                   // Database password
+	public $db = '';                         // Database name
+	public $dbprefix = 'llewellyn_';         // LEAVE THIS UNCHANGED FOR NOW
+	public $dbencryption = 0;
+	public $dbsslverifyservercert = false;
+	public $dbsslkey = '';
+	public $dbsslcert = '';
+	public $dbsslca = '';
+	public $dbsslcipher = '';
+
+	/* Server Settings */
+	public $secret = 'EiT9pmiqMycmQ6xx';     // Use something very secure. For example on linux the following command `cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w ${1:-16} | head -n 1`
+	public $helpurl = 'https://help.octoleo.org/proxy?keyref=Help{major}{minor}:{keyref}&lang={langcode}';
+	public $tmp_path = '/tmp';                // This path needs to be writable by Octoleo!
+
+	/* Locale Settings */
+	public $offset = 'UTC';
+
+	/* Session settings */
+	public $lifetime = 15;                    // Session time
+	public $session_handler = 'database';
+	public $session_filesystem_path = '';
+	public $session_memcached_server_host = 'localhost';
+	public $session_memcached_server_port = 11211;
+	public $session_metadata = true;
+	public $session_redis_persist = 1;
+	public $session_redis_server_auth = '';
+	public $session_redis_server_db = 0;
+	public $session_redis_server_host = 'localhost';
+	public $session_redis_server_port = 6379;
+
+	/* Mail Settings */
+	public $mailonline  = true;
+	public $mailer      = 'mail';
+	public $mailfrom    = '';
+	public $fromname    = '';
+	public $massmailoff = false;
+	public $replyto     = '';
+	public $replytoname = '';
+	public $sendmail    = '/usr/sbin/sendmail';
+	public $smtpauth    = false;
+	public $smtpuser    = '';
+	public $smtppass    = '';
+	public $smtphost    = 'localhost';
+	public $smtpsecure  = 'none';
+	public $smtpport    = 25;
+
+	/* Meta Settings */
+	public $MetaDesc = 'Octoleo! - the dynamic portal engine and content management system';
+	public $MetaAuthor = true;
+	public $MetaVersion = false;
+	public $MetaRights = '';
+	public $robots = '';
+	public $sitename_pagetitles = 0;
+
+	/* Cookie Settings */
+	public $cookie_domain = '';
+	public $cookie_path = '';
+}

week-03/project/templates/admin/dashboard.twig

@@ -0,0 +1,20 @@
+{% extends "index.twig" %}
+
+{% block title %}Octoleo Dashboard{% endblock %}
+
+{% block content %}
+<div class="uk-container uk-margin">
+    <h1 class="uk-article-title">Octoleo CMS Dashboard</h1>
+    <div class="uk-grid-small uk-child-width-expand@s uk-text-center" uk-grid>
+        <div>
+            <div class="uk-card uk-card-default uk-card-body"><a href="{{ url() }}index.php?dashboard=users">Users</a></div>
+        </div>
+        <div>
+            <div class="uk-card uk-card-default uk-card-body"><a href="{{ url() }}index.php?dashboard=menus">Menus</a></div>
+        </div>
+        <div>
+            <div class="uk-card uk-card-default uk-card-body"><a href="{{ url() }}index.php?dashboard=items">Items</a></div>
+        </div>
+    </div>
+</div>
+{% endblock %}

week-03/project/templates/admin/edit.twig

@@ -0,0 +1,37 @@
+{% extends "index.twig" %}
+
+{% block title %}Edit{% endblock %}
+
+{% block content %}
+<div class="uk-container">
+    <form>
+        <fieldset class="uk-fieldset">
+            <legend class="uk-legend">Legend</legend>
+            <div class="uk-margin">
+                <input class="uk-input" type="text" placeholder="Input">
+            </div>
+            <div class="uk-margin">
+                <select class="uk-select">
+                    <option>Option 01</option>
+                    <option>Option 02</option>
+                </select>
+            </div>
+            <div class="uk-margin">
+                <textarea class="uk-textarea" rows="5" placeholder="Textarea"></textarea>
+            </div>
+            <div class="uk-margin uk-grid-small uk-child-width-auto uk-grid">
+                <label><input class="uk-radio" type="radio" name="radio2" checked> A</label>
+                <label><input class="uk-radio" type="radio" name="radio2"> B</label>
+            </div>
+            <div class="uk-margin uk-grid-small uk-child-width-auto uk-grid">
+                <label><input class="uk-checkbox" type="checkbox" checked> A</label>
+                <label><input class="uk-checkbox" type="checkbox"> B</label>
+            </div>
+            <div class="uk-margin">
+                <input class="uk-range" type="range" value="2" min="0" max="10" step="0.1">
+            </div>
+        </fieldset>
+    </form>
+</div>
+<!-- Source: https://getuikit.com/docs/form -->
+{% endblock %}

week-03/project/templates/admin/exception.twig

@@ -0,0 +1,29 @@
+{% extends 'index.twig' %}
+
+{% block bodyNavigation %}{% endblock %}
+
+{% block title %}Octoleo Error{% endblock %}
+
+{% block content %}
+    <div class="uk-container uk-margin">
+        {% if exception.code in [404, 405] %}
+            <h2>We Couldn't Find It</h2>
+            <p class="lead">Sorry, we couldn't find the page matching your request. Try using the navigation to find what you were looking for?</p>
+        {% else %}
+            <h2>Ouch, That's an Error</h2>
+            <p class="lead">Well this is embarrassing, seems there was an error processing this request. Perhaps try again? Or <a href="https://github.com/octoleo/crm/issues/new?title=[FW Site]&body=Please state the nature of your development emergency">file an issue</a> so we can address it.</p>
+        {% endif %}
+
+        {% if appDebug %}
+            <h3><span class="badge badge-danger">{{ exception.code|default(0) }}</span> {{ exception|get_class }}</h3>
+            <p>{{ exception.message|strip_root_path }}</p>
+
+            {% if exception.previous %}
+                {% set _previous = exception.previous %}
+                <h3>Previous Exception</h3>
+                <h4><span class="badge badge-danger">{{ exception.code|default(0) }}</span> {{ exception|get_class }}</h4>
+                <p>{{ exception.message|strip_root_path }}</p>
+            {% endif %}
+        {% endif %}
+    </div>
+{% endblock %}

week-03/project/templates/admin/footer.twig

@@ -0,0 +1,9 @@
+{% macro load_footer() %}
+<div class="uk-section uk-section-primary">
+    <div class="uk-container uk-container-small">
+        <div class="uk-text-center uk-card-body">
+            <small>Copyright © Generic Company. All Rights Reserved. | Octoleo CMS</small>
+        </div>
+    </div>
+</div>
+{% endmacro %}

week-03/project/templates/admin/header.twig

@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="en" dir="ltr">
+<head>
+    <!-- For Responsive -->
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <!--[if lt IE 9]>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.js"></script>
+    <![endif]-->
+    <!-- UIkit CSS -->
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/uikit@3.13.7/dist/css/uikit.min.css" />
+    <!-- UIkit JS -->
+    <script src="https://cdn.jsdelivr.net/npm/uikit@3.13.7/dist/js/uikit.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/uikit@3.13.7/dist/js/uikit-icons.min.js"></script>
+    <!-- End for Responsive -->
+
+    <!-- For SEO -->
+    <title>{% block title %}Octoleo! Framework, a framework for developing PHP applications{% endblock %}</title>
+    <meta charset="utf-8">
+    <meta name="description" content="{% block metaDescription %}The Octoleo! Framework provides a structurally sound foundation on which to build applications in PHP, which is easy to adapt and extend. Let's find out more!{% endblock %}">
+    <meta name="generator" content="Octoleo! Framework" />
+    <meta property="og:description" content="{{ block('metaDescription') }}" />
+    <meta property="og:locale" content="en_US" />
+    <meta property="og:site_name" content="Octoleo! Framework" />
+    <meta property="og:title" content="{{ block('title') }}" />
+    <meta property="og:type" content="{% block metaOgType %}website{% endblock %}" />
+    <meta property="og:url" content="{{ request_uri() }}" />
+    <meta name="twitter:card" content="summary" />
+    <meta name="twitter:site" content="@Octoleo" />
+    <meta name="twitter:description" content="{{ block('metaDescription') }}" />
+    <meta name="twitter:title" content="{{ block('title') }}" />
+    {% block metadata %}{% endblock %}
+    <!-- End for SEO -->
+
+    <!-- For Misc -->
+    <link href="favicon.ico" rel="shortcut icon" />
+    <!-- End for misc -->
+
+    {% block headCSS %}{% endblock %}
+    {% block headJavaScript %}{% endblock %}
+</head>
+{% block body %}{% endblock %}
+</html>

week-03/project/templates/admin/index.html

@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>

week-03/project/templates/admin/index.twig

@@ -0,0 +1,13 @@
+{% extends "header.twig" %}
+
+{% block body %}
+<body id="go">
+{% block bodyNavigation %}{% import 'nav.twig' as macros  %}{{ macros.load_admin_navbar() }}{% endblock %}
+<main>
+    {% block content %}{% endblock %}
+</main>
+{% block footerContent %}{% import 'footer.twig' as macros  %}{{ macros.load_footer() }}{% endblock %}
+{% block bodyJavaScript %}{% endblock %}
+{{ url }}
+</body>
+{% endblock %}

week-03/project/templates/admin/items.twig

@@ -0,0 +1,52 @@
+{% extends "index.twig" %}
+
+{% block title %}Items{% endblock %}
+
+{% block content %}
+<div class="uk-container uk-margin">
+    <h1 class="uk-article-title">Items</h1>
+    <a class="uk-button uk-button-default" href="{{ url() }}index.php?dashboard=item">Create</a>
+    <table class="uk-table uk-table-justify uk-table-divider">
+        <thead>
+        <tr>
+            <th class="uk-width-small">Table Heading</th>
+            <th>Table Heading</th>
+            <th>Table Heading</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr>
+            <td>Table Data</td>
+            <td>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</td>
+            <td><a class="uk-button uk-button-default" href="{{ url() }}index.php?dashboard=item&id=1">Edit</a></td>
+        </tr>
+        <tr>
+            <td>Table Data</td>
+            <td>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</td>
+            <td><a class="uk-button uk-button-default" href="{{ url() }}index.php?dashboard=item&id=2">Edit</a></td>
+        </tr>
+        <tr>
+            <td>Table Data</td>
+            <td>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</td>
+            <td><a class="uk-button uk-button-default" href="{{ url() }}index.php?dashboard=item&id=3">Edit</a></td>
+        </tr>
+        <tr>
+            <td>Table Data</td>
+            <td>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</td>
+            <td><a class="uk-button uk-button-default" href="{{ url() }}index.php?dashboard=item&id=4">Edit</a></td>
+        </tr>
+        <tr>
+            <td>Table Data</td>
+            <td>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</td>
+            <td><a class="uk-button uk-button-default" href="{{ url() }}index.php?dashboard=item&id=5">Edit</a></td>
+        </tr>
+        <tr>
+            <td>Table Data</td>
+            <td>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</td>
+            <td><a class="uk-button uk-button-default" href="{{ url() }}index.php?dashboard=item&id=6">Edit</a></td>
+        </tr>
+        </tbody>
+    </table>
+</div>
+<!-- Source: https://getuikit.com/docs/table -->
+{% endblock %}

week-03/project/templates/admin/login.twig

@@ -0,0 +1,18 @@
+{% extends "index.twig" %}
+
+{% block bodyNavigation %}{% endblock %}
+
+{% block content %}
+<div class="uk-height-1-1 uk-background-cover uk-overflow-hidden uk-flex"
+     style="background-color: #fff; background-image: url('https://source.unsplash.com/random/1920x800/?yachts'); min-height: 500px; height: 100%">
+    <div class="uk-width-1-2@m uk-text-center uk-margin-auto uk-margin-auto-vertical uk-overlay uk-overlay-default">
+        <h1>Login Here</h1>
+        <form action="{{ url() }}index.php?dashboard=access" method="post">
+            <input name="username" class="uk-input uk-width-1-2" type="text" placeholder="Username">
+            <input name="password" class="uk-input uk-width-1-2" type="password" placeholder="*************">
+            <input type="submit" class="uk-button uk-button-primary uk-width-1-2" value="Login"/>
+            <a class="uk-button uk-width-1-2" href="{{ url() }}?account=signup">Create Account</a>
+        </form>
+    </div>
+</div>
+{% endblock %}

week-03/project/templates/admin/menus.twig

@@ -0,0 +1,50 @@
+{% extends "index.twig" %}
+
+{% block content %}
+    <div class="uk-container uk-margin">
+        <h1 class="uk-article-title">Menus</h1>
+        <a class="uk-button uk-button-default" href="{{ url() }}index.php?dashboard=menu">Create</a>
+        <table class="uk-table uk-table-justify uk-table-divider">
+            <thead>
+            <tr>
+                <th class="uk-width-small">Table Heading</th>
+                <th>Table Heading</th>
+                <th>Table Heading</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>Table Data</td>
+                <td>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</td>
+                <td><a class="uk-button uk-button-default" href="{{ url() }}index.php?dashboard=menu&id=1">Edit</a></td>
+            </tr>
+            <tr>
+                <td>Table Data</td>
+                <td>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</td>
+                <td><a class="uk-button uk-button-default" href="{{ url() }}index.php?dashboard=menu&id=2">Edit</a></td>
+            </tr>
+            <tr>
+                <td>Table Data</td>
+                <td>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</td>
+                <td><a class="uk-button uk-button-default" href="{{ url() }}index.php?dashboard=menu&id=3">Edit</a></td>
+            </tr>
+            <tr>
+                <td>Table Data</td>
+                <td>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</td>
+                <td><a class="uk-button uk-button-default" href="{{ url() }}index.php?dashboard=menu&id=4">Edit</a></td>
+            </tr>
+            <tr>
+                <td>Table Data</td>
+                <td>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</td>
+                <td><a class="uk-button uk-button-default" href="{{ url() }}index.php?dashboard=menu&id=5">Edit</a></td>
+            </tr>
+            <tr>
+                <td>Table Data</td>
+                <td>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</td>
+                <td><a class="uk-button uk-button-default" href="{{ url() }}index.php?dashboard=menu&id=6">Edit</a></td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
+    <!-- Source: https://getuikit.com/docs/table -->
+{% endblock %}

week-03/project/templates/admin/nav.twig

@@ -0,0 +1,19 @@
+{% macro load_admin_navbar() %}
+<nav class="uk-navbar-container" uk-navbar>
+    <div class="uk-navbar-left">
+        <ul class="uk-navbar-nav">
+            <li><a href="{{ url() }}index.php?dashboard">Dashboard</a></li>
+            <li><a href="{{ url() }}index.php?dashboard=users">Users</a></li>
+            <li><a href="{{ url() }}index.php?dashboard=menus">Menus</a></li>
+            <li><a href="{{ url() }}index.php?dashboard=items">Items</a></li>
+        </ul>
+    </div>
+    <div class="uk-navbar-right">
+        <ul class="uk-navbar-nav">
+            <li class="uk-active"><a href="{{ url() }}index.php?dashboard=logout">Logout</a></li>
+            <li class="uk-active"><a href="/">Site</a></li>
+        </ul>
+    </div>
+</nav>
+{% endmacro %}
+<!-- Source: https://getuikit.com/docs/navbar -->

week-03/project/templates/admin/signup.twig

@@ -0,0 +1,21 @@
+{% extends "index.twig" %}
+
+{% block bodyNavigation %}{% endblock %}
+
+{% block content %}
+<div class="uk-height-1-1 uk-background-cover uk-overflow-hidden uk-flex"
+     style="min-height: 500px; height: 100%">
+    <div class="uk-width-1-2@m uk-text-center uk-margin-auto uk-margin-auto-vertical uk-overlay uk-overlay-default">
+        <h1>Create Account</h1>
+        <form action="{{ url() }}index.php?dashboard=signup" method="post">
+            <input name="name" class="uk-input uk-width-1-2" type="text" placeholder="Name">
+            <input name="username" class="uk-input uk-width-1-2" type="text" placeholder="Username">
+            <input name="email" class="uk-input uk-width-1-2" type="text" placeholder="Email">
+            <input name="password" class="uk-input uk-width-1-2" type="password" placeholder="password">
+            <input name="password2" class="uk-input uk-width-1-2" type="password" placeholder="confirm password">
+            <input type="submit" class="uk-button uk-button-primary uk-width-1-2" value="Create Account"/>
+            <a class="uk-button uk-width-1-2" href="{{ url() }}">Login</a>
+        </form>
+    </div>
+</div>
+{% endblock %}

week-03/project/templates/admin/users.twig

@@ -0,0 +1,32 @@
+{% extends "index.twig" %}
+
+{% block title %}Users{% endblock %}
+
+{% block content %}
+<div class="uk-container uk-margin">
+    <h1 class="uk-article-title">Users</h1>
+    <a class="uk-button uk-button-default" href="{{ url() }}index.php?dashboard=user">Create</a>
+    <table class="uk-table uk-table-justify uk-table-divider">
+        <thead>
+        <tr>
+            <th class="uk-width-small">Table Heading</th>
+            <th>Table Heading</th>
+            <th>Table Heading</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr>
+            <td>Table Data</td>
+            <td>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</td>
+            <td><a class="uk-button uk-button-default" href="{{ url() }}index.php?dashboard=user&id=1">Edit</a></td>
+        </tr>
+        <tr>
+            <td>Table Data</td>
+            <td>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</td>
+            <td><a class="uk-button uk-button-default" href="{{ url() }}index.php?dashboard=user&id=2">Edit</a></td>
+        </tr>
+        </tbody>
+    </table>
+</div>
+<!-- Source: https://getuikit.com/docs/table -->
+{% endblock %}

week-03/project/templates/index.html

@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>

week-03/project/templates/site/exception.twig

@@ -0,0 +1,27 @@
+{% extends 'index.twig' %}
+
+{% block title %}Octoleo Error{% endblock %}
+
+{% block content %}
+    <div class="uk-container uk-margin">
+        {% if exception.code in [404, 405] %}
+            <h2>We Couldn't Find It</h2>
+            <p class="lead">Sorry, we couldn't find the page matching your request. Try using the navigation to find what you were looking for?</p>
+        {% else %}
+            <h2>Ouch, That's an Error</h2>
+            <p class="lead">Well this is embarrassing, seems there was an error processing this request. Perhaps try again? Or <a href="https://github.com/octoleo/crm/issues/new?title=[FW Site]&body=Please state the nature of your development emergency">file an issue</a> so we can address it.</p>
+        {% endif %}
+
+        {% if appDebug %}
+            <h3><span class="badge badge-danger">{{ exception.code|default(0) }}</span> {{ exception|get_class }}</h3>
+            <p>{{ exception.message|strip_root_path }}</p>
+
+            {% if exception.previous %}
+                {% set _previous = exception.previous %}
+                <h3>Previous Exception</h3>
+                <h4><span class="badge badge-danger">{{ exception.code|default(0) }}</span> {{ exception|get_class }}</h4>
+                <p>{{ exception.message|strip_root_path }}</p>
+            {% endif %}
+        {% endif %}
+    </div>
+{% endblock %}

week-03/project/templates/site/footer.twig

@@ -0,0 +1,9 @@
+{% macro load_footer() %}
+<div class="uk-section uk-section-primary">
+    <div class="uk-container uk-container-small">
+        <div class="uk-text-center uk-card-body">
+            <small>Copyright © Generic Company. All Rights Reserved. | Octoleo CMS</small>
+        </div>
+    </div>
+</div>
+{% endmacro %}

week-03/project/templates/site/header.twig

@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="en" dir="ltr">
+<head>
+    <!-- For Responsive -->
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <!--[if lt IE 9]>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.js"></script>
+    <![endif]-->
+    <!-- UIkit CSS -->
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/uikit@3.13.7/dist/css/uikit.min.css" />
+    <!-- UIkit JS -->
+    <script src="https://cdn.jsdelivr.net/npm/uikit@3.13.7/dist/js/uikit.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/uikit@3.13.7/dist/js/uikit-icons.min.js"></script>
+    <!-- End for Responsive -->
+
+    <!-- For SEO -->
+    <title>{% block title %}Octoleo! Framework, a framework for developing PHP applications{% endblock %}</title>
+    <meta charset="utf-8">
+    <meta name="description" content="{% block metaDescription %}The Octoleo! Framework provides a structurally sound foundation on which to build applications in PHP, which is easy to adapt and extend. Let's find out more!{% endblock %}">
+    <meta name="generator" content="Octoleo! Framework" />
+    <meta property="og:description" content="{{ block('metaDescription') }}" />
+    <meta property="og:locale" content="en_US" />
+    <meta property="og:site_name" content="Octoleo! Framework" />
+    <meta property="og:title" content="{{ block('title') }}" />
+    <meta property="og:type" content="{% block metaOgType %}website{% endblock %}" />
+    <meta property="og:url" content="{{ request_uri() }}" />
+    <meta name="twitter:card" content="summary" />
+    <meta name="twitter:site" content="@Octoleo" />
+    <meta name="twitter:description" content="{{ block('metaDescription') }}" />
+    <meta name="twitter:title" content="{{ block('title') }}" />
+    {% block metadata %}{% endblock %}
+    <!-- End for SEO -->
+
+    <!-- For Misc -->
+    <link href="favicon.ico" rel="shortcut icon" />
+    <!-- End for misc -->
+
+    {% block headCSS %}{% endblock %}
+    {% block headJavaScript %}{% endblock %}
+</head>
+{% block body %}{% endblock %}
+</html>

week-03/project/templates/site/homepage.twig

@@ -0,0 +1,10 @@
+{% extends "index.twig" %}
+
+{% block content %}
+    <div class="uk-margin-remove-top uk-height-large uk-background-cover uk-overflow-hidden uk-flex" style="background-image: url('https://source.unsplash.com/random/1920x500/?yachts');">
+        <div class="uk-width-1-2@m uk-text-center uk-margin-auto uk-margin-auto-vertical uk-overlay uk-overlay-default">
+            <h1>Welcome</h1>
+            <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+        </div>
+    </div>
+{% endblock %}

week-03/project/templates/site/index.html

@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>

week-03/project/templates/site/index.twig

@@ -0,0 +1,12 @@
+{% extends "header.twig" %}
+
+{% block body %}
+<body id="go">
+{% block bodyNavigation %}{% import 'nav.twig' as macros  %}{{ macros.load_site_navbar() }}{% endblock %}
+<main>
+    {% block content %}{% endblock %}
+</main>
+{% block footerContent %}{% import 'footer.twig' as macros  %}{{ macros.load_footer() }}{% endblock %}
+{% block bodyJavaScript %}{% endblock %}
+</body>
+{% endblock %}

week-03/project/templates/site/nav.twig

@@ -0,0 +1,28 @@
+{% macro load_site_navbar() %}
+<nav class="uk-navbar-container" uk-navbar>
+    <div class="uk-navbar-center">
+        <ul class="uk-navbar-nav">
+            <li class="uk-active"><a href="{{ url() }}">Home</a></li>
+            <li>
+                <a href="{{ url() }}products">Products</a>
+                <div class="uk-navbar-dropdown">
+                    <ul class="uk-nav uk-navbar-dropdown-nav">
+                        <li class="uk-active"><a href="{{ url() }}products/yachts">Yachts</a></li>
+                        <li><a href="{{ url() }}products/ski-boats">Ski Boats</a></li>
+                        <li><a href="{{ url() }}products/drones">Drones</a></li>
+                    </ul>
+                </div>
+            </li>
+            <li><a href="{{ url() }}blog">Blog</a></li>
+            <li><a href="{{ url() }}about-us">About Us</a></li>
+        </ul>
+    </div>
+    <div class="uk-navbar-right">
+        <ul class="uk-navbar-nav">
+            <li><a href="{{ url() }}location">Location</a></li>
+            <li><a href="{{ url() }}contact-us">Contact Us</a></li>
+        </ul>
+    </div>
+</nav>
+{% endmacro %}
+<!-- Source: https://getuikit.com/docs/navbar -->

week-03/project/templates/site/page.twig

@@ -0,0 +1,14 @@
+{% extends "index.twig" %}
+
+{% block content %}
+    <div class="uk-margin-remove-top uk-height-large uk-background-cover uk-overflow-hidden uk-flex" style="background-image: url('https://source.unsplash.com/random/1920x500/?yachts');">
+        <div class="uk-width-1-2@m uk-text-center uk-margin-auto uk-margin-auto-vertical uk-overlay uk-overlay-default">
+            <h1>{{ page }}</h1>
+            {% if details == '' %}
+            <p>YOU ARE IN PAGES</p>
+            {% else %}
+            <p>You are into {{ details }}</p>
+            {% endif %}
+        </div>
+    </div>
+{% endblock %}

week-03/project/templates/system/build_incomplete.html

@@ -0,0 +1,34 @@
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="Content-Language" content="en-GB">
+  <meta name="robots" content="noindex, nofollow">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Octoleo: Environment Setup Incomplete</title><!-- Sets the page title, IMPORTANT DO NOT REMOVE -->
+  <style>html{background:#ee2a00;background:radial-gradient(ellipse at center,#f1f1f1 0,#ee2a00 100%);background-attachment:fixed;background-repeat:no-repeat}body{background-color:transparent;color:#555;font:14px/18px sans-serif}body,ol,ul{margin:0;padding:0}ol,ul{list-style:none}a{color:#0084b4;text-decoration:none}a:focus,a:hover{text-decoration:underline}p a{line-height:inherit}.container{align-items:center;display:flex;flex-direction:column;height:100vh;justify-content:center;margin:0 auto;overflow:hidden;position:relative;width:100%}.alert-main{background:#fff;border:1px solid rgba(0,0,0,.1);border-radius:5px;box-shadow:0 0 10px rgba(0,0,0,.05);display:block;margin:0 20px;padding:20px 60px;position:relative}svg{bottom:-120px;position:absolute;right:-70px;-webkit-transform:rotate(10deg);transform:rotate(10deg);width:400px;z-index:-1}h1,p{text-rendering:optimizeLegibility;position:relative;text-align:center;z-index:10}h1{font-size:40px;font-weight:200;line-height:1;margin:18px 0 0;text-shadow:0 1px 2px rgba(0,0,0,.2)}label,p{color:#777;font-size:18px;font-weight:300;line-height:25px;margin:10px 0 20px}p a{color:#1c3d5c;font-weight:700}.link-help{background-color:#f5f5f5;border:1px solid rgba(0,0,0,.1);border-radius:.25rem;font-size:1rem;font-weight:400;padding:.4rem .85rem;text-decoration:none}.link-help:hover{background-color:#eee;text-decoration:none}.footer{font-size:11px;margin:8px 20px;text-align:left}.footer ul{margin-bottom:5px}.footer li{display:inline;line-height:20px;margin:0 5px}.footer a,.footer li{color:#1c3d5c}.footer a:hover{color:#59b0ff}.links{display:block;font-size:1rem;margin-left:auto;margin-right:auto;margin-top:4rem;text-align:center}.links li{display:inline-block;margin-top:20px}@media screen and (max-width:480px){.container{height:auto;padding-bottom:20px;padding-top:20px}h1{font-size:30px}.link-help{white-space:nowrap}}</style><!-- Sets the page styling, IMPORTANT DO NOT REMOVE -->
+ </head>
+<body>
+<div class="container">
+  <div class="container-main">
+    <div class="alert-main">
+      <h1 id="headerText">Environment Setup Incomplete</h1>
+      <p><span id="descText1">It looks like you are trying to run Octoleo! from our git repository. To do so requires you complete a couple of extra steps first.</span></p>
+      <p style="text-align: left;">
+        0. Make sure you have <a href="https://getcomposer.org/doc/00-intro.md#installation-linux-unix-macos">composer</a> installed on your system.
+        <br />
+        1. In your terminal go to the root folder of your Octoleo website where you will find the <u>composer.json</u> file.
+        <br />
+        2. Run the following command <code>composer install</code> to install all PHP packages.
+      </p>
+    </div>
+    <div class="footer">
+      <ul class="links">
+        <li><a href="https://www.octoleo.org/">Octoleo</a></li> -
+        <li><a href="https://git.vdm.dev/octoleo/">Help</a></li>
+      </ul>
+    </div>
+  </div>
+</div>
+<!-- source: https://github.com/joomla/joomla-cms/blob/4.1-dev/templates/system/build_incomplete.html -->
+</body>
+</html>

week-03/project/templates/system/incompatible.html

@@ -0,0 +1,27 @@
+<html>
+<head>
+	<meta charset="utf-8">
+	<meta http-equiv="Content-Language" content="en-GB">
+	<meta name="robots" content="noindex, nofollow">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<title>Octoleo: unsupported PHP version</title><!-- Sets the page title, IMPORTANT DO NOT REMOVE -->
+	<style>html{background:#ee2a00;background:radial-gradient(ellipse at center,#f1f1f1 0,#ee2a00 100%);background-attachment:fixed;background-repeat:no-repeat}body{background-color:transparent;color:#555;font:14px/18px sans-serif}body,ol,ul{margin:0;padding:0}ol,ul{list-style:none}a{color:#0084b4;text-decoration:none}a:focus,a:hover{text-decoration:underline}p a{line-height:inherit}.container{align-items:center;display:flex;flex-direction:column;height:100vh;justify-content:center;margin:0 auto;overflow:hidden;position:relative;width:100%}.alert-main{background:#fff;border:1px solid rgba(0,0,0,.1);border-radius:5px;box-shadow:0 0 10px rgba(0,0,0,.05);display:block;margin:0 20px;padding:20px 60px;position:relative}svg{bottom:-120px;position:absolute;right:-70px;-webkit-transform:rotate(10deg);transform:rotate(10deg);width:400px;z-index:-1}h1,p{text-rendering:optimizeLegibility;position:relative;text-align:center;z-index:10}h1{font-size:40px;font-weight:200;line-height:1;margin:18px 0 0;text-shadow:0 1px 2px rgba(0,0,0,.2)}label,p{color:#777;font-size:18px;font-weight:300;line-height:25px;margin:10px 0 20px}p a{color:#1c3d5c;font-weight:700}.link-help{background-color:#f5f5f5;border:1px solid rgba(0,0,0,.1);border-radius:.25rem;font-size:1rem;font-weight:400;padding:.4rem .85rem;text-decoration:none}.link-help:hover{background-color:#eee;text-decoration:none}.footer{font-size:11px;margin:8px 20px;text-align:left}.footer ul{margin-bottom:5px}.footer li{display:inline;line-height:20px;margin:0 5px}.footer a,.footer li{color:#1c3d5c}.footer a:hover{color:#59b0ff}.links{display:block;font-size:1rem;margin-left:auto;margin-right:auto;margin-top:4rem;text-align:center}.links li{display:inline-block;margin-top:20px}@media screen and (max-width:480px){.container{height:auto;padding-bottom:20px;padding-top:20px}h1{font-size:30px}.link-help{white-space:nowrap}}</style><!-- Sets the page styling, IMPORTANT DO NOT REMOVE -->
+</head>
+<body>
+<div class="container">
+	<div class="container-main">
+		<div class="alert-main">
+			<h1 id="headerText">Sorry, your PHP version is not supported</h1>
+			<p><span id="descText1">Your host needs to use PHP version {{phpversion}} or newer to run this version of Octoleo!</span></p>
+		</div>
+		<div class="footer">
+			<ul class="links">
+				<li><a href="https://www.octoleo.org/">Octoleo</a></li> -
+				<li><a href="https://git.vdm.dev/octoleo/">Help</a></li>
+			</ul>
+		</div>
+	</div>
+</div>
+<!-- source: https://github.com/joomla/joomla-cms/blob/4.1-dev/templates/system/incompatible.html -->
+</body>
+</html>

week-03/project/templates/system/index.html

@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>

week-03/project/templates/system/install_notice.html

@@ -0,0 +1,36 @@
+<html>
+<head>
+	<meta charset="utf-8">
+	<meta http-equiv="Content-Language" content="en-GB">
+	<meta name="robots" content="noindex, nofollow">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<title>Octoleo: Installation Instructions</title><!-- Sets the page title, IMPORTANT DO NOT REMOVE -->
+	<style>html{background:#ee2a00;background:radial-gradient(ellipse at center,#f1f1f1 0,#ee2a00 100%);background-attachment:fixed;background-repeat:no-repeat}body{background-color:transparent;color:#555;font:14px/18px sans-serif}body,ol,ul{margin:0;padding:0}ol,ul{list-style:none}a{color:#0084b4;text-decoration:none}a:focus,a:hover{text-decoration:underline}p a{line-height:inherit}.container{align-items:center;display:flex;flex-direction:column;height:100vh;justify-content:center;margin:0 auto;overflow:hidden;position:relative;width:100%}.alert-main{background:#fff;border:1px solid rgba(0,0,0,.1);border-radius:5px;box-shadow:0 0 10px rgba(0,0,0,.05);display:block;margin:0 20px;padding:20px 60px;position:relative}svg{bottom:-120px;position:absolute;right:-70px;-webkit-transform:rotate(10deg);transform:rotate(10deg);width:400px;z-index:-1}h1,p{text-rendering:optimizeLegibility;position:relative;text-align:center;z-index:10}h1{font-size:40px;font-weight:200;line-height:1;margin:18px 0 0;text-shadow:0 1px 2px rgba(0,0,0,.2)}label,p{color:#777;font-size:18px;font-weight:300;line-height:25px;margin:10px 0 20px}p a{color:#1c3d5c;font-weight:700}.link-help{background-color:#f5f5f5;border:1px solid rgba(0,0,0,.1);border-radius:.25rem;font-size:1rem;font-weight:400;padding:.4rem .85rem;text-decoration:none}.link-help:hover{background-color:#eee;text-decoration:none}.footer{font-size:11px;margin:8px 20px;text-align:left}.footer ul{margin-bottom:5px}.footer li{display:inline;line-height:20px;margin:0 5px}.footer a,.footer li{color:#1c3d5c}.footer a:hover{color:#59b0ff}.links{display:block;font-size:1rem;margin-left:auto;margin-right:auto;margin-top:4rem;text-align:center}.links li{display:inline-block;margin-top:20px}@media screen and (max-width:480px){.container{height:auto;padding-bottom:20px;padding-top:20px}h1{font-size:30px}.link-help{white-space:nowrap}}</style><!-- Sets the page styling, IMPORTANT DO NOT REMOVE -->
+</head>
+<body>
+<div class="container">
+	<div class="container-main">
+		<div class="alert-main">
+			<h1 id="headerText">Installation Instructions</h1>
+			<p><span id="descText1">You need to manually do the following few tasks.</span></p>
+			<p style="text-align: left;">
+				1. Import the SQL tables into your database found in <u>/sql/install.sql</u>
+				<br />
+				2. Copy the <u>/octoconfig.php.example</u> file to <u>/octoconfig.php</u>
+				<br />
+				3 .Update the <u>/octoconfig.php</u> to reflect your CMS details
+				<br />
+				4. Remove the installation folder from you root directory
+			</p>
+		</div>
+		<div class="footer">
+			<ul class="links">
+				<li><a href="https://www.octoleo.org/">Octoleo</a></li> -
+				<li><a href="https://git.vdm.dev/octoleo/">Help</a></li>
+			</ul>
+		</div>
+	</div>
+</div>
+<!-- source: https://github.com/joomla/joomla-cms/blob/4.1-dev/templates/system/incompatible.html -->
+</body>
+</html>

week-03/project/tmp/index.html

@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>