Skip to content

Commit 9b3069a

Browse files
author
Marius Cramer
committed
Merge remote-tracking branch 'origin/stable-3.0.5'
Conflicts: TODO.txt install/sql/ispconfig3.sql install/tpl/config.inc.php.master install/tpl/fedora_dovecot2.conf.master interface/lib/config.inc.php interface/web/admin/lib/lang/el_system_config.lng interface/web/client/lib/lang/fr_reseller.lng interface/web/dns/lib/lang/fr_dns_import.lng interface/web/dns/lib/lang/fr_dns_soa.lng interface/web/dns/lib/lang/fr_dns_wizard.lng interface/web/mail/lib/lang/fr_mail_user.lng interface/web/monitor/lib/lang/fr.lng interface/web/sites/lib/lang/el_web_childdomain.lng interface/web/sites/lib/lang/el_web_childdomain_list.lng interface/web/sites/lib/lang/el_web_subdomain.lng interface/web/sites/lib/lang/el_web_vhost_subdomain.lng interface/web/sites/lib/lang/el_web_vhost_subdomain_list.lng interface/web/sites/lib/lang/fr_web_aliasdomain.lng interface/web/sites/lib/lang/fr_web_subdomain.lng interface/web/sites/lib/lang/fr_web_vhost_subdomain_list.lng interface/web/themes/blue/ispconfig_version server/plugins-available/apache2_plugin.inc.php server/plugins-available/nginx_plugin.inc.php
2 parents b18806e + 9b68660 commit 9b3069a

File tree

208 files changed

+1524
-1423
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

208 files changed

+1524
-1423
lines changed

TODO.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ Uninstaller
2222
Server
2323
--------------------------------------
2424

25-
- Add a backend plugin to configure network card settings. The IP address
26-
settings are stored in the server_ip table.
27-
-- This works now on Debian and Ubuntu Linux.
28-
2925

3026
Mail module
3127
--------------------------------------

install/dist/lib/debian60.lib.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public function configure_dovecot()
118118
chgrp($config_dir.'/'.$configfile, 'root');
119119

120120
// Dovecot shall ignore mounts in website directory
121-
exec("doveadm mount add '/var/www/*' ignore");
121+
if(is_installed('doveadm')) exec("doveadm mount add '/var/www/*' ignore > /dev/null 2> /dev/null");
122122

123123
}
124124

install/lib/installer_base.lib.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -633,6 +633,7 @@ public function configure_mailman($status = 'insert') {
633633

634634
//* Create aliasaes
635635
exec('/usr/lib/mailman/bin/genaliases 2>/dev/null');
636+
if(is_file('/var/lib/mailman/data/virtual-mailman')) exec('postmap /var/lib/mailman/data/virtual-mailman');
636637

637638
}
638639

@@ -1007,7 +1008,7 @@ public function configure_dovecot() {
10071008
chgrp($config_dir.'/'.$configfile, 'root');
10081009

10091010
// Dovecot shall ignore mounts in website directory
1010-
exec("doveadm mount add '/var/www/*' ignore");
1011+
if(is_installed('doveadm')) exec("doveadm mount add '/var/www/*' ignore > /dev/null 2> /dev/null");
10111012

10121013
}
10131014

install/tpl/fedora_dovecot2.conf.master

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ protocol pop3 {
5151
}
5252
protocol lda {
5353
mail_plugins = sieve quota
54+
postmaster_address = root@localhost
5455
}
5556
protocol lmtp {
5657
postmaster_address = webmaster@localhost

interface/lib/classes/ispcmail.inc.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -593,18 +593,18 @@ private function _smtp_login() {
593593
$response = fgets($this->_smtp_conn, 515);
594594
if(empty($this->_smtp_conn)) return false;
595595

596+
//Say Hello to SMTP
597+
if($this->smtp_helo == '') $this->detectHelo();
598+
fputs($this->_smtp_conn, 'HELO ' . $this->smtp_helo . $this->_crlf);
599+
$response = fgets($this->_smtp_conn, 515);
600+
596601
// ENCRYPTED?
597602
if($this->smtp_crypt == 'tls') {
598603
fputs($this->_smtp_conn, 'STARTTLS' . $this->_crlf);
599604
fgets($this->_smtp_conn, 515);
600605
stream_socket_enable_crypto($this->_smtp_conn, true, STREAM_CRYPTO_METHOD_TLS_CLIENT);
601606
}
602607

603-
//Say Hello to SMTP
604-
if($this->smtp_helo == '') $this->detectHelo();
605-
fputs($this->_smtp_conn, 'HELO ' . $this->smtp_helo . $this->_crlf);
606-
$response = fgets($this->_smtp_conn, 515);
607-
608608
//AUTH LOGIN
609609
fputs($this->_smtp_conn, 'AUTH LOGIN' . $this->_crlf);
610610
$response = fgets($this->_smtp_conn, 515);

interface/lib/lang/el.lng

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -69,70 +69,70 @@ $wb['monthnamesshort_oct'] = 'Οκτ';
6969
$wb['monthnamesshort_nov'] = 'Νοε';
7070
$wb['monthnamesshort_dec'] = 'Δεκ';
7171
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
72-
$wb['logout_txt'] = 'Αποσύνδεση';
73-
$wb['submit_confirmation'] = 'Είστε σίγουροι ότι θέλετε να κάνετε αυτή την ενέργεια?';
72+
$wb['logout_txt'] = 'Logout';
73+
$wb['submit_confirmation'] = 'Do you really want to perform this action?';
7474
$wb['top_menu_mailuser'] = 'Mailuser';
75-
$wb['globalsearch_resultslimit_of_txt'] = 'από';
76-
$wb['globalsearch_resultslimit_results_txt'] = 'αποτελέσματα';
77-
$wb['globalsearch_noresults_text_txt'] = 'Δεν υπάρχουν αποτελέσματα.';
78-
$wb['globalsearch_noresults_limit_txt'] = '0 αποτελέσματα';
79-
$wb['globalsearch_searchfield_watermark_txt'] = 'Αναζήτηση';
80-
$wb['globalsearch_suggestions_text_txt'] = 'Προτάσεις';
81-
$wb['global_tabchange_warning_txt'] = 'Τα τροποποιημένα δεδομένα σε αυτή την καρτέλα θα αλλάξουν οριστικά αν πατήσετε ΟΚ. Πατήσετε Άκυρο για να μην συμβεί αυτό..';
82-
$wb['global_tabchange_discard_txt'] = 'Έχετε μη αποθηκευμένες αλλαγές σε αυτή την καρτέλα. Οι αλλαγές θα χαθούν αν συνεχίσετε.';
83-
$wb['datalog_changes_txt'] = 'Οι επόμενες αλλαγές δεν έχουν προωθηθεί στους servers:';
84-
$wb['datalog_changes_end_txt'] = 'Η αποθήκευση των ενημερώσεων μπορεί να διαρκέσει μεχρι και ένα λεπτό. Παρακαλούμε να είστε υπομονετικοί.';
85-
$wb['datalog_status_i_web_database'] = 'Δημιουργία νέας Βάσης Δεδομένων (ΒΔ)';
86-
$wb['datalog_status_u_web_database'] = 'Ενημέρωση Βάσης Δεδομένων';
87-
$wb['datalog_status_d_web_database'] = 'Διαγραφή Βάσης Δεδομένων';
88-
$wb['datalog_status_i_web_database_user'] = 'Δημιουργία χρήστη για την Βάση Δεδομένων';
89-
$wb['datalog_status_u_web_database_user'] = 'Ενημέρωση χρήστη Βάσης Δεδομένων';
90-
$wb['datalog_status_d_web_database_user'] = 'Διαγραφή χρήστη Βάσης Δεδομένων';
91-
$wb['datalog_status_i_web_domain'] = 'Δημιουργία νέου website';
92-
$wb['datalog_status_u_web_domain'] = 'Ενημέρωση ρυθμίσεων website';
93-
$wb['datalog_status_d_web_domain'] = 'Διαγραφή website';
94-
$wb['datalog_status_i_ftp_user'] = 'Δημιουργία χρήστη FTP';
95-
$wb['datalog_status_u_ftp_user'] = 'Ενημέρωση FTP user';
96-
$wb['datalog_status_d_ftp_user'] = 'Διαγραφή FTP user';
97-
$wb['datalog_status_i_mail_domain'] = 'Δημιουργία email domain';
98-
$wb['datalog_status_u_mail_domain'] = 'Ενημέρωση email domain';
99-
$wb['datalog_status_d_mail_domain'] = 'Διαγραφή email domain';
100-
$wb['datalog_status_i_mail_user'] = 'Δημιουργία χρήστη email';
101-
$wb['datalog_status_u_mail_user'] = 'Ενημέρωση χρήστη email';
102-
$wb['datalog_status_d_mail_user'] = 'Διαγραφή χρήστη email';
103-
$wb['datalog_status_i_mail_forwarding'] = 'Δημιουργία διεύθυνσης email';
104-
$wb['datalog_status_u_mail_forwarding'] = 'Ενημέρωση διεύθυνσης email';
105-
$wb['datalog_status_d_mail_forwarding'] = 'Διαγραφή διεύθυνσης email';
106-
$wb['datalog_status_i_dns_rr'] = 'Δημιουργία εγγραφής DNS';
107-
$wb['datalog_status_u_dns_rr'] = 'Ενημέρωση εγγραφής DNS';
108-
$wb['datalog_status_d_dns_rr'] = 'Διαγραφή εγγραφής DNS';
109-
$wb['datalog_status_i_dns_soa'] = 'Δημιουργία ζώνης DNS';
110-
$wb['datalog_status_u_dns_soa'] = 'Ενημέρωση ζώνης DNS';
111-
$wb['datalog_status_d_dns_soa'] = 'Διαγραφή ζώνης DNS';
112-
$wb['datalog_status_i_cron'] = 'Δημιουργία εργασίας cron';
113-
$wb['datalog_status_u_cron'] = 'Ενημέρωση εργασίας cron';
114-
$wb['datalog_status_d_cron'] = 'Διαγραφή εργασίας cron';
115-
$wb['datalog_status_i_mail_get'] = 'Δημιουργία δημιουργία λογαριασμού mail fetcher';
116-
$wb['datalog_status_u_mail_get'] = 'Ενημέρωση δημιουργία λογαριασμού mail fetcher';
117-
$wb['datalog_status_d_mail_get'] = 'Διαγραφή δημιουργία λογαριασμού mail fetcher';
118-
$wb['datalog_status_i_mail_mailinglist'] = 'Δημιουργία λίστας mail';
119-
$wb['datalog_status_u_mail_mailinglist'] = 'Ενημέρωση λίστας mail';
120-
$wb['datalog_status_d_mail_mailinglist'] = 'Διαγραφή λίστας mail';
121-
$wb['datalog_status_i_shell_user'] = 'Δημιουργία χρήστη shell';
122-
$wb['datalog_status_u_shell_user'] = 'Ενημέρωση χρήστη shell';
123-
$wb['datalog_status_d_shell_user'] = 'Διαγραφή χρήστη shell';
124-
$wb['datalog_status_i_web_folder'] = 'Δημιουργία προστασίας φακέλου';
125-
$wb['datalog_status_u_web_folder'] = 'Ενημέρωση προστασίας φακέλου';
126-
$wb['datalog_status_d_web_folder'] = 'Διαγραφή προστασίας φακέλου';
127-
$wb['datalog_status_i_web_folder_user'] = 'Δημιουργία χρήστη προστασίας φακέλου';
128-
$wb['datalog_status_u_web_folder_user'] = 'Ενημέρωση χρήστη προστασίας φακέλου';
129-
$wb['datalog_status_d_web_folder_user'] = 'Διαγραφή χρήστη προστασίας φακέλου';
130-
$wb['datalog_status_i_spamfilter_users'] = 'Δημιουργία ρυθμίσεων φίλτρου spam';
131-
$wb['datalog_status_u_spamfilter_users'] = 'Ενημέρωση ρυθμίσεων φίλτρου spam';
132-
$wb['datalog_status_d_spamfilter_users'] = 'Διαγραφή ρυθμίσεων φίλτρου spam';
133-
$wb['login_as_txt'] = 'Είσοδος ως';
134-
$wb['no_domain_perm'] = 'Δεν έχετε δικαιώματα για αυτό το domain.';
135-
$wb['no_destination_perm'] = 'Δεν έχετε δικαιώματα για αυτόν τον προορισμό.';
75+
$wb['globalsearch_resultslimit_of_txt'] = 'of';
76+
$wb['globalsearch_resultslimit_results_txt'] = 'results';
77+
$wb['globalsearch_noresults_text_txt'] = 'No results.';
78+
$wb['globalsearch_noresults_limit_txt'] = '0 results';
79+
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
80+
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
81+
$wb['global_tabchange_warning_txt'] = 'Changed data in this tab will be changed if you press OK. On cancel they will be discarded.';
82+
$wb['global_tabchange_discard_txt'] = 'You have unsaved changes in this tab. Changes will be discarded if you continue.';
83+
$wb['datalog_changes_txt'] = 'The following changes are not yet populated to all servers:';
84+
$wb['datalog_changes_end_txt'] = 'Storing updates can take up to one minute. Please be patient.';
85+
$wb['datalog_status_i_web_database'] = 'Create new database';
86+
$wb['datalog_status_u_web_database'] = 'Update database';
87+
$wb['datalog_status_d_web_database'] = 'Delete database';
88+
$wb['datalog_status_i_web_database_user'] = 'Create database user for database';
89+
$wb['datalog_status_u_web_database_user'] = 'Update database user';
90+
$wb['datalog_status_d_web_database_user'] = 'Delete database user';
91+
$wb['datalog_status_i_web_domain'] = 'Create new website';
92+
$wb['datalog_status_u_web_domain'] = 'Update website settings';
93+
$wb['datalog_status_d_web_domain'] = 'Delete website';
94+
$wb['datalog_status_i_ftp_user'] = 'Create FTP user';
95+
$wb['datalog_status_u_ftp_user'] = 'Update FTP user';
96+
$wb['datalog_status_d_ftp_user'] = 'Delete FTP user';
97+
$wb['datalog_status_i_mail_domain'] = 'Create email domain';
98+
$wb['datalog_status_u_mail_domain'] = 'Update email domain';
99+
$wb['datalog_status_d_mail_domain'] = 'Delete email domain';
100+
$wb['datalog_status_i_mail_user'] = 'Create email user';
101+
$wb['datalog_status_u_mail_user'] = 'Update email user';
102+
$wb['datalog_status_d_mail_user'] = 'Delete email user';
103+
$wb['datalog_status_i_mail_forwarding'] = 'Create email address';
104+
$wb['datalog_status_u_mail_forwarding'] = 'Update email address';
105+
$wb['datalog_status_d_mail_forwarding'] = 'Delete email address';
106+
$wb['datalog_status_i_dns_rr'] = 'Create DNS record';
107+
$wb['datalog_status_u_dns_rr'] = 'Update DNS record';
108+
$wb['datalog_status_d_dns_rr'] = 'Delete DNS record';
109+
$wb['datalog_status_i_dns_soa'] = 'Create DNS zone';
110+
$wb['datalog_status_u_dns_soa'] = 'Update DNS zone';
111+
$wb['datalog_status_d_dns_soa'] = 'Delete DNS zone';
112+
$wb['datalog_status_i_cron'] = 'Create cron job';
113+
$wb['datalog_status_u_cron'] = 'Update cron job';
114+
$wb['datalog_status_d_cron'] = 'Delete cron job';
115+
$wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
116+
$wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
117+
$wb['datalog_status_d_mail_get'] = 'Delete mail fetcher account';
118+
$wb['datalog_status_i_mail_mailinglist'] = 'Create mailing list';
119+
$wb['datalog_status_u_mail_mailinglist'] = 'Update mailing list';
120+
$wb['datalog_status_d_mail_mailinglist'] = 'Delete mailing list';
121+
$wb['datalog_status_i_shell_user'] = 'Create shell user';
122+
$wb['datalog_status_u_shell_user'] = 'Update shell user';
123+
$wb['datalog_status_d_shell_user'] = 'Delete shell user';
124+
$wb['datalog_status_i_web_folder'] = 'Create folder protection';
125+
$wb['datalog_status_u_web_folder'] = 'Update folder protection';
126+
$wb['datalog_status_d_web_folder'] = 'Delete folder protection';
127+
$wb['datalog_status_i_web_folder_user'] = 'Create folder protection user';
128+
$wb['datalog_status_u_web_folder_user'] = 'Update folder protection user';
129+
$wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user';
130+
$wb['datalog_status_i_spamfilter_users'] = 'Create spam filter settings';
131+
$wb['datalog_status_u_spamfilter_users'] = 'Update spam filter settings';
132+
$wb['datalog_status_d_spamfilter_users'] = 'Delete spam filter settings';
133+
$wb['login_as_txt'] = 'Log in as';
134+
$wb['no_domain_perm'] = 'You have no permission for this domain.';
135+
$wb['no_destination_perm'] = 'You have no permission for this destination.';
136136
$wb['client_you_are_locked'] = 'You have no permission to change any settings.';
137137
$wb['gender_m_txt'] = 'Mr.';
138138
$wb['gender_f_txt'] = 'Ms.';
@@ -145,6 +145,6 @@ $wb['strength_2'] = 'Fair';
145145
$wb['strength_3'] = 'Good';
146146
$wb['strength_4'] = 'Strong';
147147
$wb['strength_5'] = 'Very Strong';
148-
$wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \\"{strength}\\".';
148+
$wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \"{strength}\".';
149149
$wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
150150
?>

0 commit comments

Comments
 (0)