From 2dc85873f1331f9d419372cb7b540039abcd3b7e Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 19 Dec 2023 17:56:50 +0100
Subject: [systemstatus] Add notice about security updates to main page

---
 modules-available/systemstatus/page.inc.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'modules-available/systemstatus/page.inc.php')

diff --git a/modules-available/systemstatus/page.inc.php b/modules-available/systemstatus/page.inc.php
index 92cea5ab..f774c4e0 100644
--- a/modules-available/systemstatus/page.inc.php
+++ b/modules-available/systemstatus/page.inc.php
@@ -48,6 +48,7 @@ class Page_SystemStatus extends Page
 			User::assertPermission('apt.fix');
 			$aptAction = 'FIX';
 			break;
+		default:
 		}
 		if ($aptAction !== null) {
 			if (!Taskmanager::isRunning(Taskmanager::status(self::TM_UPDATE_UUID))) {
@@ -94,7 +95,8 @@ class Page_SystemStatus extends Page
 				'type' => $tab,
 				'name' => Dictionary::translate('tab_' . $tab),
 				'enabled' => User::hasPermission('tab.' . $tab),
-				'important' => $tab === 'ListUpgradable' && SystemStatus::getAptLastDbUpdateTime() + 864000 < time(),
+				'important' => $tab === 'ListUpgradable'
+					&& (SystemStatus::getAptLastDbUpdateTime() + 864000 < time() || SystemStatus::getUpgradableSecurityCount() > 0),
 			);
 		}
 		Permission::addGlobalTags($data['perms'], null, ['serverreboot']);
@@ -135,7 +137,7 @@ class Page_SystemStatus extends Page
 			return;
 		}
 
-		$task = Taskmanager::submit('AptGetUpgradable');
+		$task = SystemStatus::getUpgradableTask();
 
 		// Estimate last time package list was updated
 		$lastPackageInstalled = SystemStatus::getDpkgLastPackageChanges();
@@ -159,6 +161,15 @@ class Page_SystemStatus extends Page
 			$task['data']['error'] = 'ECONNREFUSED';
 		}
 
+		foreach ($task['data']['packages'] as &$pkg) {
+			if (substr($pkg['source'], -9) === '-security') {
+				$pkg['row_class'] = 'bg-danger';
+			} else {
+				$pkg['row_class'] = '';
+			}
+		}
+		unset($pkg);
+
 		echo Render::parse('sys-update-main', [
 			'task' => $task['data'],
 			'lastDownload' => Util::prettyTime($lastListDownloadAttempt),
-- 
cgit v1.2.3-55-g7522