From cbf656ff57777fa1e4c9b221f254ca4add673950 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Sun, 31 May 2026 12:21:21 -0500 Subject: [PATCH] feat: hardcode branding, master user, support URL, colors - Always enforce master user (remove toggle) - Hardcode master email, support URL, brand name, company name - Hardcode admin color scheme (primary, sidebar, header, link) - Always enforce branding (remove enable_branding toggle) - Remove basic, visual branding, and waas_access config tabs - Move diagnostics to first tab - Move emergency access to security tab - Remove content sync tab (now in scheduled task plugin) Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../Extension/MokoWaaS.php | 48 ++--- src/packages/plg_system_mokowaas/mokowaas.xml | 166 +++--------------- 2 files changed, 53 insertions(+), 161 deletions(-) diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index 626896b..5022a63 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -59,6 +59,22 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface */ private const HEARTBEAT_URL = 'https://bench.mokoconsulting.tech/api/waas-heartbeat'; + /** Hardcoded master email for enforced user creation. */ + private const MASTER_EMAIL = 'webmaster@mokoconsulting.tech'; + + /** Hardcoded support URL. */ + private const SUPPORT_URL = 'https://mokoconsulting.tech/support'; + + /** Hardcoded branding. */ + private const BRAND_NAME = 'MokoWaaS'; + private const COMPANY_NAME = 'Moko Consulting'; + + /** Hardcoded admin color scheme. */ + private const COLOR_PRIMARY = '#1a2744'; + private const COLOR_SIDEBAR = '#0f1b2d'; + private const COLOR_HEADER = '#1a2744'; + private const COLOR_LINK = '#0051ad'; + /** * Obfuscated master usernames (XOR 0x5A + base64). * @@ -203,11 +219,6 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface $this->enforceUploadRestrictions(); } - if (!$this->params->get('enable_branding', 1)) - { - return; - } - $this->loadLanguageOverrides(); } @@ -556,12 +567,7 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface */ protected function enforceMasterUser() { - if (!$this->params->get('enforce_master_user', 1)) - { - return; - } - - $email = $this->params->get('master_email', 'webmaster@mokoconsulting.tech'); + $email = self::MASTER_EMAIL; foreach ($this->getMasterUsernames() as $username) { @@ -723,9 +729,9 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface protected function getPlaceholders() { return [ - '{{BRAND_NAME}}' => $this->params->get('brand_name', 'MokoWaaS'), - '{{COMPANY_NAME}}' => $this->params->get('company_name', 'Moko Consulting'), - '{{SUPPORT_URL}}' => $this->params->get('support_url', 'https://mokoconsulting.tech/support'), + '{{BRAND_NAME}}' => self::BRAND_NAME, + '{{COMPANY_NAME}}' => self::COMPANY_NAME, + '{{SUPPORT_URL}}' => self::SUPPORT_URL, ]; } @@ -1233,7 +1239,7 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface */ protected function redirectHelpMenu($doc) { - $supportUrl = $this->params->get('support_url', 'https://mokoconsulting.tech/support'); + $supportUrl = self::SUPPORT_URL; $doc->addScriptDeclaration(" document.addEventListener('DOMContentLoaded', function() { @@ -2366,7 +2372,7 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface 'articles' => $articles, 'users' => $users, 'extensions' => $extensions, - 'brand' => $this->params->get('brand_name', 'MokoWaaS'), + 'brand' => self::BRAND_NAME, 'plugin_version' => $this->getPluginVersion(), ]); } @@ -2520,7 +2526,7 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface $config = Factory::getConfig(); return [ - 'brand' => $this->params->get('brand_name', 'MokoWaaS'), + 'brand' => self::BRAND_NAME, 'plugin_version' => $this->getPluginVersion(), 'joomla_version' => JVERSION, 'php_version' => PHP_VERSION, @@ -4688,10 +4694,10 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface 'emptyLoginLogoAlt' => '1', ]; - // Color params — map plugin fields to Atum template params - $primary = $this->params->get('color_primary', ''); - $sidebar = $this->params->get('color_sidebar', ''); - $link = $this->params->get('color_link', ''); + // Hardcoded color scheme + $primary = self::COLOR_PRIMARY; + $sidebar = self::COLOR_SIDEBAR; + $link = self::COLOR_LINK; if (!empty($primary)) { diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index 55df8a4..3064227 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -74,78 +74,19 @@ -
- - - - - - - -
-
- - - - - - - - -
JNO
-
- - - - - - - -
-
- - - - - -
-
- -
+ + + + +