feat: database tools, cache cleanup, admin menu update, license key warning moved to postflight

- Add database tools view (view=database) with table status, optimize, repair, session purge (#127) - Add cache cleanup view (view=cleanup) with directory size reporting and one-click cleanup (#128) - Add Database Tools and Cache Cleanup links to admin sidebar menu module - Add MokoWaaS-specific update badge (blue) separate from other updates in cpanel module - Add SSL certificate expiry monitoring to cpanel module (#148) - Move license key warning from every-page onAfterRoute to package postflight (install/update only) - Add privacy and waflog menu entries to component manifest submenu Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-06-04 07:55:16 -05:00
parent 055562b06a
commit 234c6037c0
10 changed files with 265 additions and 53 deletions
@@ -14,4 +14,6 @@ COM_MOKOWAAS_MENU_TICKETS="Helpdesk"
 COM_MOKOWAAS_MENU_HTACCESS=".htaccess Maker"
 COM_MOKOWAAS_MENU_PRIVACY="Privacy Guard"
 COM_MOKOWAAS_MENU_WAFLOG="WAF Log"
+COM_MOKOWAAS_MENU_DATABASE="Database Tools"
+COM_MOKOWAAS_MENU_CLEANUP="Cache Cleanup"
 COM_MOKOWAAS_MENU_CACHE="Cache Management"
@@ -34,6 +34,8 @@ class DisplayController extends BaseController
 		'categories' => 'mokowaas.tickets',
 		'canned'     => 'mokowaas.tickets',
 		'automation' => 'core.admin',
+		'database'   => 'core.admin',
+		'cleanup'    => 'mokowaas.cache',
 	];

 	public function display($cachable = false, $urlparams = [])
@@ -282,6 +284,43 @@ class DisplayController extends BaseController
 		}
 	}

+	// ==================================================================
+	// Maintenance (#127, #128)
+	// ==================================================================
+
+	public function optimizeDb()
+	{
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+		if (!$this->checkAcl('core.admin')) { $this->jsonForbidden(); return; }
+		$model = new \Moko\Component\MokoWaaS\Administrator\Model\MaintenanceModel();
+		$this->jsonResponse($model->optimizeTables());
+	}
+
+	public function repairDb()
+	{
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+		if (!$this->checkAcl('core.admin')) { $this->jsonForbidden(); return; }
+		$model = new \Moko\Component\MokoWaaS\Administrator\Model\MaintenanceModel();
+		$this->jsonResponse($model->repairTables());
+	}
+
+	public function purgeSessions()
+	{
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+		if (!$this->checkAcl('core.admin')) { $this->jsonForbidden(); return; }
+		$model = new \Moko\Component\MokoWaaS\Administrator\Model\MaintenanceModel();
+		$this->jsonResponse($model->purgeSessions());
+	}
+
+	public function cleanDirectory()
+	{
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+		if (!$this->checkAcl('mokowaas.cache')) { $this->jsonForbidden(); return; }
+		$dirKey = Factory::getApplication()->getInput()->getString('dir_key', '');
+		$model  = new \Moko\Component\MokoWaaS\Administrator\Model\MaintenanceModel();
+		$this->jsonResponse($model->cleanDirectory($dirKey));
+	}
+
 	// ==================================================================
 	// Helpdesk CRUD (#137, #138, #139)
 	// ==================================================================
@@ -0,0 +1,63 @@
+<?php
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
+
+$dirs    = $this->dirs;
+$token   = Session::getFormToken();
+$cleanUrl = Route::_('index.php?option=com_mokowaas&task=display.cleanDirectory&format=json');
+
+$dirKeys = ['site_cache', 'admin_cache', 'tmp', 'logs'];
+$totalMb = 0;
+$totalFiles = 0;
+foreach ($dirs as $d) { $totalMb += $d->size_mb; $totalFiles += $d->files; }
+?>
+
+<div id="mokowaas-cleanup">
+	<div class="row g-3 mb-4">
+		<div class="col-6 col-md-3"><div class="card text-center p-3"><span class="fw-bold fs-3"><?php echo number_format($totalMb, 1); ?> MB</span><small class="text-muted">Total Size</small></div></div>
+		<div class="col-6 col-md-3"><div class="card text-center p-3"><span class="fw-bold fs-3"><?php echo number_format($totalFiles); ?></span><small class="text-muted">Total Files</small></div></div>
+	</div>
+
+	<div class="row g-3">
+		<?php foreach ($dirs as $i => $d): ?>
+		<div class="col-12 col-md-6 col-xl-3">
+			<div class="card h-100">
+				<div class="card-body text-center">
+					<h5><?php echo htmlspecialchars($d->label); ?></h5>
+					<p class="fs-3 fw-bold mb-1 <?php echo $d->size_mb > 50 ? 'text-warning' : ''; ?>"><?php echo number_format($d->size_mb, 1); ?> MB</p>
+					<p class="text-muted small"><?php echo number_format($d->files); ?> files</p>
+					<?php if (!$d->writable): ?>
+					<span class="badge bg-danger">Not writable</span>
+					<?php else: ?>
+					<button type="button" class="btn btn-outline-danger btn-clean" data-key="<?php echo $dirKeys[$i] ?? ''; ?>" data-label="<?php echo htmlspecialchars($d->label); ?>">
+						<span class="icon-trash"></span> Clean
+					</button>
+					<?php endif; ?>
+				</div>
+			</div>
+		</div>
+		<?php endforeach; ?>
+	</div>
+</div>
+
+<script>
+document.querySelectorAll('.btn-clean').forEach(function(btn) {
+	btn.addEventListener('click', function() {
+		if (!confirm('Clean all files in ' + this.dataset.label + '?')) return;
+		var el = this;
+		el.disabled = true;
+		var fd = new FormData();
+		fd.append('dir_key', el.dataset.key);
+		fd.append('<?php echo $token; ?>', '1');
+		fetch('<?php echo $cleanUrl; ?>', {method:'POST', body:fd, headers:{'X-Requested-With':'XMLHttpRequest'}})
+			.then(function(r){return r.json()})
+			.then(function(d){
+				if (d.success) { Joomla.renderMessages({message:[d.message]}); setTimeout(function(){location.reload()},1500); }
+				else { Joomla.renderMessages({error:[d.message]}); el.disabled = false; }
+			})
+			.catch(function(){ el.disabled = false; });
+	});
+});
+</script>
@@ -0,0 +1,72 @@
+<?php
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
+
+$data    = $this->tableData;
+$tables  = $data['tables'] ?? [];
+$token   = Session::getFormToken();
+$optimizeUrl = Route::_('index.php?option=com_mokowaas&task=display.optimizeDb&format=json');
+$repairUrl   = Route::_('index.php?option=com_mokowaas&task=display.repairDb&format=json');
+$purgeUrl    = Route::_('index.php?option=com_mokowaas&task=display.purgeSessions&format=json');
+?>
+
+<div id="mokowaas-database">
+	<div class="row g-3 mb-4">
+		<div class="col-6 col-md-3"><div class="card text-center p-3"><span class="fw-bold fs-3"><?php echo $data['count']; ?></span><small class="text-muted">Tables</small></div></div>
+		<div class="col-6 col-md-3"><div class="card text-center p-3"><span class="fw-bold fs-3"><?php echo $data['total_size_mb']; ?> MB</span><small class="text-muted">Total Size</small></div></div>
+		<div class="col-6 col-md-3"><div class="card text-center p-3"><span class="fw-bold fs-3 <?php echo $data['total_overhead_kb'] > 100 ? 'text-warning' : 'text-success'; ?>"><?php echo $data['total_overhead_kb']; ?> KB</span><small class="text-muted">Overhead</small></div></div>
+		<div class="col-6 col-md-3">
+			<div class="card p-3 d-grid gap-2">
+				<button type="button" class="btn btn-sm btn-primary btn-db-action" data-url="<?php echo $optimizeUrl; ?>" data-token="<?php echo $token; ?>" data-confirm="Optimize all tables with overhead?">
+					<span class="icon-bolt"></span> Optimize All
+				</button>
+				<button type="button" class="btn btn-sm btn-outline-warning btn-db-action" data-url="<?php echo $repairUrl; ?>" data-token="<?php echo $token; ?>" data-confirm="Repair all tables?">
+					<span class="icon-wrench"></span> Repair All
+				</button>
+				<button type="button" class="btn btn-sm btn-outline-secondary btn-db-action" data-url="<?php echo $purgeUrl; ?>" data-token="<?php echo $token; ?>" data-confirm="Purge expired sessions?">
+					<span class="icon-trash"></span> Purge Sessions
+				</button>
+			</div>
+		</div>
+	</div>
+
+	<div class="card">
+		<div class="table-responsive">
+			<table class="table table-striped table-sm mb-0">
+				<thead><tr><th>Table</th><th>Engine</th><th class="text-end">Rows</th><th class="text-end">Size</th><th class="text-end">Overhead</th></tr></thead>
+				<tbody>
+				<?php foreach ($tables as $t): ?>
+				<tr class="<?php echo $t->overhead_kb > 10 ? 'table-warning' : ''; ?> <?php echo $t->is_moko ? 'fw-bold' : ''; ?>">
+					<td class="small"><?php echo htmlspecialchars($t->name); ?></td>
+					<td class="small"><?php echo htmlspecialchars($t->engine); ?></td>
+					<td class="text-end small"><?php echo number_format($t->rows); ?></td>
+					<td class="text-end small"><?php echo $t->size_mb; ?> MB</td>
+					<td class="text-end small <?php echo $t->overhead_kb > 10 ? 'text-warning fw-bold' : ''; ?>"><?php echo $t->overhead_kb > 0 ? $t->overhead_kb . ' KB' : '—'; ?></td>
+				</tr>
+				<?php endforeach; ?>
+				</tbody>
+			</table>
+		</div>
+	</div>
+</div>
+
+<script>
+document.querySelectorAll('.btn-db-action').forEach(function(btn) {
+	btn.addEventListener('click', function() {
+		if (!confirm(this.dataset.confirm)) return;
+		var el = this;
+		el.disabled = true;
+		var fd = new FormData();
+		fd.append(el.dataset.token, '1');
+		fetch(el.dataset.url, {method:'POST', body:fd, headers:{'X-Requested-With':'XMLHttpRequest'}})
+			.then(function(r){return r.json()})
+			.then(function(d){
+				if (d.success) { Joomla.renderMessages({message:[d.message]}); setTimeout(function(){location.reload()},1500); }
+				else { Joomla.renderMessages({error:[d.message]}); el.disabled = false; }
+			})
+			.catch(function(){ el.disabled = false; });
+	});
+});
+</script>
@@ -34,6 +34,8 @@
 			<menu link="option=com_mokowaas&amp;view=htaccess" img="class:file-code">COM_MOKOWAAS_MENU_HTACCESS</menu>
 			<menu link="option=com_mokowaas&amp;view=privacy" img="class:lock">COM_MOKOWAAS_MENU_PRIVACY</menu>
 			<menu link="option=com_mokowaas&amp;view=waflog" img="class:shield-alt">COM_MOKOWAAS_MENU_WAFLOG</menu>
+			<menu link="option=com_mokowaas&amp;view=database" img="class:database">COM_MOKOWAAS_MENU_DATABASE</menu>
+			<menu link="option=com_mokowaas&amp;view=cleanup" img="class:trash">COM_MOKOWAAS_MENU_CLEANUP</menu>
 			<menu link="option=com_plugins&amp;filter[folder]=system&amp;filter[search]=mokowaas" img="class:power-off">COM_MOKOWAAS_MENU_PLUGINS</menu>
 			<menu link="option=com_installer&amp;view=update" img="class:refresh">COM_MOKOWAAS_MENU_UPDATES</menu>
 			<menu link="option=com_checkin" img="class:check-square">COM_MOKOWAAS_MENU_CHECKIN</menu>
@@ -87,10 +87,11 @@ class CpanelHelper
 	public function getCounts(DatabaseInterface $db): object
 	{
 		$counts = (object) [
-			'articles'   => 0,
-			'users'      => 0,
-			'extensions' => 0,
-			'updates'    => 0,
+			'articles'       => 0,
+			'users'          => 0,
+			'extensions'     => 0,
+			'updates'        => 0,
+			'moko_updates'   => 0,
 		];

 		try
@@ -106,6 +107,20 @@ class CpanelHelper

 			$db->setQuery($db->getQuery(true)->select('COUNT(*)')->from($db->quoteName('#__updates'))->where($db->quoteName('extension_id') . ' != 0'));
 			$counts->updates = (int) $db->loadResult();
+
+			// MokoWaaS-specific updates
+			$db->setQuery(
+				$db->getQuery(true)
+					->select('COUNT(*)')
+					->from($db->quoteName('#__updates', 'u'))
+					->join('INNER', $db->quoteName('#__extensions', 'e') . ' ON e.extension_id = u.extension_id')
+					->where('(' . $db->quoteName('e.element') . ' LIKE ' . $db->quote('mokowaas%')
+						. ' OR ' . $db->quoteName('e.element') . ' LIKE ' . $db->quote('pkg_mokowaas%')
+						. ' OR ' . $db->quoteName('e.element') . ' LIKE ' . $db->quote('com_mokowaas%')
+						. ' OR ' . $db->quoteName('e.element') . ' LIKE ' . $db->quote('mod_mokowaas%')
+						. ' OR ' . $db->quoteName('e.element') . ' = ' . $db->quote('mokoonyx') . ')')
+			);
+			$counts->moko_updates = (int) $db->loadResult();
 		}
 		catch (\Throwable $e)
 		{
@@ -67,6 +67,16 @@ $diskColor = ($diskPct !== null && $diskPct > 90) ? 'bg-danger' : (($diskPct !==
 			<?php if (!empty($siteInfo->offline)): ?>
 				<span class="badge bg-danger">Offline</span>
 			<?php endif; ?>
+			<?php if (($counts->moko_updates ?? 0) > 0): ?>
+				<a href="<?php echo Route::_('index.php?option=com_installer&view=update'); ?>" class="badge bg-info text-decoration-none" title="MokoWaaS updates available">
+					<span class="icon-upload" aria-hidden="true"></span> <?php echo $counts->moko_updates; ?> MokoWaaS update<?php echo $counts->moko_updates > 1 ? 's' : ''; ?>
+				</a>
+			<?php endif; ?>
+			<?php if ($counts->updates > 0 && $counts->updates !== ($counts->moko_updates ?? 0)): ?>
+				<a href="<?php echo Route::_('index.php?option=com_installer&view=update'); ?>" class="badge bg-warning text-dark text-decoration-none" title="Other updates available">
+					<span class="icon-upload" aria-hidden="true"></span> <?php echo $counts->updates - ($counts->moko_updates ?? 0); ?> update<?php echo ($counts->updates - ($counts->moko_updates ?? 0)) > 1 ? 's' : ''; ?>
+				</a>
+			<?php endif; ?>
 			<span class="icon-chevron-down small text-muted" aria-hidden="true"></span>
 		</a>
 		<a href="<?php echo Route::_('index.php?option=com_mokowaas'); ?>" class="btn btn-sm btn-primary">
@@ -17,6 +17,8 @@ $items = [
 	['icon' => 'icon-file-code',   'title' => '.htaccess Maker',  'link' => 'index.php?option=com_mokowaas&view=htaccess'],
 	['icon' => 'icon-lock',        'title' => 'Privacy Guard',    'link' => 'index.php?option=com_mokowaas&view=privacy'],
 	['icon' => 'icon-shield-alt',  'title' => 'WAF Log',          'link' => 'index.php?option=com_mokowaas&view=waflog'],
+	['icon' => 'icon-database',    'title' => 'Database Tools',   'link' => 'index.php?option=com_mokowaas&view=database'],
+	['icon' => 'icon-trash',       'title' => 'Cache Cleanup',    'link' => 'index.php?option=com_mokowaas&view=cleanup'],
 	['icon' => 'icon-power-off',   'title' => 'Feature Plugins',  'link' => 'index.php?option=com_plugins&filter[folder]=system&filter[search]=mokowaas'],
 ];

@@ -939,55 +939,6 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface
 		}

 		$this->protectPlugin();
-		$this->warnMissingLicenseKey();
-	}
-
-	/**
-	 * Warn on every admin page load if no license key is configured.
-	 * Non-dismissable — shows on every request, not cached per session.
-	 */
-	protected function warnMissingLicenseKey(): void
-	{
-		if (!$this->isMasterUser())
-		{
-			return;
-		}
-
-		try
-		{
-			$db = Factory::getDbo();
-
-			$query = $db->getQuery(true)
-				->select($db->quoteName('extra_query'))
-				->from($db->quoteName('#__update_sites'))
-				->where('(' . $db->quoteName('name') . ' LIKE ' . $db->quote('%MokoWaaS%')
-					. ' OR ' . $db->quoteName('location') . ' LIKE ' . $db->quote('%MokoWaaS%') . ')')
-				->setLimit(1);
-			$db->setQuery($query);
-			$extraQuery = (string) $db->loadResult();
-
-			if (!empty($extraQuery) && strpos($extraQuery, 'dlid=') !== false)
-			{
-				parse_str($extraQuery, $parsed);
-
-				if (!empty($parsed['dlid']))
-				{
-					return;
-				}
-			}
-
-			$this->app->enqueueMessage(
-				'<strong>Moko Consulting License Key Required</strong> — '
-				. 'No download key is configured. Updates will not be available until a valid license key is entered. '
-				. 'Go to <a href="index.php?option=com_installer&view=updatesites">System &rarr; Update Sites</a> '
-				. 'and enter your license key in the Download Key field for the MokoWaaS update site.',
-				'warning'
-			);
-		}
-		catch (\Throwable $e)
-		{
-			// Silent
-		}
 	}

 	// ------------------------------------------------------------------
@@ -69,6 +69,9 @@ class Pkg_MokowaasInstallerScript

 		// Trigger heartbeat registration
 		$this->sendHeartbeat();
+
+		// Warn if no license key is configured
+		$this->warnMissingLicenseKey();
 	}

 	/**
@@ -996,4 +999,57 @@ class Pkg_MokowaasInstallerScript
 			Log::add('Feature param migration error: ' . $e->getMessage(), Log::WARNING, 'mokowaas');
 		}
 	}
+
+	/**
+	 * Warn after install/update if no license key (dlid) is configured on the update site.
+	 */
+	private function warnMissingLicenseKey(): void
+	{
+		try
+		{
+			$db  = Factory::getDbo();
+			$app = Factory::getApplication();
+
+			$query = $db->getQuery(true)
+				->select([$db->quoteName('update_site_id'), $db->quoteName('extra_query')])
+				->from($db->quoteName('#__update_sites'))
+				->where('(' . $db->quoteName('name') . ' LIKE ' . $db->quote('%MokoWaaS%')
+					. ' OR ' . $db->quoteName('location') . ' LIKE ' . $db->quote('%MokoWaaS%') . ')')
+				->setLimit(1);
+			$db->setQuery($query);
+			$site = $db->loadObject();
+
+			if ($site)
+			{
+				$extraQuery = (string) ($site->extra_query ?? '');
+
+				if (!empty($extraQuery) && strpos($extraQuery, 'dlid=') !== false)
+				{
+					parse_str($extraQuery, $parsed);
+
+					if (!empty($parsed['dlid']))
+					{
+						return;
+					}
+				}
+
+				$editUrl = 'index.php?option=com_installer&task=updatesite.edit&update_site_id=' . (int) $site->update_site_id;
+			}
+			else
+			{
+				$editUrl = 'index.php?option=com_installer&view=updatesites';
+			}
+
+			$app->enqueueMessage(
+				'<strong>Moko Consulting License Key Required</strong> — '
+				. 'No download key is configured. Updates will not be available until a valid license key is entered. '
+				. '<a href="' . $editUrl . '" class="btn btn-sm btn-warning ms-2">Enter License Key</a>',
+				'warning'
+			);
+		}
+		catch (\Throwable $e)
+		{
+			// Silent
+		}
+	}
 }