Some small improvements to last few commits, and fixed some problems with the template engine

1 files changed, 16 insertions, 10 deletions

diff --git a/modules/extra/webcpanel/templates/default/hostserv/request.html b/modules/extra/webcpanel/templates/default/hostserv/request.html
index ced414242..158bed28f 100644
--- a/modules/extra/webcpanel/templates/default/hostserv/request.html
+++ b/modules/extra/webcpanel/templates/default/hostserv/request.html
@@ -4,20 +4,26 @@
 	{END FOR}
 	<table width="100%" height="100%">
 		<tr>
-			<td>Your <b>current</b> vHost</td>
+			<td>Your <b>current</b> vHost:
 		{IF EXISTS VHOST}
-			<td>{VHOST}</td>
+			{VHOST}
 		{ELSE}
-			<td><b>None</td>
+			<b>None</b>
 		{END IF}
+			</td>
+		</tr>
 	</table>
-	{IF EXISTS VHOST}		
-		<b>Request a new vHost</b>
+	{IF EXISTS CAN_REQUEST}
+		{IF EXISTS VHOST}		
+			<b>Request a new vHost</b>
+		{ELSE}
+			<b>Request a vHost</b>
+		{END IF}
+		<form method="post" action="/hostserv/request">
+			<input name="req">
+			<input type="submit" value="Request">
+		</form>
 	{ELSE}
-		<b>Request a vHost</b>
+		vHost requests are disabled on this network.
 	{END IF}
-	<form method="post" action="/hostserv/request">
-		<input name="req">
-		<input type="submit" value="Request">
-	</form>
 {INCLUDE footer.html}