Bug#527392: atmailopen: enforces on email address based login

[Giuseppe Iuculano]

Hi!

Gerfried Fuchs ha scritto:

>  Hmm, right. But only partly. When I do that, the form still displays
> [ user ] @ [ domain ] login form and when I put nothing into the domain
> part it doesn't allow me to submit the data. I actually _need_ to put
> something into the domain part, and the domain part entry box doesn't
> disappear. It just doesn't matter at all what I put into there, it isn't
> sent to the server, which actually is even more confusing.

I committed in the git repository the attached patch, please test it and let me
know if it works.

Cheers,
Giuseppe.

If $mailserver_auth is set to 0, hide domain in the login form, #527392
--- a/html/login-light.html
+++ b/html/login-light.html
@@ -42,14 +42,26 @@
 <form name="loginPage" onsubmit="LoginForm(); return false;" style="margin: 0px;">
 <table width="100%" border="0" cellpadding="2" cellspacing="0">
 	<tr>
+		<!-- if($pref['mailserver_auth']) { -->
 		<td width="100">&nbsp;</td>
 		<td width="144" align="right" valign="top" nowrap > <input name="username" type=text class="logininput" id="username"></td>
 		<td width="18"><img src="imgs/atsymbol.gif" width="18" height="17"></td>
 		<td align="left" valign="top"><div id="externalaccount" style=""><input name="pop3host" type=text class="logininput">
+		<!-- } -->
+		<!-- if(!$pref['mailserver_auth']) { -->
+		<td>&nbsp;</td>
+		<td colspan="2" align="right"><font class="inputtext">Username:</font></td>
+		<td align="left"> <input name="username" type=text class="logininput" id="username"></td>
+		<td>&nbsp;</td>
+	</tr>
+		<!-- } -->
 		<!-- if($pref['plesk']) { -->
 			 <input name="MailServer" type="hidden" class="logininput" id="MailServer" value="localhost">
-		<!-- } --></div></td>
+		<!-- } -->
+		<!-- if($pref['mailserver_auth']) { -->
+		</div></td>
 		<td width="131" >&nbsp;</td>
+		<!-- } -->
 	</tr>
 		<tr id="mailservertrans">
 		<td colspan="5" height="6"><img src="imgs/trans.gif" height="8"></td>
@@ -114,7 +126,7 @@
 		<td>&nbsp;</td>
 		<td align="right">&nbsp;</td>
 		<td width="18">&nbsp;</td>
-		<td align="right">&nbsp;<input type="submit" name="Submit" value="Login" class="loginsubmit">&nbsp;&nbsp;</td>
+		<td align="center">&nbsp;<input type="submit" name="Submit" value="Login" class="loginsubmit">&nbsp;&nbsp;</td>
 		<td width="1"></td>
 	</tr>
 </table>

signature.asc
Description: OpenPGP digital signature