diff --git a/web/inc/i18n/ar.php b/web/inc/i18n/ar.php index 13d295ba..16953710 100644 --- a/web/inc/i18n/ar.php +++ b/web/inc/i18n/ar.php @@ -730,13 +730,6 @@ $LANG['ar'] = array( 'webalizer' => 'محلل الويب webalizer', 'awstats' => 'احصائيات الويب awstats', - -// Texts below doesn't exist in en.php - '%s rule' => 'قواعد %s', - 'MainDomain' => 'النطاق الرئيسي', - 'SubDomain' => 'النطاق الفرعي (الجزء الاول الذي يضاف إلى النطاق الرئيسي)', - 'Add Sub Domain' => 'إضافة نطاق فرعي' - 'Vesta SSL' => 'Vesta SSL', 'SUBJECT' => 'SUBJECT', 'ALIASES' => 'ALIASES', @@ -745,4 +738,18 @@ $LANG['ar'] = array( 'SIGNATURE' => 'SIGNATURE', 'PUB_KEY' => 'PUB_KEY', 'ISSUER' => 'ISSUER', + + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + +// Texts below doesn't exist in en.php + '%s rule' => 'قواعد %s', + 'MainDomain' => 'النطاق الرئيسي', + 'SubDomain' => 'النطاق الفرعي (الجزء الاول الذي يضاف إلى النطاق الرئيسي)', + 'Add Sub Domain' => 'إضافة نطاق فرعي' + ); diff --git a/web/inc/i18n/bs.php b/web/inc/i18n/bs.php index 50146e04..f092c57f 100644 --- a/web/inc/i18n/bs.php +++ b/web/inc/i18n/bs.php @@ -738,4 +738,11 @@ $LANG['bs'] = array( 'PUB_KEY' => 'PUB_KEY', 'ISSUER' => 'ISSUER', + 'Use server hostname' => 'Koristi server hostname', + 'Use domain hostname' => 'Koristi hostname domena', + 'Use STARTTLS' => 'Koristi STARTTLS', + 'Use SSL' => 'Koristi SSL', + 'No encryption' => 'Bez enkripcije', + 'Do not use encryption' => 'Nemoj koristiti enkripciju', + ); \ No newline at end of file diff --git a/web/inc/i18n/cn.php b/web/inc/i18n/cn.php index 270932a8..c87c753e 100644 --- a/web/inc/i18n/cn.php +++ b/web/inc/i18n/cn.php @@ -738,4 +738,12 @@ $LANG['cn'] = array( 'SIGNATURE' => 'SIGNATURE', 'PUB_KEY' => 'PUB_KEY', 'ISSUER' => 'ISSUER', + + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + ); diff --git a/web/inc/i18n/cz.php b/web/inc/i18n/cz.php index f7cf2bc2..6839078f 100644 --- a/web/inc/i18n/cz.php +++ b/web/inc/i18n/cz.php @@ -740,4 +740,11 @@ $LANG['cz'] = array( 'PUB_KEY' => 'PUB_KEY', 'ISSUER' => 'ISSUER', + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + ); diff --git a/web/inc/i18n/da.php b/web/inc/i18n/da.php index fee796ff..ab1c5840 100644 --- a/web/inc/i18n/da.php +++ b/web/inc/i18n/da.php @@ -741,4 +741,11 @@ $LANG['da'] = array( 'PUB_KEY' => 'PUB_KEY', 'ISSUER' => 'ISSUER', + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + ); diff --git a/web/inc/i18n/de.php b/web/inc/i18n/de.php index 2b683e86..82be962b 100644 --- a/web/inc/i18n/de.php +++ b/web/inc/i18n/de.php @@ -738,4 +738,12 @@ $LANG['de'] = array( 'SIGNATURE' => 'SIGNATURE', 'PUB_KEY' => 'PUB_KEY', 'ISSUER' => 'ISSUER', + + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + ); diff --git a/web/inc/i18n/el.php b/web/inc/i18n/el.php index ea4fe3a3..901e67a1 100644 --- a/web/inc/i18n/el.php +++ b/web/inc/i18n/el.php @@ -740,4 +740,11 @@ $LANG['el'] = array( 'PUB_KEY' => 'PUB_KEY', 'ISSUER' => 'ISSUER', + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + ); diff --git a/web/inc/i18n/en.php b/web/inc/i18n/en.php index 70a34c3f..8a687f73 100644 --- a/web/inc/i18n/en.php +++ b/web/inc/i18n/en.php @@ -740,4 +740,11 @@ $LANG['en'] = array( 'PUB_KEY' => 'PUB_KEY', 'ISSUER' => 'ISSUER', + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + ); diff --git a/web/inc/i18n/es.php b/web/inc/i18n/es.php index 46b43f0e..5a851eec 100644 --- a/web/inc/i18n/es.php +++ b/web/inc/i18n/es.php @@ -737,4 +737,11 @@ $LANG['es'] = array( 'PUB_KEY' => 'PUB_KEY', 'ISSUER' => 'ISSUER', + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + ); diff --git a/web/inc/i18n/fa.php b/web/inc/i18n/fa.php index 3fd9dd9b..06f31723 100644 --- a/web/inc/i18n/fa.php +++ b/web/inc/i18n/fa.php @@ -742,6 +742,13 @@ $LANG['fa'] = [ 'PUB_KEY' => 'PUB_KEY', 'ISSUER' => 'ISSUER', + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + // Texts below doesn't exist in en.php '70 خط اخر %s.%s.log' => 'هفتاد خط انتهايي از %s.%s.log', ]; diff --git a/web/inc/i18n/fi.php b/web/inc/i18n/fi.php index 054b8bd4..db0e960d 100644 --- a/web/inc/i18n/fi.php +++ b/web/inc/i18n/fi.php @@ -741,6 +741,12 @@ $LANG['fi'] = array( 'PUB_KEY' => 'PUB_KEY', 'ISSUER' => 'ISSUER', + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', // Texts below doesn't exist in en.php 'traffic' => 'tiedonsiirto', diff --git a/web/inc/i18n/fr.php b/web/inc/i18n/fr.php index a35c0a37..496e1b9e 100644 --- a/web/inc/i18n/fr.php +++ b/web/inc/i18n/fr.php @@ -739,6 +739,12 @@ $LANG['fr'] = array( 'PUB_KEY' => 'PUB_KEY', 'ISSUER' => 'ISSUER', + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', // Texts below doesn't exist in en.php 'disk' => 'disque', diff --git a/web/inc/i18n/hu.php b/web/inc/i18n/hu.php index bcaeb367..3653682a 100644 --- a/web/inc/i18n/hu.php +++ b/web/inc/i18n/hu.php @@ -743,6 +743,13 @@ $LANG['hu'] = array( 'PUB_KEY' => 'PUB_KEY', 'ISSUER' => 'ISSUER', + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + // Texts below doesn't exist in en.php 'Bandwidth Usage eth1' => 'eth1 sávszélesség használat', ); diff --git a/web/inc/i18n/id.php b/web/inc/i18n/id.php index 6b445d5d..2b884bd1 100644 --- a/web/inc/i18n/id.php +++ b/web/inc/i18n/id.php @@ -742,4 +742,11 @@ $LANG['id'] = array( 'PUB_KEY' => 'PUB_KEY', 'ISSUER' => 'ISSUER', + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + ); diff --git a/web/inc/i18n/it.php b/web/inc/i18n/it.php index ee9aea43..439f5a37 100644 --- a/web/inc/i18n/it.php +++ b/web/inc/i18n/it.php @@ -740,4 +740,11 @@ $LANG['it'] = array( 'PUB_KEY' => 'PUB_KEY', 'ISSUER' => 'ISSUER', + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + ); diff --git a/web/inc/i18n/ja.php b/web/inc/i18n/ja.php index f4a55367..501129a1 100644 --- a/web/inc/i18n/ja.php +++ b/web/inc/i18n/ja.php @@ -739,4 +739,11 @@ $LANG['ja'] = array( 'PUB_KEY' => 'PUB_KEY', 'ISSUER' => 'ISSUER', + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + ); diff --git a/web/inc/i18n/ka.php b/web/inc/i18n/ka.php index cb47a242..f690b9aa 100644 --- a/web/inc/i18n/ka.php +++ b/web/inc/i18n/ka.php @@ -739,4 +739,11 @@ $LANG['ka'] = array( 'PUB_KEY' => 'PUB_KEY', 'ISSUER' => 'ISSUER', + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + ); diff --git a/web/inc/i18n/nl.php b/web/inc/i18n/nl.php index b0fe61eb..1f64efba 100644 --- a/web/inc/i18n/nl.php +++ b/web/inc/i18n/nl.php @@ -740,4 +740,11 @@ $LANG['nl'] = array( 'PUB_KEY' => 'PUB_KEY', 'ISSUER' => 'ISSUER', + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + ); diff --git a/web/inc/i18n/no.php b/web/inc/i18n/no.php index 31232e8c..37c9b62e 100644 --- a/web/inc/i18n/no.php +++ b/web/inc/i18n/no.php @@ -740,4 +740,11 @@ $LANG['no'] = array( 'PUB_KEY' => 'PUB_KEY', 'ISSUER' => 'ISSUER', + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + ); diff --git a/web/inc/i18n/pl.php b/web/inc/i18n/pl.php index ee376198..f9f423bb 100644 --- a/web/inc/i18n/pl.php +++ b/web/inc/i18n/pl.php @@ -739,4 +739,11 @@ $LANG['pl'] = array( 'PUB_KEY' => 'PUB_KEY', 'ISSUER' => 'ISSUER', + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + ); diff --git a/web/inc/i18n/pt-BR.php b/web/inc/i18n/pt-BR.php index 621d00ba..b80960e8 100644 --- a/web/inc/i18n/pt-BR.php +++ b/web/inc/i18n/pt-BR.php @@ -738,4 +738,12 @@ $LANG['pt-BR'] = array( 'SIGNATURE' => 'SIGNATURE', 'PUB_KEY' => 'PUB_KEY', 'ISSUER' => 'ISSUER', + + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + ); diff --git a/web/inc/i18n/pt.php b/web/inc/i18n/pt.php index b178525f..eb572e86 100644 --- a/web/inc/i18n/pt.php +++ b/web/inc/i18n/pt.php @@ -739,4 +739,11 @@ $LANG['pt'] = array( 'PUB_KEY' => 'PUB_KEY', 'ISSUER' => 'ISSUER', + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + ); diff --git a/web/inc/i18n/ro.php b/web/inc/i18n/ro.php index bd3c96c6..c12a190f 100644 --- a/web/inc/i18n/ro.php +++ b/web/inc/i18n/ro.php @@ -740,4 +740,11 @@ $LANG['ro'] = array( 'PUB_KEY' => 'PUB_KEY', 'ISSUER' => 'ISSUER', + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + ); diff --git a/web/inc/i18n/ru.php b/web/inc/i18n/ru.php index e8d1d48b..c6ff96eb 100644 --- a/web/inc/i18n/ru.php +++ b/web/inc/i18n/ru.php @@ -740,4 +740,11 @@ $LANG['ru'] = array( 'PUB_KEY' => 'PUB_KEY', 'ISSUER' => 'ISSUER', + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + ); diff --git a/web/inc/i18n/se.php b/web/inc/i18n/se.php index 1d2b4046..ea791671 100644 --- a/web/inc/i18n/se.php +++ b/web/inc/i18n/se.php @@ -739,4 +739,11 @@ $LANG['se'] = array( 'PUB_KEY' => 'PUB_KEY', 'ISSUER' => 'ISSUER', + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + ); diff --git a/web/inc/i18n/tr.php b/web/inc/i18n/tr.php index c6929297..8c8297fc 100644 --- a/web/inc/i18n/tr.php +++ b/web/inc/i18n/tr.php @@ -740,4 +740,11 @@ $LANG['tr'] = array( 'PUB_KEY' => 'PUB_KEY', 'ISSUER' => 'ISSUER', + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + ); diff --git a/web/inc/i18n/tw.php b/web/inc/i18n/tw.php index 0559a591..99374311 100644 --- a/web/inc/i18n/tw.php +++ b/web/inc/i18n/tw.php @@ -762,4 +762,11 @@ $LANG['tw'] = array( 'PUB_KEY' => 'PUB_KEY', 'ISSUER' => 'ISSUER', + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + ); diff --git a/web/inc/i18n/ua.php b/web/inc/i18n/ua.php index 972a4c7e..c64210bc 100644 --- a/web/inc/i18n/ua.php +++ b/web/inc/i18n/ua.php @@ -740,4 +740,11 @@ $LANG['ua'] = array( 'PUB_KEY' => 'PUB_KEY', 'ISSUER' => 'ISSUER', + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + ); \ No newline at end of file diff --git a/web/inc/i18n/vi.php b/web/inc/i18n/vi.php index a4a23c84..5d8b5763 100644 --- a/web/inc/i18n/vi.php +++ b/web/inc/i18n/vi.php @@ -738,4 +738,11 @@ $LANG['vi'] = array( 'PUB_KEY' => 'PUB_KEY', 'ISSUER' => 'ISSUER', + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + ); diff --git a/web/js/pages/add_mail_acc.js b/web/js/pages/add_mail_acc.js index d96d0158..30ce5d25 100644 --- a/web/js/pages/add_mail_acc.js +++ b/web/js/pages/add_mail_acc.js @@ -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_encyption) { + use_hostname(domain); + $('#td_imap_port').html('143'); + $('#td_imap_encryption').html(no_encyption); + $('#td_smtp_port').html('25'); + $('#td_smtp_encryption').html(no_encyption); +} + $(document).ready(function() { $('#v_account').text($('input[name=v_account]').val()); $('#v_password').text($('input[name=v_password]').val()); diff --git a/web/templates/admin/add_mail_acc.html b/web/templates/admin/add_mail_acc.html index 725780ee..64401303 100644 --- a/web/templates/admin/add_mail_acc.html +++ b/web/templates/admin/add_mail_acc.html @@ -143,15 +143,15 @@ : - + : - 143 + 143 : - + : @@ -159,20 +159,28 @@ - + : - 587 + 587 : - + : + +
+ + + + + +