Fix "Email account details" email

web/js/pages/add_mail_acc.js

@@ -120,7 +120,7 @@ randomString = function(min_length = 16) {
         if($('input[name=v_password]').attr('type') == 'text')
             $('#v_password').text(randomstring);
         else
-            $('#v_password').text(Array(randomstring.length+1).join('*'));s        
+            $('#v_password').text(Array(randomstring.length+1).join('*'));      
         App.Actions.MAIL_ACC.update_v_password();
         generate_mail_credentials();
 }

web/templates/pages/add_mail_acc.html

@@ -162,85 +162,29 @@
 				<td class="mail-infoblock-td">
 					<div class="mail-infoblock">
 						<table>
-							<?php $uname_arr=posix_uname(); $hostname=$uname_arr['nodename']; ?>
-							<tr>
-								<td colspan="2">
-									<select id="mail_configuration" class="vst-list flat">
-										<option v_type="hostname" domain="<?=htmlentities($v_domain)?>"><?=_('Use domain hostname');?></option>
-										<option v_type="starttls"><?=_('Use STARTTLS');?></option>
-										<option v_type="ssl"><?=_('Use SSL / TLS');?></option>
-										<option v_type="no_encryption" domain="<?=htmlentities(trim($v_domain, "'"))?>" no_encryption="<?=_('No encryption');?>"><?=_('No encryption');?></option>
-									</select>
-								</td>
-							</tr>
-							<tr>
-								<td><?=_('Username');?>:</td>
-								<td>
-									<div><span id="v_account">example</span>@<?=htmlentities(trim($v_domain, "'"))?></div>
-								</td>
-							</tr>
-							<tr>
-								<td><?=_('Password');?>:</td>
-								<td>
-									<div id="v_password">******</div>
-								</td>
-							</tr>
-							<tr>
-								<td><?=_('IMAP hostname');?>:</td>
-								<td>
-									<div id="td_imap_hostname">mail.<?=htmlentities($v_domain)?></div>
-								</td>
-							</tr>
-							<tr>
-								<td><?=_('IMAP port');?>:</td>
-								<td>
-									<div id="td_imap_port">143</div>
-								</td>
-							</tr>
-							<tr>
-								<td><?=_('IMAP security');?>:</td>
-								<td>
-									<div id="td_imap_encryption"><?=_('STARTTLS');?></div>
-								</td>
-							</tr>
-							<tr>
-								<td><?=_('IMAP auth method');?>:</td>
-								<td>
-									<div><?=_('Normal password');?></div>
-								</td>
-							</tr>
-							<tr>
-								<td><?=_('SMTP hostname');?>:</td>
-								<td>
-									<div id="td_smtp_hostname">mail.<?=htmlentities($v_domain)?></div>
-								</td>
-							</tr>
-							<tr>
-								<td><?=_('SMTP port');?>:</td>
-								<td>
-									<div id="td_smtp_port">587</div>
-								</td>
-							</tr>
-							<tr>
-								<td><?=_('SMTP security');?>:</td>
-								<td>
-									<div id="td_smtp_encryption"><?=_('STARTTLS');?></div>
-								</td>
-							</tr>
-							<tr>
-								<td><?=_('SMTP auth method');?>:</td>
-								<td>
-									<div><?=_('Normal password');?></div>
-								</td>
-							</tr>
-							<?php if ($_SESSION['WEBMAIL_SYSTEM']) {?>
-								<tr>
-									<td><?=_('Webmail URL');?>:</td>
-									<td>
-										<div><a class="vst" href="http://<?=htmlentities($v_webmail_alias)?>" target="_blank">http://<?=htmlentities($v_webmail_alias)?> <i></i></a></div>
-									</td>
-								</tr>
-							<?php } ?>
+						<tr><td colspan="2"><strong><?=strtoupper(_('Common account settings'));?></strong></td><tr>
+						<tr><td><?=_('Username');?>: </td><td><span id="v_account">example</span>@<?=htmlentities(trim($v_domain, "'"))?></td></tr>
+						<tr><td><?=_('Password');?>: </td><td><span id="v_password"></span></td></tr>
+						<?php if ($_SESSION['WEBMAIL_SYSTEM']) {?><tr><td><?=_('Webmail');?>: </td><td><a class="vst" href="http://<?=htmlentities($v_webmail_alias)?>" target="_blank">http://<?=htmlentities($v_webmail_alias)?></a></td></tr><?php } ?>
+						<tr><td><?=_('Hostname');?>: </td><td>mail.<?=htmlentities($v_domain)?></td></tr>	
+							
+						<tr><td colspan="2"><strong><?=strtoupper(_('IMAP settings'));?></strong></td></tr>
+						<tr><td><?=_('Authentication');?>: </td><td> <?=_('Normal password');?></td></tr>
+						<tr><td><?=_('SSL/TLS');?>: </td><td><?=_('Port');?> 993
+						<tr><td><?=_('STARTTLS');?>: </td><td><?=_('Port');?> 143
+						<tr><td><?=_('No encryption');?>: </td><td><?=_('Port');?> 143
+							
+						<tr><td colspan="2"><strong><?=strtoupper(_('POP3 settings'));?></strong></td></tr>
+						<tr><td><?=_('Authentication');?>: </td><td> <?=_('Normal password');?></td></tr>
+						<tr><td><?=_('SSL/TLS');?>: </td><td><?=_('Port');?> 995
+						<tr><td><?=_('STARTTLS');?>: </td><td><?=_('Port');?> 110
+						<tr><td><?=_('No encryption');?>: </td><td><?=_('Port');?> 110
+						
+						<tr><td colspan="2"><strong><?=strtoupper(_('SMTP settings'));?></strong></td></tr>
+						<tr><td><?=_('Authentication');?>: </td><td> <?=_('Normal password');?></td></tr>
+						<tr><td><?=_('SSL/TLS');?>: </td><td><?=_('Port');?> 465
+						<tr><td><?=_('STARTTLS');?>: </td><td><?=_('Port');?> 587
+						<tr><td><?=_('No encryption');?>: </td><td><?=_('Port');?> 25
 						</table>
 					</div>
 				</td>

web/templates/pages/edit_mail_acc.html

@@ -170,85 +170,29 @@
 				<td class="mail-infoblock-td">
 					<div class="mail-infoblock">
 						<table>
-							<?php $uname_arr=posix_uname(); $hostname=$uname_arr['nodename']; ?>
-							<tr>
-								<td colspan="2">
-									<select id="mail_configuration" class="vst-list flat">
-										<option v_type="hostname" domain="<?='mail.'.$v_domain?>"><?=_('Use domain hostname');?></option>
-										<option v_type="starttls"><?=_('Use STARTTLS');?></option>
-										<option v_type="ssl"><?=_('Use SSL / TLS');?></option>
-										<option v_type="no_encryption" domain="<?=htmlentities(trim('mail.'.$v_domain, "'"))?>" no_encryption="<?=_('No encryption');?>"><?=_('No encryption');?></option>
-									</select>
-								</td>
-							</tr>
-							<tr>
-								<td><?=_('Username');?>:</td>
-								<td>
-									<div><span id="v_account">example</span>@<?=htmlentities(trim($v_domain, "'"))?></div>
-								</td>
-							</tr>
-							<tr>
-								<td><?=_('Password');?>:</td>
-								<td>
-									<div id="v_password">******</div>
-								</td>
-							</tr>
-							<tr>
-								<td><?=_('IMAP hostname');?>:</td>
-								<td>
-									<div id="td_imap_hostname">mail.<?=htmlentities($v_domain)?></div>
-								</td>
-							</tr>
-							<tr>
-								<td><?=_('IMAP port');?>:</td>
-								<td>
-									<div id="td_imap_port">143</div>
-								</td>
-							</tr>
-							<tr>
-								<td><?=_('IMAP security');?>:</td>
-								<td>
-									<div id="td_imap_encryption"><?=_('STARTTLS');?></div>
-								</td>
-							</tr>
-							<tr>
-								<td><?=_('IMAP auth method');?>:</td>
-								<td>
-									<div><?=_('Normal password');?></div>
-								</td>
-							</tr>
-							<tr>
-								<td><?=_('SMTP hostname');?>:</td>
-								<td>
-									<div id="td_smtp_hostname">mail.<?=htmlentities($v_domain)?></div>
-								</td>
-							</tr>
-							<tr>
-								<td><?=_('SMTP port');?>:</td>
-								<td>
-									<div id="td_smtp_port">587</div>
-								</td>
-							</tr>
-							<tr>
-								<td><?=_('SMTP security');?>:</td>
-								<td>
-									<div id="td_smtp_encryption"><?=_('STARTTLS');?></div>
-								</td>
-							</tr>
-							<tr>
-								<td><?=_('SMTP auth method');?>:</td>
-								<td>
-									<div><?=_('Normal password');?></div>
-								</td>
-							</tr>
-							<?php if ($_SESSION['WEBMAIL_SYSTEM']) { ?>
-								<tr>
-									<td><?=_('Webmail URL');?>:</td>
-									<td>
-										<div><a class="vst" href="http://<?=htmlentities($v_webmail_alias)?>" target="_blank">http://<?=htmlentities($v_webmail_alias)?> <i></i></a></div>
-									</td>
-								</tr>
-							<?php } ?>
+						<tr><td colspan="2"><strong><?=strtoupper(_('Common account settings'));?></strong></td><tr>
+						<tr><td><?=_('Username');?>: </td><td><span id="v_account"></span>@<?=htmlentities(trim($v_domain, "'"))?></td></tr>
+						<tr><td><?=_('Password');?>: </td><td><span id="v_password"></span></td></tr>
+						<?php if ($_SESSION['WEBMAIL_SYSTEM']) {?><tr><td><?=_('Webmail');?>: </td><td><a class="vst" href="http://<?=htmlentities($v_webmail_alias)?>" target="_blank">http://<?=htmlentities($v_webmail_alias)?></a></td></tr><?php } ?>
+						<tr><td><?=_('Hostname');?>: </td><td>mail.<?=htmlentities($v_domain)?></td></tr>	
+							
+						<tr><td colspan="2"><strong><?=strtoupper(_('IMAP settings'));?></strong></td></tr>
+						<tr><td><?=_('Authentication');?>: </td><td> <?=_('Normal password');?></td></tr>
+						<tr><td><?=_('SSL/TLS');?>: </td><td><?=_('Port');?> 993
+						<tr><td><?=_('STARTTLS');?>: </td><td><?=_('Port');?> 143
+						<tr><td><?=_('No encryption');?>: </td><td><?=_('Port');?> 143
+							
+						<tr><td colspan="2"><strong><?=strtoupper(_('POP3 settings'));?></strong></td></tr>
+						<tr><td><?=_('Authentication');?>: </td><td> <?=_('Normal password');?></td></tr>
+						<tr><td><?=_('SSL/TLS');?>: </td><td><?=_('Port');?> 995
+						<tr><td><?=_('STARTTLS');?>: </td><td><?=_('Port');?> 110
+						<tr><td><?=_('No encryption');?>: </td><td><?=_('Port');?> 110
+						
+						<tr><td colspan="2"><strong><?=strtoupper(_('SMTP settings'));?></strong></td></tr>
+						<tr><td><?=_('Authentication');?>: </td><td> <?=_('Normal password');?></td></tr>
+						<tr><td><?=_('SSL/TLS');?>: </td><td><?=_('Port');?> 465
+						<tr><td><?=_('STARTTLS');?>: </td><td><?=_('Port');?> 587
+						<tr><td><?=_('No encryption');?>: </td><td><?=_('Port');?> 25
 						</table>
 					</div>
 				</td>