Skip to content

Commit 26c0fc9

Browse files
tbrehmtbrehm
committed
Merged revisions 3100-3175 from stable branch.
1 parent c2568b0 commit 26c0fc9

Some content is hidden

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

52 files changed

+643
-468
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,10 @@ public function configure_apache()
542542
replaceLine('/etc/suphp.conf','umask=0077','umask=0022',0);
543543
//}
544544

545+
if(!file_exists('/srv/www/cgi-bin/php5') && file_exists('/srv/www/cgi-bin/php')) {
546+
symlink('/srv/www/cgi-bin/php','/srv/www/cgi-bin/php5');
547+
}
548+
545549
// Sites enabled and available dirs
546550
exec('mkdir -p '.$conf['apache']['vhost_conf_enabled_dir']);
547551
exec('mkdir -p '.$conf['apache']['vhost_conf_dir']);

‎install/install.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@
315315
if($conf['courier']['courier-pop'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
316316
if($conf['courier']['courier-pop-ssl'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
317317
if($conf['dovecot']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['dovecot']['init_script'])) system($conf['init_scripts'].'/'.$conf['dovecot']['init_script'].' restart');
318-
if($conf['mailman']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mailman']['init_script'])) system($conf['init_scripts'].'/'.$conf['mailman']['init_script'].' restart');
318+
if($conf['mailman']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mailman']['init_script'])) system('nohup '.$conf['init_scripts'].'/'.$conf['mailman']['init_script'].' restart >/dev/null 2>&1 &');
319319
if($conf['apache']['installed'] == true && $conf['apache']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['apache']['init_script'])) system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
320320
//* Reload is enough for nginx
321321
if($conf['nginx']['installed'] == true){
@@ -453,7 +453,7 @@
453453
if($conf['courier']['courier-pop'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
454454
if($conf['courier']['courier-pop-ssl'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
455455
if($conf['dovecot']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['dovecot']['init_script'])) system($conf['init_scripts'].'/'.$conf['dovecot']['init_script'].' restart');
456-
if($conf['mailman']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mailman']['init_script'])) system($conf['init_scripts'].'/'.$conf['mailman']['init_script'].' restart');
456+
if($conf['mailman']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mailman']['init_script'])) system('nohup '.$conf['init_scripts'].'/'.$conf['mailman']['init_script'].' restart >/dev/null 2>&1 &');
457457
}
458458

459459
//** Configure Jailkit

‎install/lib/installer_base.lib.php‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -775,9 +775,22 @@ public function configure_postfix($options = '') {
775775

776776
public function configure_saslauthd() {
777777
global $conf;
778+
779+
//* Get saslsauthd version
780+
exec('saslauthd -v 2>&1',$out);
781+
$parts = explode(' ',$out[0]);
782+
$saslversion = $parts[1];
783+
unset($parts);
784+
unset($out);
778785

779-
780-
$configfile = 'sasl_smtpd.conf';
786+
if(version_compare($saslversion , '2.1.23') > 0) {
787+
//* Configfile for saslauthd versions 2.1.24 and newer
788+
$configfile = 'sasl_smtpd2.conf';
789+
} else {
790+
//* Configfile for saslauthd versions up to 2.1.23
791+
$configfile = 'sasl_smtpd.conf';
792+
}
793+
781794
if(is_file($conf['postfix']['config_dir'].'/sasl/smtpd.conf')) copy($conf['postfix']['config_dir'].'/sasl/smtpd.conf',$conf['postfix']['config_dir'].'/sasl/smtpd.conf~');
782795
if(is_file($conf['postfix']['config_dir'].'/sasl/smtpd.conf~')) chmod($conf['postfix']['config_dir'].'/sasl/smtpd.conf~', 0400);
783796
$content = rf('tpl/'.$configfile.'.master');
@@ -1417,7 +1430,7 @@ public function configure_vlogger() {
14171430
$content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content);
14181431
$content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content);
14191432
$content = str_replace('{mysql_server_database}',$conf['mysql']['database'],$content);
1420-
$content = str_replace('{mysql_server_ip}',$conf['mysql']['host'],$content);
1433+
$content = str_replace('{mysql_server_ip}',$conf['mysql']['ip'],$content);
14211434
}
14221435
wf($conf['vlogger']['config_dir'].'/'.$configfile,$content);
14231436
chmod($conf['vlogger']['config_dir'].'/'.$configfile, 0600);

‎install/sql/ispconfig3.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2065,6 +2065,6 @@ INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`,
20652065
-- Dumping data for table `sys_config`
20662066
--
20672067

2068-
INSERT INTO sys_config VALUES ('1','db','db_version','3.0.4.4');
2068+
INSERT INTO sys_config VALUES ('1','db','db_version','3.0.4.5');
20692069

20702070
SET FOREIGN_KEY_CHECKS = 1;

‎install/tpl/apache_ispconfig.conf.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
################################################
66

77
LogFormat "%v %h %l %u %t \"%r\" %>s %B \"%{Referer}i\" \"%{User-Agent}i\"" combined_ispconfig
8-
CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m%d-access.log\" -d \"/etc/vlogger-dbi.conf\" /var/log/ispconfig/httpd" combined_ispconfig
8+
CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m%d-access.log\" /var/log/ispconfig/httpd" combined_ispconfig
99

1010
<Directory /var/www/clients>
1111
AllowOverride None

‎install/tpl/config.inc.php.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ $revision = str_replace(array('Revision:','$',' '), '', $svn_revision);
5656

5757
//** Application
5858
define('ISPC_APP_TITLE', 'ISPConfig');
59-
define('ISPC_APP_VERSION', '3.0.4.4');
59+
define('ISPC_APP_VERSION', '3.0.4.5');
6060
define('DEVSYSTEM', 0);
6161

6262

‎install/tpl/sasl_smtpd2.conf.master‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
pwcheck_method: saslauthd
2+
mech_list: plain login
3+
allow_plaintext: true
4+
auxprop_plugin: sql
5+
sql_engine: mysql
6+
sql_hostnames: {mysql_server_ip}
7+
sql_user: {mysql_server_ispconfig_user}
8+
sql_passwd: {mysql_server_ispconfig_password}
9+
sql_database: {mysql_server_database}
10+
sql_select: select password from mail_user where login = '%u@%r' and postfix = 'y'

‎install/tpl/server.ini.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ nginx_group=www-data
5454
apps_vhost_port=8081
5555
apps_vhost_ip=_default_
5656
apps_vhost_servername=
57-
php_open_basedir=[website_path]/web:[website_path]/tmp:/var/www/[website_domain]/web:/srv/www/[website_domain]/web:/usr/share/php5:/tmp:/usr/share/phpmyadmin:/etc/phpmyadmin:/var/lib/phpmyadmin
57+
php_open_basedir=[website_path]/web:[website_path]/tmp:/var/www/[website_domain]/web:/srv/www/[website_domain]/web:/usr/share/php5:/tmp:/usr/share/phpmyadmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/usr/share/php
5858
htaccess_allow_override=All
5959
awstats_conf_dir=/etc/awstats
6060
awstats_data_dir=/var/lib/awstats

‎install/update.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@
402402
if($conf['courier']['courier-pop'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
403403
if($conf['courier']['courier-pop-ssl'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
404404
if($conf['dovecot']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['dovecot']['init_script'])) system($conf['init_scripts'].'/'.$conf['dovecot']['init_script'].' restart');
405-
if($conf['mailman']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mailman']['init_script'])) system($conf['init_scripts'].'/'.$conf['mailman']['init_script'].' restart');
405+
if($conf['mailman']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mailman']['init_script'])) system('nohup '.$conf['init_scripts'].'/'.$conf['mailman']['init_script'].' restart >/dev/null 2>&1 &');
406406
}
407407
if($conf['services']['web']) {
408408
if($conf['webserver']['server_type'] == 'apache' && $conf['apache']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['apache']['init_script'])) system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');

‎interface/lib/classes/functions.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public function currency_format($number) {
101101
}
102102

103103
public function get_ispconfig_url() {
104-
$url = (stristr($_SERVER['SERVER_PROTOCOL'],'HTTPS'))?'https':'http';
104+
$url = (stristr($_SERVER['SERVER_PROTOCOL'],'HTTPS') || stristr($_SERVER['HTTPS'],'on'))?'https':'http';
105105
$url .= '://'.$_SERVER['SERVER_NAME'];
106106
if($_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443) {
107107
$url .= ':'.$_SERVER['SERVER_PORT'];

0 commit comments

Comments
 (0)