beenull/AntCMS
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Made exception rendering more flexible

Browse source
This commit is contained in:
Belle Aerni 2023-01-25 18:45:36 -08:00
parent 95ed5059f0
commit e2ca10d51d
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/AntCMS/AntAuth.php
View file

@ -3,6 +3,7 @@
namespace AntCMS;
use AntCMS\AntConfig;
use AntCMS\AntCMS;
class AntAuth
{
@ -20,7 +21,7 @@ class AntAuth
$password = $_SERVER['PHP_AUTH_PW'] ?? null;
if (empty($currentConfig['admin']['password'])) {
die("You must set a password in your config.yaml file before you can authenticate within AntCMS.");
AntCMS::renderException('401', 401, 'You must set a password in your config.yaml file before you can authenticate within AntCMS.');
}
// If the stored password is not hashed in the config, hash it
@ -48,7 +49,7 @@ class AntAuth
{
$title = AntConfig::currentConfig('siteInfo.siteTitle');
header('WWW-Authenticate: Basic realm="' . $title . '"');
header('HTTP/1.0 401 Unauthorized');
http_response_code(401);
echo 'You must enter a valid username and password to access this page';
exit;
}

18
src/AntCMS/AntCMS.php
View file

@ -53,12 +53,12 @@ class AntCMS
* @param string $currentPage optional - What page is the active page.
* @return string the default page layout
*/
public function getPageLayout(string $theme = null, string $currentPage = '')
public static function getPageLayout(string $theme = null, string $currentPage = '')
{
$siteInfo = AntCMS::getSiteInfo();
$pageTemplate = $this->getThemeTemplate('default_layout', $theme);
$pageTemplate = str_replace('<!--AntCMS-Navigation-->', AntPages::generateNavigation($this->getThemeTemplate('nav_layout', $theme), $currentPage), $pageTemplate);
$pageTemplate = self::getThemeTemplate('default_layout', $theme);
$pageTemplate = str_replace('<!--AntCMS-Navigation-->', AntPages::generateNavigation(self::getThemeTemplate('nav_layout', $theme), $currentPage), $pageTemplate);
$pageTemplate = str_replace('<!--AntCMS-SiteTitle-->', $siteInfo['siteTitle'], $pageTemplate);
@ -69,15 +69,19 @@ class AntCMS
* Render an exception page with the provided exception code.
*
* @param string $exceptionCode The exception code to be displayed on the error page
* @param int $httpCode The HTTP response code to return, 404 by default.
* @param string $exceptionString An optional parameter to define a custom string to be displayed along side the exception.
* @return never
*/
public function renderException(string $exceptionCode)
public static function renderException(string $exceptionCode, int $httpCode = 404, string $exceptionString = 'That request caused an exception to be thrown.')
{
$pageTemplate = $this->getPageLayout();
$exceptionString = $exceptionString . " (Code $exceptionCode)";
$pageTemplate = self::getPageLayout();
$pageTemplate = str_replace('<!--AntCMS-Title-->', 'An error ocurred', $pageTemplate);
$pageTemplate = str_replace('<!--AntCMS-Body-->', '<h1>An error ocurred</h1><p>That request caused an exception code (' . $exceptionCode . ')</p>', $pageTemplate);
$pageTemplate = str_replace('<!--AntCMS-Body-->', '<h1>An error ocurred</h1><p>' . $exceptionString . '</p>', $pageTemplate);
http_response_code($httpCode);
echo $pageTemplate;
exit;
}
@ -111,7 +115,7 @@ class AntCMS
* @param string|null $theme
* @return string
*/
public function getThemeTemplate(string $layout = 'default_layout', string $theme = null)
public static function getThemeTemplate(string $layout = 'default_layout', string $theme = null)
{
$theme = $theme ?? AntConfig::currentConfig('activeTheme');