From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bernhard Bitsch <bbitsch@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCHv2 06/12] extrahd.cgi: Display mount status next to the
 corresponding drive
Date: Wed, 02 Aug 2023 13:55:58 +0200
Message-ID: <5e81c5cb-b2ee-c3f3-7197-7662465516f9@ipfire.org>
In-Reply-To: <20230801154839.2373-6-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8964882733651201582=="
List-Id: <development.lists.ipfire.org>

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

Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org>


Am 01.08.2023 um 17:48 schrieb Stefan Schantl:
> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> ---
>   html/cgi-bin/extrahd.cgi | 25 +++++++++++++++++++++----
>   1 file changed, 21 insertions(+), 4 deletions(-)
>=20
> 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$mount=
point $disabled></td>
> +				<td align=3D"center"><input type=3D'text' name=3D'PATH' value=3D'$moun=
tpoint' $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:=
:tr{'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{'de=
lete'}'>\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'M=
OUNTED' title=3D'MOUNTED'>&nbsp;\n";
> +						} else {
> +							print "<img src=3D'/images/updbooster/updxl-led-red.gif' alt=3D'NOT=
 MOUNTED' title=3D'NOT MOUNTED'>&nbsp;\n";
> +						}
> +
> +						print "<input type=3D'image' alt=3D'$Lang::tr{'delete'}' title=3D'$L=
ang::tr{'delete'}' src=3D'/images/delete.gif'>\n";
> +					} else {
> +						unless($disabled) {
> +							print "<input type=3D'hidden' name=3D'ACTION' value=3D'$Lang::tr{'a=
dd'}'>\n";
> +							print "<img src=3D'/images/updbooster/updxl-led-gray.gif' alt=3D'UN=
CONFIGURED' title=3D'UNCONFIGURED'>&nbsp;\n";
> +							print "<input type=3D'image' alt=3D'$Lang::tr{'add'}' title=3D'$Lan=
g::tr{'add'}' src=3D'/images/add.gif'>\n";
> +						}
>   					}
>  =20
>   				print <<END

--===============8964882733651201582==--