diff mbox series

[PATCHv2,06/12] extrahd.cgi: Display mount status next to the corresponding drive

Message ID 20230801154839.2373-6-stefan.schantl@ipfire.org
State Staged
Commit fd815c36ea085dd40e4fd8b91dec1a81401369df
Headers
Series [PATCHv2,01/12] extrahd.cgi: Add various perl functions deal with block devices |

Commit Message

Stefan Schantl Aug. 1, 2023, 3:48 p.m. UTC 
  Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---
 html/cgi-bin/extrahd.cgi | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

Comments

Bernhard Bitsch Aug. 2, 2023, 11:55 a.m. UTC | #1 
Reviewed-by: Bernhard Bitsch <bbitsch@ipfire.org>


Am 01.08.2023 um 17:48 schrieb Stefan Schantl:
> Signed-off-by: Stefan Schantl <stefan.schantl@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
>   
>   			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
diff mbox series

Patch

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
 
 			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