Skip to content

Commit 31e0d15

Browse files
tbrehmtbrehm
committed
Merged revisions 2911-2912 from stable branch.
1 parent 355efb9 commit 31e0d15

11 files changed

+279
-9
lines changed

‎install/dist/lib/debian60.lib.php‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,20 @@ public function configure_dovecot()
7676
if(is_file($config_dir.'/'.$configfile)){
7777
copy($config_dir.'/'.$configfile, $config_dir.'/'.$configfile.'~');
7878
}
79-
copy('tpl/debian6_dovecot.conf.master',$config_dir.'/'.$configfile);
79+
80+
//* Get the dovecot version
81+
exec('dovecot --version',$tmp);
82+
$parts = explode('.',trim($tmp[0]));
83+
$dovecot_version = $parts[0];
84+
unset($tmp);
85+
unset($parts);
86+
87+
//* Copy dovecot configuration file
88+
if($dovecot_version == 2) {
89+
copy('tpl/debian6_dovecot2.conf.master',$config_dir.'/'.$configfile);
90+
} else {
91+
copy('tpl/debian6_dovecot.conf.master',$config_dir.'/'.$configfile);
92+
}
8093

8194
//* dovecot-sql.conf
8295
$configfile = 'dovecot-sql.conf';

‎install/dist/lib/fedora.lib.php‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,12 +308,25 @@ public function configure_dovecot()
308308
caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
309309
}
310310

311-
//* copy dovecot.conf
311+
//* backup dovecot.conf
312312
$configfile = 'dovecot.conf';
313313
if(is_file("$config_dir/$configfile")){
314314
copy("$config_dir/$configfile", "$config_dir/$configfile~");
315315
}
316-
copy('tpl/fedora_dovecot.conf.master',"$config_dir/$configfile");
316+
317+
//* Get the dovecot version
318+
exec('dovecot --version',$tmp);
319+
$parts = explode('.',trim($tmp[0]));
320+
$dovecot_version = $parts[0];
321+
unset($tmp);
322+
unset($parts);
323+
324+
//* Copy dovecot configuration file
325+
if($dovecot_version == 2) {
326+
copy('tpl/fedora_dovecot2.conf.master',$config_dir.'/'.$configfile);
327+
} else {
328+
copy('tpl/fedora_dovecot.conf.master',$config_dir.'/'.$configfile);
329+
}
317330

318331
//* dovecot-sql.conf
319332
$configfile = 'dovecot-sql.conf';

‎install/dist/lib/opensuse.lib.php‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,12 +349,25 @@ public function configure_dovecot()
349349
caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
350350
}
351351

352-
//* copy dovecot.conf
352+
//* backup dovecot.conf
353353
$configfile = 'dovecot.conf';
354354
if(is_file("$config_dir/$configfile")){
355355
copy("$config_dir/$configfile", "$config_dir/$configfile~");
356356
}
357-
copy('tpl/opensuse_dovecot.conf.master',"$config_dir/$configfile");
357+
358+
//* Get the dovecot version
359+
exec('dovecot --version',$tmp);
360+
$parts = explode('.',trim($tmp[0]));
361+
$dovecot_version = $parts[0];
362+
unset($tmp);
363+
unset($parts);
364+
365+
//* Copy dovecot configuration file
366+
if($dovecot_version == 2) {
367+
copy('tpl/opensuse_dovecot2.conf.master',$config_dir.'/'.$configfile);
368+
} else {
369+
copy('tpl/opensuse_dovecot.conf.master',$config_dir.'/'.$configfile);
370+
}
358371

359372
//* dovecot-sql.conf
360373
$configfile = 'dovecot-sql.conf';

‎install/lib/installer_base.lib.php‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -895,12 +895,25 @@ public function configure_dovecot() {
895895
caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
896896
}
897897

898-
//* copy dovecot.conf
898+
//* backup dovecot.conf
899899
$configfile = 'dovecot.conf';
900900
if(is_file($config_dir.'/'.$configfile)) {
901901
copy($config_dir.'/'.$configfile, $config_dir.'/'.$configfile.'~');
902902
}
903-
copy('tpl/debian_dovecot.conf.master',$config_dir.'/'.$configfile);
903+
904+
//* Get the dovecot version
905+
exec('dovecot --version',$tmp);
906+
$parts = explode('.',trim($tmp[0]));
907+
$dovecot_version = $parts[0];
908+
unset($tmp);
909+
unset($parts);
910+
911+
//* Copy dovecot configuration file
912+
if($dovecot_version == 2) {
913+
copy('tpl/debian_dovecot2.conf.master',$config_dir.'/'.$configfile);
914+
} else {
915+
copy('tpl/debian_dovecot.conf.master',$config_dir.'/'.$configfile);
916+
}
904917

905918
//* dovecot-sql.conf
906919
$configfile = 'dovecot-sql.conf';

‎install/tpl/debian6_dovecot2.conf.master‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
protocols = imap pop3
2+
auth_mechanisms = plain login
3+
disable_plaintext_auth = no
4+
log_timestamp = "%Y-%m-%d %H:%M:%S "
5+
mail_privileged_group = vmail
6+
ssl_cert = </etc/postfix/smtpd.cert
7+
ssl_key = </etc/postfix/smtpd.key
8+
passdb {
9+
args = /etc/dovecot/dovecot-sql.conf
10+
driver = sql
11+
}
12+
userdb {
13+
args = /etc/dovecot/dovecot-sql.conf
14+
driver = sql
15+
}
16+
plugin {
17+
quota = dict:user::file:/var/vmail/%d/%n/.quotausage
18+
sieve=/var/vmail/%d/%n/.sieve
19+
}
20+
service auth {
21+
unix_listener /var/spool/postfix/private/auth {
22+
group = postfix
23+
mode = 0660
24+
user = postfix
25+
}
26+
unix_listener auth-userdb {
27+
group = vmail
28+
mode = 0600
29+
user = vmail
30+
}
31+
user = root
32+
}
33+
protocol imap {
34+
mail_plugins = quota imap_quota
35+
}
36+
protocol pop3 {
37+
pop3_uidl_format = %08Xu%08Xv
38+
mail_plugins = quota
39+
}
40+
protocol lda {
41+
mail_plugins = sieve quota
42+
}

‎install/tpl/debian_dovecot2.conf.master‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
protocols = imap pop3
2+
auth_mechanisms = plain login
3+
disable_plaintext_auth = no
4+
log_timestamp = "%Y-%m-%d %H:%M:%S "
5+
mail_privileged_group = vmail
6+
ssl_cert = </etc/postfix/smtpd.cert
7+
ssl_key = </etc/postfix/smtpd.key
8+
passdb {
9+
args = /etc/dovecot/dovecot-sql.conf
10+
driver = sql
11+
}
12+
userdb {
13+
args = /etc/dovecot/dovecot-sql.conf
14+
driver = sql
15+
}
16+
plugin {
17+
quota = dict:user::file:/var/vmail/%d/%n/.quotausage
18+
sieve=/var/vmail/%d/%n/.sieve
19+
}
20+
service auth {
21+
unix_listener /var/spool/postfix/private/auth {
22+
group = postfix
23+
mode = 0660
24+
user = postfix
25+
}
26+
unix_listener auth-userdb {
27+
group = vmail
28+
mode = 0600
29+
user = vmail
30+
}
31+
user = root
32+
}
33+
protocol imap {
34+
mail_plugins = quota imap_quota
35+
}
36+
protocol pop3 {
37+
pop3_uidl_format = %08Xu%08Xv
38+
mail_plugins = quota
39+
}
40+
protocol lda {
41+
mail_plugins = sieve quota
42+
}

‎install/tpl/fedora_dovecot2.conf.master‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
protocols = imap pop3
2+
auth_mechanisms = plain login
3+
disable_plaintext_auth = no
4+
log_timestamp = "%Y-%m-%d %H:%M:%S "
5+
mail_privileged_group = vmail
6+
ssl_cert = </etc/postfix/smtpd.cert
7+
ssl_key = </etc/postfix/smtpd.key
8+
passdb {
9+
args = /etc/dovecot-sql.conf
10+
driver = sql
11+
}
12+
userdb {
13+
args = /etc/dovecot-sql.conf
14+
driver = sql
15+
}
16+
plugin {
17+
quota = dict:user::file:/var/vmail/%d/%n/.quotausage
18+
sieve=/var/vmail/%d/%n/.sieve
19+
}
20+
service auth {
21+
unix_listener /var/spool/postfix/private/auth {
22+
group = postfix
23+
mode = 0660
24+
user = postfix
25+
}
26+
unix_listener auth-userdb {
27+
group = vmail
28+
mode = 0600
29+
user = vmail
30+
}
31+
user = root
32+
}
33+
protocol imap {
34+
mail_plugins = quota imap_quota
35+
}
36+
protocol pop3 {
37+
pop3_uidl_format = %08Xu%08Xv
38+
mail_plugins = quota
39+
}
40+
protocol lda {
41+
mail_plugins = sieve quota
42+
}

‎install/tpl/opensuse_dovecot2.conf.master‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
protocols = imap pop3
2+
auth_mechanisms = plain login
3+
disable_plaintext_auth = no
4+
log_timestamp = "%Y-%m-%d %H:%M:%S "
5+
mail_privileged_group = vmail
6+
ssl_cert = </etc/postfix/smtpd.cert
7+
ssl_key = </etc/postfix/smtpd.key
8+
passdb {
9+
args = /etc/dovecot/dovecot-sql.conf
10+
driver = sql
11+
}
12+
userdb {
13+
args = /etc/dovecot/dovecot-sql.conf
14+
driver = sql
15+
}
16+
plugin {
17+
quota = dict:user::file:/var/vmail/%d/%n/.quotausage
18+
sieve=/var/vmail/%d/%n/.sieve
19+
}
20+
service auth {
21+
unix_listener /var/spool/postfix/private/auth {
22+
group = postfix
23+
mode = 0660
24+
user = postfix
25+
}
26+
unix_listener auth-userdb {
27+
group = vmail
28+
mode = 0600
29+
user = vmail
30+
}
31+
user = root
32+
}
33+
protocol imap {
34+
mail_plugins = quota imap_quota
35+
}
36+
protocol pop3 {
37+
pop3_uidl_format = %08Xu%08Xv
38+
mail_plugins = quota
39+
}
40+
protocol lda {
41+
mail_plugins = sieve quota
42+
}

‎interface/web/sites/templates/web_aliasdomain_edit.htm‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,12 @@ <h2><tmpl_var name="list_head_txt"></h2>
7575
jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) {
7676
var selected = jQuery('#redirect_type').val();
7777
if(data.servertype == "nginx"){
78-
jQuery('#redirect_type option[value="R"]').hide();
78+
jQuery("#redirect_type option[value='R']").attr('disabled','disabled');
79+
jQuery('#redirect_type option[value="L"]').attr('disabled','disabled');
80+
jQuery('#redirect_type option[value="R,L"]').attr('disabled','disabled');
81+
jQuery('#redirect_type option[value="R=301,L"]').attr('disabled','disabled');
82+
83+
jQuery("#redirect_type option[value='R']").hide();
7984
jQuery('#redirect_type option[value="L"]').hide();
8085
jQuery('#redirect_type option[value="R,L"]').hide();
8186
jQuery('#redirect_type option[value="R=301,L"]').hide();
@@ -85,8 +90,18 @@ <h2><tmpl_var name="list_head_txt"></h2>
8590
jQuery('#redirect_type option[value="redirect"]').show();
8691
jQuery('#redirect_type option[value="permanent"]').show();
8792

93+
jQuery('#redirect_type option[value="last"]').attr('disabled',false);
94+
jQuery('#redirect_type option[value="break"]').attr('disabled',false);
95+
jQuery('#redirect_type option[value="redirect"]').attr('disabled',false);
96+
jQuery('#redirect_type option[value="permanent"]').attr('disabled',false);
97+
8898
if(selected != "no" && selected != "" && selected != "last" && selected != "break" && selected != "redirect" && selected != "permanent") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
8999
} else {
100+
jQuery('#redirect_type option[value="last"]').attr('disabled','disabled');
101+
jQuery('#redirect_type option[value="break"]').attr('disabled','disabled');
102+
jQuery('#redirect_type option[value="redirect"]').attr('disabled','disabled');
103+
jQuery('#redirect_type option[value="permanent"]').attr('disabled','disabled');
104+
90105
jQuery('#redirect_type option[value="last"]').hide();
91106
jQuery('#redirect_type option[value="break"]').hide();
92107
jQuery('#redirect_type option[value="redirect"]').hide();
@@ -97,6 +112,11 @@ <h2><tmpl_var name="list_head_txt"></h2>
97112
jQuery('#redirect_type option[value="R,L"]').show();
98113
jQuery('#redirect_type option[value="R=301,L"]').show();
99114

115+
jQuery('#redirect_type option[value="R"]').attr('disabled',false);
116+
jQuery('#redirect_type option[value="L"]').attr('disabled',false);
117+
jQuery('#redirect_type option[value="R,L"]').attr('disabled',false);
118+
jQuery('#redirect_type option[value="R=301,L"]').attr('disabled',false);
119+
100120
if(selected != "no" && selected != "" && selected != "R" && selected != "L" && selected != "R,L" && selected != "R=301,L") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
101121
}
102122
});

‎interface/web/sites/templates/web_domain_redirect.htm‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,22 @@ <h2><tmpl_var name="list_head_txt"></h2>
4848
jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) {
4949
var selected = jQuery('#redirect_type').val();
5050
if(data.servertype == "nginx"){
51+
jQuery("#redirect_type option[value='R']").attr('disabled','disabled');
52+
jQuery('#redirect_type option[value="L"]').attr('disabled','disabled');
53+
jQuery('#redirect_type option[value="R,L"]').attr('disabled','disabled');
54+
jQuery('#redirect_type option[value="R=301,L"]').attr('disabled','disabled');
55+
5156
jQuery('#redirect_type option[value="R"]').hide();
5257
jQuery('#redirect_type option[value="L"]').hide();
5358
jQuery('#redirect_type option[value="R,L"]').hide();
5459
jQuery('#redirect_type option[value="R=301,L"]').hide();
5560
if(selected != "no" && selected != "" && selected != "last" && selected != "break" && selected != "redirect" && selected != "permanent") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
5661
} else {
62+
jQuery('#redirect_type option[value="last"]').attr('disabled','disabled');
63+
jQuery('#redirect_type option[value="break"]').attr('disabled','disabled');
64+
jQuery('#redirect_type option[value="redirect"]').attr('disabled','disabled');
65+
jQuery('#redirect_type option[value="permanent"]').attr('disabled','disabled');
66+
5767
jQuery('#redirect_type option[value="last"]').hide();
5868
jQuery('#redirect_type option[value="break"]').hide();
5969
jQuery('#redirect_type option[value="redirect"]').hide();

0 commit comments

Comments
 (0)