From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCHv2 06/12] extrahd.cgi: Display mount status next to the
 corresponding drive
Date: Tue, 01 Aug 2023 17:48:33 +0200
Message-ID: <20230801154839.2373-6-stefan.schantl@ipfire.org>
In-Reply-To: <20230801154839.2373-1-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8415951118598608949=="
List-Id: <development.lists.ipfire.org>

--===============8415951118598608949==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 html/cgi-bin/extrahd.cgi | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/html/cgi-bin/extrahd.cgi b/html/cgi-bin/extrahd.cgi
index 4db540aae..bb84ef77c 100644
--- a/html/cgi-bin/extrahd.cgi
+++ b/html/cgi-bin/extrahd.cgi
@@ -302,14 +302,31 @@ END
=20
 			print <<END
 					</select></td>
-				<td align=3D"center"><input type=3D'text' name=3D'PATH' value=3D$mountpo=
int $disabled></td>
+				<td align=3D"center"><input type=3D'text' name=3D'PATH' value=3D'$mountp=
oint' $disabled></td>
 				<td align=3D"center">
 					<input type=3D'hidden' name=3D'DEVICE' value=3D'/dev/$partition' />
 					<input type=3D'hidden' name=3D'UUID' value=3D'$uuids{$partition}' />
-					<input type=3D'hidden' name=3D'ACTION' value=3D'$Lang::tr{'add'}' />
 END
-;					unless($disabled) {
-						print"<input type=3D'image' alt=3D'$Lang::tr{'add'}' title=3D'$Lang::t=
r{'add'}' src=3D'/images/add.gif' />\n";
+;
+					# Check if the mountpoint refers to a known configured drive.
+					if(&is_configured($mountpoint)) {
+						print "<input type=3D'hidden' name=3D'ACTION' value=3D'$Lang::tr{'dele=
te'}'>\n";
+						print "<input type=3D'hidden' name=3D'PATH' value=3D'$mountpoint'>\n";
+
+						# Check if the device is mounted properly.
+						if(&is_mounted($mountpoint)) {
+							print "<img src=3D'/images/updbooster/updxl-led-green.gif' alt=3D'MOU=
NTED' title=3D'MOUNTED'>&nbsp;\n";
+						} else {
+							print "<img src=3D'/images/updbooster/updxl-led-red.gif' alt=3D'NOT M=
OUNTED' title=3D'NOT MOUNTED'>&nbsp;\n";
+						}
+
+						print "<input type=3D'image' alt=3D'$Lang::tr{'delete'}' title=3D'$Lan=
g::tr{'delete'}' src=3D'/images/delete.gif'>\n";
+					} else {
+						unless($disabled) {
+							print "<input type=3D'hidden' name=3D'ACTION' value=3D'$Lang::tr{'add=
'}'>\n";
+							print "<img src=3D'/images/updbooster/updxl-led-gray.gif' alt=3D'UNCO=
NFIGURED' title=3D'UNCONFIGURED'>&nbsp;\n";
+							print "<input type=3D'image' alt=3D'$Lang::tr{'add'}' title=3D'$Lang:=
:tr{'add'}' src=3D'/images/add.gif'>\n";
+						}
 					}
=20
 				print <<END
--=20
2.39.2


--===============8415951118598608949==--