[minilinux] Add support for branch colors and changelogs

1 files changed, 15 insertions, 9 deletions

diff --git a/modules-available/minilinux/inc/minilinux.inc.php b/modules-available/minilinux/inc/minilinux.inc.php
index 8778b50d..96763874 100644
--- a/modules-available/minilinux/inc/minilinux.inc.php
+++ b/modules-available/minilinux/inc/minilinux.inc.php
@@ -83,13 +83,15 @@ class MiniLinux
 				continue;
 			$branchid = $sourceid . '/' . $system['id'];
 			$title = empty($system['title']) ? $branchid : $system['title'];
-			$description = empty($system['description']) ? '' : $system['description'];
-			Database::exec('INSERT INTO minilinux_branch (branchid, sourceid, title, description)
-					VALUES (:branchid, :sourceid, :title, :description)
-					ON DUPLICATE KEY UPDATE title = VALUES(title), description = VALUES(description)', [
+			$description = $system['description'] ?? '';
+			$color = $system['color'] ?? '';
+			Database::exec('INSERT INTO minilinux_branch (branchid, sourceid, title, color, description)
+					VALUES (:branchid, :sourceid, :title, :color, :description)
+					ON DUPLICATE KEY UPDATE title = VALUES(title), color = VALUES(color), description = VALUES(description)', [
 				'branchid' => $branchid,
 				'sourceid' => $sourceid,
 				'title' => $title,
+				'color' => $color,
 				'description' => $description,
 			]);
 			if (@is_array($system['versions'])) {
@@ -116,7 +118,8 @@ class MiniLinux
 			return;
 		}
 		$versionid = $branchid . '/' . $version['version'];
-		$title = empty($version['title']) ? '' : $version['title'];
+		$title = $version['title'] ?? '';
+		$description = $version['description'] ?? '';
 		$dateline = empty($version['releasedate']) ? time() : (int)$version['releasedate'];
 		unset($version['version'], $version['title'], $version['releasedate']);
 		// Sanitize files array
@@ -149,12 +152,14 @@ class MiniLinux
 			$version['files'] = array_values($version['files']);
 		}
 		$data = json_encode($version);
-		Database::exec('INSERT INTO minilinux_version (versionid, branchid, title, dateline, data, orphan)
-					VALUES (:versionid, :branchid, :title, :dateline, :data, 0)
-					ON DUPLICATE KEY UPDATE title = VALUES(title), data = VALUES(data), orphan = 0', [
+		Database::exec('INSERT INTO minilinux_version (versionid, branchid, title, description, dateline, data, orphan)
+					VALUES (:versionid, :branchid, :title, :description, :dateline, :data, 0)
+					ON DUPLICATE KEY UPDATE title = VALUES(title), description = VALUES(description),
+					                        dateline = VALUES(dateline), data = VALUES(data), orphan = 0', [
 			'versionid' => $versionid,
 			'branchid' => $branchid,
 			'title' => $title,
+			'description' => $description,
 			'dateline' => $dateline,
 			'data' => $data,
 		]);
@@ -357,7 +362,8 @@ class MiniLinux
 	public static function queryAllVersionsByBranch()
 	{
 		$list = [];
-		$res = Database::simpleQuery('SELECT branchid, versionid, title, dateline, orphan, taskid, installed
+		$res = Database::simpleQuery('SELECT branchid, versionid, title, Length(description) AS desclen,
+       		dateline, orphan, taskid, installed
 			FROM minilinux_version ORDER BY branchid, dateline, versionid');
 		foreach ($res as $row) {
 			$list[$row['branchid']][$row['versionid']] = $row;