Skip to content

Commit 19e81f0

Browse files
jaapmarcusjaapmarcus
committed
Fix "Email account details" email
1 parent 120d720 commit 19e81f0

File tree

3 files changed

+47
-159
lines changed

3 files changed

+47
-159
lines changed

‎web/js/pages/add_mail_acc.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ randomString = function(min_length = 16) {
120120
if($('input[name=v_password]').attr('type') == 'text')
121121
$('#v_password').text(randomstring);
122122
else
123-
$('#v_password').text(Array(randomstring.length+1).join('*'));s
123+
$('#v_password').text(Array(randomstring.length+1).join('*'));
124124
App.Actions.MAIL_ACC.update_v_password();
125125
generate_mail_credentials();
126126
}

‎web/templates/pages/add_mail_acc.html‎

Lines changed: 23 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -162,85 +162,29 @@
162162
<td class="mail-infoblock-td">
163163
<div class="mail-infoblock">
164164
<table>
165-
<?php $uname_arr=posix_uname(); $hostname=$uname_arr['nodename']; ?>
166-
<tr>
167-
<td colspan="2">
168-
<select id="mail_configuration" class="vst-list flat">
169-
<option v_type="hostname" domain="<?=htmlentities($v_domain)?>"><?=_('Use domain hostname');?></option>
170-
<option v_type="starttls"><?=_('Use STARTTLS');?></option>
171-
<option v_type="ssl"><?=_('Use SSL / TLS');?></option>
172-
<option v_type="no_encryption" domain="<?=htmlentities(trim($v_domain, "'"))?>" no_encryption="<?=_('No encryption');?>"><?=_('No encryption');?></option>
173-
</select>
174-
</td>
175-
</tr>
176-
<tr>
177-
<td><?=_('Username');?>:</td>
178-
<td>
179-
<div><span id="v_account">example</span>@<?=htmlentities(trim($v_domain, "'"))?></div>
180-
</td>
181-
</tr>
182-
<tr>
183-
<td><?=_('Password');?>:</td>
184-
<td>
185-
<div id="v_password">******</div>
186-
</td>
187-
</tr>
188-
<tr>
189-
<td><?=_('IMAP hostname');?>:</td>
190-
<td>
191-
<div id="td_imap_hostname">mail.<?=htmlentities($v_domain)?></div>
192-
</td>
193-
</tr>
194-
<tr>
195-
<td><?=_('IMAP port');?>:</td>
196-
<td>
197-
<div id="td_imap_port">143</div>
198-
</td>
199-
</tr>
200-
<tr>
201-
<td><?=_('IMAP security');?>:</td>
202-
<td>
203-
<div id="td_imap_encryption"><?=_('STARTTLS');?></div>
204-
</td>
205-
</tr>
206-
<tr>
207-
<td><?=_('IMAP auth method');?>:</td>
208-
<td>
209-
<div><?=_('Normal password');?></div>
210-
</td>
211-
</tr>
212-
<tr>
213-
<td><?=_('SMTP hostname');?>:</td>
214-
<td>
215-
<div id="td_smtp_hostname">mail.<?=htmlentities($v_domain)?></div>
216-
</td>
217-
</tr>
218-
<tr>
219-
<td><?=_('SMTP port');?>:</td>
220-
<td>
221-
<div id="td_smtp_port">587</div>
222-
</td>
223-
</tr>
224-
<tr>
225-
<td><?=_('SMTP security');?>:</td>
226-
<td>
227-
<div id="td_smtp_encryption"><?=_('STARTTLS');?></div>
228-
</td>
229-
</tr>
230-
<tr>
231-
<td><?=_('SMTP auth method');?>:</td>
232-
<td>
233-
<div><?=_('Normal password');?></div>
234-
</td>
235-
</tr>
236-
<?php if ($_SESSION['WEBMAIL_SYSTEM']) {?>
237-
<tr>
238-
<td><?=_('Webmail URL');?>:</td>
239-
<td>
240-
<div><a class="vst" href="http://<?=htmlentities($v_webmail_alias)?>" target="_blank">http://<?=htmlentities($v_webmail_alias)?> <i></i></a></div>
241-
</td>
242-
</tr>
243-
<?php } ?>
165+
<tr><td colspan="2"><strong><?=strtoupper(_('Common account settings'));?></strong></td><tr>
166+
<tr><td><?=_('Username');?>: </td><td><span id="v_account">example</span>@<?=htmlentities(trim($v_domain, "'"))?></td></tr>
167+
<tr><td><?=_('Password');?>: </td><td><span id="v_password"></span></td></tr>
168+
<?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 } ?>
169+
<tr><td><?=_('Hostname');?>: </td><td>mail.<?=htmlentities($v_domain)?></td></tr>
170+
171+
<tr><td colspan="2"><strong><?=strtoupper(_('IMAP settings'));?></strong></td></tr>
172+
<tr><td><?=_('Authentication');?>: </td><td> <?=_('Normal password');?></td></tr>
173+
<tr><td><?=_('SSL/TLS');?>: </td><td><?=_('Port');?> 993
174+
<tr><td><?=_('STARTTLS');?>: </td><td><?=_('Port');?> 143
175+
<tr><td><?=_('No encryption');?>: </td><td><?=_('Port');?> 143
176+
177+
<tr><td colspan="2"><strong><?=strtoupper(_('POP3 settings'));?></strong></td></tr>
178+
<tr><td><?=_('Authentication');?>: </td><td> <?=_('Normal password');?></td></tr>
179+
<tr><td><?=_('SSL/TLS');?>: </td><td><?=_('Port');?> 995
180+
<tr><td><?=_('STARTTLS');?>: </td><td><?=_('Port');?> 110
181+
<tr><td><?=_('No encryption');?>: </td><td><?=_('Port');?> 110
182+
183+
<tr><td colspan="2"><strong><?=strtoupper(_('SMTP settings'));?></strong></td></tr>
184+
<tr><td><?=_('Authentication');?>: </td><td> <?=_('Normal password');?></td></tr>
185+
<tr><td><?=_('SSL/TLS');?>: </td><td><?=_('Port');?> 465
186+
<tr><td><?=_('STARTTLS');?>: </td><td><?=_('Port');?> 587
187+
<tr><td><?=_('No encryption');?>: </td><td><?=_('Port');?> 25
244188
</table>
245189
</div>
246190
</td>

‎web/templates/pages/edit_mail_acc.html‎

Lines changed: 23 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -170,85 +170,29 @@
170170
<td class="mail-infoblock-td">
171171
<div class="mail-infoblock">
172172
<table>
173-
<?php $uname_arr=posix_uname(); $hostname=$uname_arr['nodename']; ?>
174-
<tr>
175-
<td colspan="2">
176-
<select id="mail_configuration" class="vst-list flat">
177-
<option v_type="hostname" domain="<?='mail.'.$v_domain?>"><?=_('Use domain hostname');?></option>
178-
<option v_type="starttls"><?=_('Use STARTTLS');?></option>
179-
<option v_type="ssl"><?=_('Use SSL / TLS');?></option>
180-
<option v_type="no_encryption" domain="<?=htmlentities(trim('mail.'.$v_domain, "'"))?>" no_encryption="<?=_('No encryption');?>"><?=_('No encryption');?></option>
181-
</select>
182-
</td>
183-
</tr>
184-
<tr>
185-
<td><?=_('Username');?>:</td>
186-
<td>
187-
<div><span id="v_account">example</span>@<?=htmlentities(trim($v_domain, "'"))?></div>
188-
</td>
189-
</tr>
190-
<tr>
191-
<td><?=_('Password');?>:</td>
192-
<td>
193-
<div id="v_password">******</div>
194-
</td>
195-
</tr>
196-
<tr>
197-
<td><?=_('IMAP hostname');?>:</td>
198-
<td>
199-
<div id="td_imap_hostname">mail.<?=htmlentities($v_domain)?></div>
200-
</td>
201-
</tr>
202-
<tr>
203-
<td><?=_('IMAP port');?>:</td>
204-
<td>
205-
<div id="td_imap_port">143</div>
206-
</td>
207-
</tr>
208-
<tr>
209-
<td><?=_('IMAP security');?>:</td>
210-
<td>
211-
<div id="td_imap_encryption"><?=_('STARTTLS');?></div>
212-
</td>
213-
</tr>
214-
<tr>
215-
<td><?=_('IMAP auth method');?>:</td>
216-
<td>
217-
<div><?=_('Normal password');?></div>
218-
</td>
219-
</tr>
220-
<tr>
221-
<td><?=_('SMTP hostname');?>:</td>
222-
<td>
223-
<div id="td_smtp_hostname">mail.<?=htmlentities($v_domain)?></div>
224-
</td>
225-
</tr>
226-
<tr>
227-
<td><?=_('SMTP port');?>:</td>
228-
<td>
229-
<div id="td_smtp_port">587</div>
230-
</td>
231-
</tr>
232-
<tr>
233-
<td><?=_('SMTP security');?>:</td>
234-
<td>
235-
<div id="td_smtp_encryption"><?=_('STARTTLS');?></div>
236-
</td>
237-
</tr>
238-
<tr>
239-
<td><?=_('SMTP auth method');?>:</td>
240-
<td>
241-
<div><?=_('Normal password');?></div>
242-
</td>
243-
</tr>
244-
<?php if ($_SESSION['WEBMAIL_SYSTEM']) { ?>
245-
<tr>
246-
<td><?=_('Webmail URL');?>:</td>
247-
<td>
248-
<div><a class="vst" href="http://<?=htmlentities($v_webmail_alias)?>" target="_blank">http://<?=htmlentities($v_webmail_alias)?> <i></i></a></div>
249-
</td>
250-
</tr>
251-
<?php } ?>
173+
<tr><td colspan="2"><strong><?=strtoupper(_('Common account settings'));?></strong></td><tr>
174+
<tr><td><?=_('Username');?>: </td><td><span id="v_account"></span>@<?=htmlentities(trim($v_domain, "'"))?></td></tr>
175+
<tr><td><?=_('Password');?>: </td><td><span id="v_password"></span></td></tr>
176+
<?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 } ?>
177+
<tr><td><?=_('Hostname');?>: </td><td>mail.<?=htmlentities($v_domain)?></td></tr>
178+
179+
<tr><td colspan="2"><strong><?=strtoupper(_('IMAP settings'));?></strong></td></tr>
180+
<tr><td><?=_('Authentication');?>: </td><td> <?=_('Normal password');?></td></tr>
181+
<tr><td><?=_('SSL/TLS');?>: </td><td><?=_('Port');?> 993
182+
<tr><td><?=_('STARTTLS');?>: </td><td><?=_('Port');?> 143
183+
<tr><td><?=_('No encryption');?>: </td><td><?=_('Port');?> 143
184+
185+
<tr><td colspan="2"><strong><?=strtoupper(_('POP3 settings'));?></strong></td></tr>
186+
<tr><td><?=_('Authentication');?>: </td><td> <?=_('Normal password');?></td></tr>
187+
<tr><td><?=_('SSL/TLS');?>: </td><td><?=_('Port');?> 995
188+
<tr><td><?=_('STARTTLS');?>: </td><td><?=_('Port');?> 110
189+
<tr><td><?=_('No encryption');?>: </td><td><?=_('Port');?> 110
190+
191+
<tr><td colspan="2"><strong><?=strtoupper(_('SMTP settings'));?></strong></td></tr>
192+
<tr><td><?=_('Authentication');?>: </td><td> <?=_('Normal password');?></td></tr>
193+
<tr><td><?=_('SSL/TLS');?>: </td><td><?=_('Port');?> 465
194+
<tr><td><?=_('STARTTLS');?>: </td><td><?=_('Port');?> 587
195+
<tr><td><?=_('No encryption');?>: </td><td><?=_('Port');?> 25
252196
</table>
253197
</div>
254198
</td>

0 commit comments

Comments
 (0)