Merge branch 'master' into feature/800

Conflicts:
	web/edit/web/index.php
This commit is contained in:
Derrick Hammer 2016-10-08 11:22:23 -04:00
commit 09e1238d54
542 changed files with 5342 additions and 709 deletions

View file

@ -93,6 +93,33 @@ randomString = function() {
$('#v_password').text(Array(randomstring.length+1).join('*'));
}
use_hostname = function(domain) {
$('#td_imap_hostname').html(domain);
$('#td_smtp_hostname').html(domain);
}
use_starttls = function() {
$('#td_imap_port').html('143');
$('#td_imap_encryption').html('STARTTLS');
$('#td_smtp_port').html('587');
$('#td_smtp_encryption').html('STARTTLS');
}
use_ssl = function() {
$('#td_imap_port').html('993');
$('#td_imap_encryption').html('SSL');
$('#td_smtp_port').html('465');
$('#td_smtp_encryption').html('SSL');
}
use_no_encryption = function(domain, no_encryption) {
use_hostname(domain);
$('#td_imap_port').html('143');
$('#td_imap_encryption').html(no_encryption);
$('#td_smtp_port').html('25');
$('#td_smtp_encryption').html(no_encryption);
}
$(document).ready(function() {
$('#v_account').text($('input[name=v_account]').val());
$('#v_password').text($('input[name=v_password]').val());

View file

@ -86,6 +86,11 @@ randomString = function() {
randomstring += chars.substr(rnum, 1);
}
document.v_edit_mail_acc.v_password.value = randomstring;
if($('input[name=v_password]').attr('type') == 'text')
$('#v_password').text(randomstring);
else
$('#v_password').text(Array(randomstring.length+1).join('*'));
}
$(document).ready(function() {