From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Tue, 1 Aug 2023 15:48:33 +0000 (+0200)
Subject: extrahd.cgi: Display mount status next to the corresponding drive
X-Git-Tag: v2.27-core179~9^2~80
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd815c36ea085dd40e4fd8b91dec1a81401369df;p=ipfire-2.x.git

extrahd.cgi: Display mount status next to the corresponding drive

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/html/cgi-bin/extrahd.cgi b/html/cgi-bin/extrahd.cgi
index 4db540aae4..bb84ef77c5 100644
--- a/html/cgi-bin/extrahd.cgi
+++ b/html/cgi-bin/extrahd.cgi
@@ -302,14 +302,31 @@ END
 
 			print <<END
 					</select></td>
-				<td align="center"><input type='text' name='PATH' value=$mountpoint $disabled></td>
+				<td align="center"><input type='text' name='PATH' value='$mountpoint' $disabled></td>
 				<td align="center">
 					<input type='hidden' name='DEVICE' value='/dev/$partition' />
 					<input type='hidden' name='UUID' value='$uuids{$partition}' />
-					<input type='hidden' name='ACTION' value='$Lang::tr{'add'}' />
 END
-;					unless($disabled) {
-						print"<input type='image' alt='$Lang::tr{'add'}' title='$Lang::tr{'add'}' src='/images/add.gif' />\n";
+;
+					# Check if the mountpoint refers to a known configured drive.
+					if(&is_configured($mountpoint)) {
+						print "<input type='hidden' name='ACTION' value='$Lang::tr{'delete'}'>\n";
+						print "<input type='hidden' name='PATH' value='$mountpoint'>\n";
+
+						# Check if the device is mounted properly.
+						if(&is_mounted($mountpoint)) {
+							print "<img src='/images/updbooster/updxl-led-green.gif' alt='MOUNTED' title='MOUNTED'>&nbsp;\n";
+						} else {
+							print "<img src='/images/updbooster/updxl-led-red.gif' alt='NOT MOUNTED' title='NOT MOUNTED'>&nbsp;\n";
+						}
+
+						print "<input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/delete.gif'>\n";
+					} else {
+						unless($disabled) {
+							print "<input type='hidden' name='ACTION' value='$Lang::tr{'add'}'>\n";
+							print "<img src='/images/updbooster/updxl-led-gray.gif' alt='UNCONFIGURED' title='UNCONFIGURED'>&nbsp;\n";
+							print "<input type='image' alt='$Lang::tr{'add'}' title='$Lang::tr{'add'}' src='/images/add.gif'>\n";
+						}
 					}
 
 				print <<END