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

[Giuseppe Iuculano]

Hi!

Gerfried Fuchs ha scritto:
>  Works well - though that reminds me that it's a bit strange that the
> password is set appart from the login by the mailserver box; personally
> I would switch the mailserver box with the password one.
> 
>  Though, it still doesn't let me log in. See above for the reasoning: I
> would actually _need_ to put something into the domain part, there
> somewhere is a check for sent domain.

Ok, please test the new patch in attachment.

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,18 +42,36 @@
 <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>
+		<input name="pop3host" type="hidden" class="logininput" value="localhost">
+		<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">
+	<tr id="mailservertrans">
 		<td colspan="5" height="6"><img src="imgs/trans.gif" height="8"></td>
 	</tr>
+		<!-- } -->
+	<tr>
+		<td>&nbsp;</td>
+		<td colspan="2" align="right"><font class="inputtext">Password:</font></td>
+		<td align="left"><input name="password" type=password class="logininput" id="password"></td>
+		<td width="131">&nbsp;</td>
+	</tr>
 	<!-- if(!$pref['plesk']) { -->
 	<tr id="mailserver">
 		<td>&nbsp;</td>
@@ -66,12 +84,6 @@
 	</tr>
 	<!-- } -->
 	<tr>
-		<td>&nbsp;</td>
-		<td colspan="2" align="right"><font class="inputtext">Password:</font></td>
-		<td align="left"><input name="password" type=password class="logininput" id="password"></td>
-		<td width="131">&nbsp;</td>
-	</tr>
-	<tr>
 		<td colspan="5" height="8"><img src="imgs/trans.gif" height="8"></td>
 	</tr>
 	<tr>
@@ -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