From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 39/54] samba: Refactor shares section
Date: Tue, 13 Oct 2020 16:07:57 +0000
Message-ID: <20201013160812.27754-39-michael.tremer@ipfire.org>
In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1112173332854221264=="
List-Id: <development.lists.ipfire.org>

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

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 html/cgi-bin/samba.cgi | 165 ++++++++++++++++++++++++-----------------
 1 file changed, 95 insertions(+), 70 deletions(-)

diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index 7d5b4336c..a64fc9177 100644
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -608,94 +608,119 @@ END
=20
 my %shares =3D  config("${General::swroot}/samba/shares");
=20
-print <<END
-<br />
-<table class=3D"tbl" width=3D'95%' cellspacing=3D'0' class=3D'tbl'>
-<tr><th bgcolor=3D'$color{'color20'}' colspan=3D'3' align=3D'left'><b>$Lang:=
:tr{'manage shares'}</b></th></tr>
-<tr><th align=3D'left'><u>$Lang::tr{'sharename'}</u></th><th colspan=3D'2' w=
idth=3D"5%" align=3D'center'><u>$Lang::tr{'options'}</u></th></tr>
+print <<END;
+	<table class=3D"tbl" width=3D'95%' cellspacing=3D'0'>
+		<tr>
+			<th align=3D'left'>$Lang::tr{'sharename'}</th>
+			<th colspan=3D'2' width=3D"5%" align=3D'center'></th>
+		</tr>
 END
-;
=20
-my @Shares =3D keys(%shares);
+my @shares =3D keys(%shares);
 my $lines =3D 0;
 my $col=3D"";
-foreach my $shareentry (sort @Shares)
-	{
+foreach my $shareentry (sort @shares) {
 	chomp $shareentry;
+
 	if ($lines % 2) {
-		print "<tr>";
-		$col=3D"bgcolor=3D'$color{'color20'}'";
+		$col =3D "bgcolor=3D'$color{'color20'}'";
 	} else {
-		print "<tr>";
-		$col=3D"bgcolor=3D'$color{'color22'}'";
-	}
-	print <<END
-	<td align=3D'left' $col>$shareentry</td>
-	<td $col><form method=3D'post' action=3D'$ENV{'SCRIPT_NAME'}#$Lang::tr{'man=
age shares'}'>
-			<input type=3D'hidden' name=3D'NAME' value=3D'$shareentry' />
-			<input type=3D'hidden' name=3D'ACTION' value=3D'sharechange' />
-			<input type=3D'image' alt=3D'$Lang::tr{'edit'}' title=3D'$Lang::tr{'edit'=
}' src=3D'/images/edit.gif' />
-	</form></td>
-	<td $col><form method=3D'post' action=3D'$ENV{'SCRIPT_NAME'}#$Lang::tr{'man=
age shares'}'>
-			<input type=3D'hidden' name=3D'NAME' value=3D'$shareentry' />
-			<input type=3D'hidden' name=3D'ACTION' value=3D'smbsharedel' />
-			<input type=3D'image' alt=3D'$Lang::tr{'delete'}' title=3D'$Lang::tr{'del=
ete'}' src=3D'/images/user-trash.png' />
-	</form></td></tr>
-END
-;
-  $lines++;
+		$col =3D "bgcolor=3D'$color{'color22'}'";
 	}
=20
-print <<END
-</table>
-<br />
-<table width=3D'10%' cellspacing=3D'0'>
-<tr><td align=3D'center'><form method=3D'post' action=3D'$ENV{'SCRIPT_NAME'}=
#$Lang::tr{'manage shares'}'>
-												<input type=3D'hidden' name=3D'ACTION' value=3D'shareadd' />
-												<input type=3D'image' alt=3D'$Lang::tr{'add share'}' title=3D'$L=
ang::tr{'add share'}' src=3D'/images/list-add.png' />
-												</form></td>
-</tr>
-</table>
+	print <<END;
+		<tr>
+			<td align=3D'left' $col>$shareentry</td>
+			<td $col>
+				<form method=3D'post' action=3D'$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage sh=
ares'}'>
+					<input type=3D'hidden' name=3D'NAME' value=3D'$shareentry' />
+					<input type=3D'hidden' name=3D'ACTION' value=3D'sharechange' />
+					<input type=3D'image' alt=3D'$Lang::tr{'edit'}' title=3D'$Lang::tr{'edi=
t'}' src=3D'/images/edit.gif' />
+				</form>
+			</td>
+			<td $col>
+				<form method=3D'post' action=3D'$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage sh=
ares'}'>
+					<input type=3D'hidden' name=3D'NAME' value=3D'$shareentry' />
+					<input type=3D'hidden' name=3D'ACTION' value=3D'smbsharedel' />
+					<input type=3D'image' alt=3D'$Lang::tr{'delete'}' title=3D'$Lang::tr{'d=
elete'}' src=3D'/images/user-trash.png' />
+				</form>
+			</td>
+		</tr>
 END
 ;
+	$lines++;
+}
=20
-if ($sambasettings{'ACTION'} eq 'shareadd')
-	{
-	print <<END
-	<br />
-	<table width=3D'95%' cellspacing=3D'0'>
-	<tr bgcolor=3D'$color{'color20'}'><td colspan=3D'2' align=3D'left'><b>$Lang=
::tr{'add share'}</b></td></tr>
-	<tr><td colspan=3D'2' align=3D'center'></td></tr>
-	<form method=3D'post' action=3D'$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage share=
s'}'><tr><td colspan=3D'2' align=3D'center'><textarea name=3D"SHAREOPTION" co=
ls=3D"50" rows=3D"15" Wrap=3D"off">$defaultoption</textarea></td></tr>
+print <<END;
 	</table>
-	<br />
-	<table width=3D'10%' cellspacing=3D'0'>
-	<tr><td align=3D'center'><input type=3D'hidden' name=3D'ACTION' value=3D'sm=
bshareadd' />
-													<input type=3D'image' alt=3D'$Lang::tr{'add share'}' title=3D'$=
Lang::tr{'add share'}' src=3D'/images/media-floppy.png' /></td></tr></form>
+
+	<br>
+
+	<table width=3D'100%' cellspacing=3D'0'>
+		<tr>
+			<td align=3D'center'>
+				<form method=3D'POST' action=3D'$ENV{'SCRIPT_NAME'}'>
+					<input type=3D'hidden' name=3D'ACTION' value=3D'shareadd'>
+					<input type=3D'submit' value=3D'$Lang::tr{'add share'}'>
+				</form>
+			</td>
+		</tr>
 	</table>
 END
-;
-	}
=20
-if ($sambasettings{'ACTION'} eq 'sharechange')
-	{
+if ($sambasettings{'ACTION'} eq 'shareadd') {
+	print <<END;
+		<br />
+
+		<form method=3D'POST' action=3D'$ENV{'SCRIPT_NAME'}'>
+			<table width=3D'95%' cellspacing=3D'0'>
+				<tr bgcolor=3D'$color{'color20'}'>
+					<td align=3D'left'><b>$Lang::tr{'add share'}</b></td>
+				</tr>
+				<tr>
+					<td align=3D'center'>
+						<textarea name=3D"SHAREOPTION" cols=3D"121" rows=3D"15">$defaultoption=
</textarea>
+					</td>
+				</tr>
+				<tr>
+					<td align=3D'center'>
+						<input type=3D'hidden' name=3D'ACTION' value=3D'smbshareadd'>
+						<input type=3D'submit' value=3D'$Lang::tr{'save'}'>
+					</td>
+				</tr>
+			</table>
+		</form>
+END
+}
+
+if ($sambasettings{'ACTION'} eq 'sharechange') {
 	my $shareoption =3D $shares{$sambasettings{'NAME'}};
-	print <<END
-	<br />
-	<table width=3D'95%' cellspacing=3D'0'>
-	<tr bgcolor=3D'$color{'color20'}'><td colspan=3D'2' align=3D'left'><b>$Lang=
::tr{'edit share'}</b></td></tr>
-	<tr><td colspan=3D'2' align=3D'center'></td></tr>
-	<tr><td colspan=3D'2' align=3D'center'><form method=3D'post' action=3D'$ENV=
{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}'><textarea name=3D"SHAREOPTION" co=
ls=3D"50" rows=3D"15" Wrap=3D"off">$shareoption</textarea></td></tr>
-	</table>
-	<br />
-	<table width=3D'10%' cellspacing=3D'0'>
-	<tr><td align=3D'center'><input type=3D'hidden' name=3D'NAME' value=3D'$sam=
basettings{'NAME'}' />
-													<input type=3D'image' alt=3D'$Lang::tr{'change share'}' title=
=3D'$Lang::tr{'change share'}' src=3D'/images/media-floppy.png' />
-													<input type=3D'hidden' name=3D'ACTION' value=3D'smbsharechange'=
 /></form></td></tr>
-	</table>
+
+	print <<END;
+		<br />
+
+		<form method=3D'POST' action=3D'$ENV{'SCRIPT_NAME'}'>
+			<input type=3D'hidden' name=3D'NAME' value=3D'$sambasettings{'NAME'}'>
+
+			<table width=3D'95%' cellspacing=3D'0'>
+				<tr bgcolor=3D'$color{'color20'}'>
+					<td align=3D'left'><b>$Lang::tr{'edit share'}</b></td>
+				</tr>
+				<tr>
+					<td align=3D'center'>
+						<textarea name=3D"SHAREOPTION" cols=3D"121" rows=3D"15">$shareoption</=
textarea>
+					</td>
+				</tr>
+				<tr>
+					<td align=3D'center'>
+						<input type=3D'hidden' name=3D'ACTION' value=3D'smbsharechange'>
+						<input type=3D'submit' value=3D'$Lang::tr{'save'}'>
+					</td>
+				</tr>
+			</table>
+		</form>
 END
-;
-	}
+}
=20
 if ($sambasettings{'ACTION'} eq 'smbshareadd')
 	{
--=20
2.20.1


--===============1112173332854221264==--