From 9a1a437689350a32a253c1bed56456199b64e6a3 Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 8 Jun 2024 15:10:26 +0100 Subject: [PATCH] chore: style fixes --- 403.php | 1 - 404.php | 1 - core/classes/Templates/FakeSmarty.php | 1 - core/classes/Templates/SmartyTemplateBase.php | 2 +- core/classes/Templates/SmartyTemplateEngine.php | 6 +++--- core/classes/Templates/TemplateEngine.php | 9 ++++----- core/includes/maintenance.php | 1 - core/includes/tfa_signin.php | 1 - core/templates/backend_init.php | 1 - core/templates/cc_navbar.php | 1 - core/templates/frontend_init.php | 1 - core/templates/panel_navbar.php | 2 +- custom/panel_templates/Default/template.php | 1 - .../DefaultRevamp/template_settings/settings.php | 11 ++++------- 14 files changed, 13 insertions(+), 26 deletions(-) diff --git a/403.php b/403.php index 2d2342c0ca..3208189dc6 100644 --- a/403.php +++ b/403.php @@ -17,7 +17,6 @@ * @var User $user * @var Widgets $widgets */ - header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden'); const PAGE = 403; diff --git a/404.php b/404.php index d839ac2807..d09a4b517b 100644 --- a/404.php +++ b/404.php @@ -17,7 +17,6 @@ * @var User $user * @var Widgets $widgets */ - header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found'); const PAGE = 404; diff --git a/core/classes/Templates/FakeSmarty.php b/core/classes/Templates/FakeSmarty.php index c61d8340be..289c935476 100644 --- a/core/classes/Templates/FakeSmarty.php +++ b/core/classes/Templates/FakeSmarty.php @@ -8,7 +8,6 @@ * @version 2.2.0 * @deprecated */ - class FakeSmarty { private TemplateEngine $_engine; diff --git a/core/classes/Templates/SmartyTemplateBase.php b/core/classes/Templates/SmartyTemplateBase.php index ad7e999586..ac6071ee6a 100644 --- a/core/classes/Templates/SmartyTemplateBase.php +++ b/core/classes/Templates/SmartyTemplateBase.php @@ -15,7 +15,7 @@ abstract class SmartyTemplateBase extends TemplateBase * @param string $version * @param string $nameless_version * @param string $author - * @param bool $panelTemplate + * @param bool $panelTemplate */ public function __construct(string $name, string $version, string $nameless_version, string $author, bool $panelTemplate = false) { diff --git a/core/classes/Templates/SmartyTemplateEngine.php b/core/classes/Templates/SmartyTemplateEngine.php index 77f481d0e5..342bfbf690 100644 --- a/core/classes/Templates/SmartyTemplateEngine.php +++ b/core/classes/Templates/SmartyTemplateEngine.php @@ -6,14 +6,13 @@ * @license MIT * @version 2.2.0 */ - class SmartyTemplateEngine extends TemplateEngine { private Smarty $_smarty; /** - * @param string $template Template name to load - * @param bool $panelTemplate Whether this is a panel template or not + * @param string $template Template name to load + * @param bool $panelTemplate Whether this is a panel template or not * @throws SmartyException */ public function __construct(string $template, bool $panelTemplate = false) @@ -77,6 +76,7 @@ public function fetch(string $templateFile): string $templateFile = str_replace('.tpl', '', $templateFile); $this->_smarty->assign($this->getVariables()); + return $this->_smarty->fetch("$templateFile.tpl"); } diff --git a/core/classes/Templates/TemplateEngine.php b/core/classes/Templates/TemplateEngine.php index d0f77e5f49..efad07237f 100644 --- a/core/classes/Templates/TemplateEngine.php +++ b/core/classes/Templates/TemplateEngine.php @@ -6,7 +6,6 @@ * @license MIT * @version 2.2.0 */ - abstract class TemplateEngine { private array $_variables; @@ -22,7 +21,7 @@ public function __construct() * TODO: mixed type for $value * * @param string $key - * @param mixed $value + * @param mixed $value * @return void */ public function addVariable(string $key, $value): void @@ -67,7 +66,7 @@ public function getVariables(): array * * @param string $templateFile Path to template file to render. */ - public abstract function render(string $templateFile): void; + abstract public function render(string $templateFile): void; /** * Fetch a generated template file using the set template engine. @@ -75,10 +74,10 @@ public abstract function render(string $templateFile): void; * @param string $templateFile Path to template file to render. * @return string HTML to render */ - public abstract function fetch(string $templateFile): string; + abstract public function fetch(string $templateFile): string; /** * Clear template cache directory. */ - public abstract function clearCache(): void; + abstract public function clearCache(): void; } diff --git a/core/includes/maintenance.php b/core/includes/maintenance.php index 20ae030938..26791dec5a 100644 --- a/core/includes/maintenance.php +++ b/core/includes/maintenance.php @@ -19,7 +19,6 @@ * @var User $user * @var Widgets $widgets */ - $pages = new Pages(); const PAGE = 'maintenance'; diff --git a/core/includes/tfa_signin.php b/core/includes/tfa_signin.php index d04c084ebd..62a91cf356 100644 --- a/core/includes/tfa_signin.php +++ b/core/includes/tfa_signin.php @@ -19,7 +19,6 @@ * @var User $user * @var Widgets $widgets */ - if (isset($_POST['username'])) { $_SESSION['username'] = $_POST['username']; } else { diff --git a/core/templates/backend_init.php b/core/templates/backend_init.php index a660034a1e..9720bf170d 100644 --- a/core/templates/backend_init.php +++ b/core/templates/backend_init.php @@ -12,7 +12,6 @@ * @var string $page_title * @var TemplateBase $template */ - const BACK_END = true; if (file_exists(ROOT_PATH . '/custom/panel_templates/' . PANEL_TEMPLATE . '/template.php')) { diff --git a/core/templates/cc_navbar.php b/core/templates/cc_navbar.php index 7efed1335e..58d0e44e25 100644 --- a/core/templates/cc_navbar.php +++ b/core/templates/cc_navbar.php @@ -9,5 +9,4 @@ * @var Navigation $cc_nav * @var TemplateBase $template */ - $template->getEngine()->addVariable('CC_NAV_LINKS', $cc_nav->returnNav()); diff --git a/core/templates/frontend_init.php b/core/templates/frontend_init.php index 0bf5dce7cc..f2f2de2a25 100644 --- a/core/templates/frontend_init.php +++ b/core/templates/frontend_init.php @@ -11,7 +11,6 @@ * @var string $page_title * @var User $user */ - const FRONT_END = true; // Set current page URL in session, provided it's not the login page diff --git a/core/templates/panel_navbar.php b/core/templates/panel_navbar.php index f0744f24f7..2a8a03db13 100644 --- a/core/templates/panel_navbar.php +++ b/core/templates/panel_navbar.php @@ -36,5 +36,5 @@ 'user_title' => Output::getClean($user->data()->user_title), 'avatar' => $user->getAvatar(), 'integrations' => $user_integrations ?? [], - ] + ], ]); diff --git a/custom/panel_templates/Default/template.php b/custom/panel_templates/Default/template.php index 8bbc1b7cc7..c7732bce90 100644 --- a/custom/panel_templates/Default/template.php +++ b/custom/panel_templates/Default/template.php @@ -16,7 +16,6 @@ if (!class_exists('Default_Panel_Template')) { class Default_Panel_Template extends SmartyTemplateBase { - private Language $_language; // Constructor - set template name, version, Nameless version and author here diff --git a/custom/templates/DefaultRevamp/template_settings/settings.php b/custom/templates/DefaultRevamp/template_settings/settings.php index 38d0e63563..fddf81a4a2 100644 --- a/custom/templates/DefaultRevamp/template_settings/settings.php +++ b/custom/templates/DefaultRevamp/template_settings/settings.php @@ -1,18 +1,15 @@ setCache('template_settings');