Skip to content

Commit f3e2d13

Browse files
author
Marius Burkard
committed
Merge branch 'stable-3.1'
2 parents b5b16ef + 3bd0d08 commit f3e2d13

File tree

487 files changed

+1023
-932
lines changed

Some content is hidden

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

487 files changed

+1023
-932
lines changed

‎install/lib/installer_base.lib.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,7 @@ public function grant_master_database_rights($verbose = false) {
587587
$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
588588
}
589589

590-
$query = "GRANT SELECT, UPDATE (`ssl_request`, `ssl_cert`, `ssl_action`, `ssl_key`) ON ?? TO ?@?";
590+
$query = "GRANT SELECT, UPDATE (`ssl`, `ssl_letsencrypt`, `ssl_request`, `ssl_cert`, `ssl_action`, `ssl_key`) ON ?? TO ?@?";
591591
if ($verbose){
592592
echo $query ."\n";
593593
}

‎install/lib/update.lib.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ function prepareDBDump() {
4444
//** load the pre update sql script do perform modifications on the database before the database is dumped
4545
if(is_file(ISPC_INSTALL_ROOT."/install/sql/pre_update.sql")) {
4646
if($conf['mysql']['admin_password'] == '') {
47-
caselog("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." ".escapeshellarg($conf['mysql']['database'])." < '".ISPC_INSTALL_ROOT."/install/sql/pre_update.sql' &> /dev/null", __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
47+
caselog("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." ".escapeshellarg($conf['mysql']['database'])." < '".ISPC_INSTALL_ROOT."/install/sql/pre_update.sql' &> /dev/null", __FILE__, __LINE__, 'read in pre_update.sql', 'could not read in pre_update.sql');
4848
} else {
49-
caselog("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." ".escapeshellarg($conf['mysql']['database'])." < '".ISPC_INSTALL_ROOT."/install/sql/pre_update.sql' &> /dev/null", __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
49+
caselog("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." ".escapeshellarg($conf['mysql']['database'])." < '".ISPC_INSTALL_ROOT."/install/sql/pre_update.sql' &> /dev/null", __FILE__, __LINE__, 'read in pre_update.sql', 'could not read in pre_update.sql');
5050
}
5151
}
5252

@@ -394,6 +394,9 @@ function updateDbAndIni() {
394394
unset($old_ini_array);
395395
unset($tpl_ini_array);
396396
unset($new_ini);
397+
398+
// Truncate sys_session
399+
$inst->db->query('TRUNCATE ??', $conf['mysql']['database'].'sys_session');
397400
}
398401

399402

‎install/sql/incremental/upd_0084.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
UPDATE `sys_user` SET `app_theme` = 'default' WHERE 1;
2+
ALTER TABLE `ftp_user` ADD `user_type` SET('user','system') NOT NULL DEFAULT 'user' AFTER `expires`, ADD `user_config` TEXT NULL AFTER `user_type`;

‎install/sql/incremental/upd_dev_collection.sql‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ ALTER TABLE `mail_mailinglist` ADD `digesttext` ENUM('n','y') NOT NULL DEFAULT '
88
ALTER TABLE `mail_mailinglist` ADD `digestsub` ENUM('n','y') NOT NULL DEFAULT 'n';
99
ALTER TABLE `mail_mailinglist` ADD `mail_footer` mediumtext;
1010
ALTER TABLE `mail_mailinglist` ADD `subscribe_policy` enum('disabled','confirm','approval','both','none') NOT NULL DEFAULT 'confirm';
11-
ALTER TABLE `mail_mailinglist` ADD `posting_policy` enum('closed','moderated','free') NOT NULL DEFAULT 'free';
11+
ALTER TABLE `mail_mailinglist` ADD `posting_policy` enum('closed','moderated','free') NOT NULL DEFAULT 'free';
12+
ALTER TABLE `web_domain` CHANGE `folder_directive_snippets` `folder_directive_snippets` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NULL;

‎install/sql/ispconfig3.sql‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -644,6 +644,8 @@ CREATE TABLE `ftp_user` (
644644
`ul_bandwidth` int(11) NOT NULL default '-1',
645645
`dl_bandwidth` int(11) NOT NULL default '-1',
646646
`expires` datetime NULL DEFAULT NULL,
647+
`user_type` set('user','system') NOT NULL DEFAULT 'user',
648+
`user_config` text,
647649
PRIMARY KEY (`ftp_user_id`),
648650
KEY `active` (`active`),
649651
KEY `server_id` (`server_id`),
@@ -1994,7 +1996,7 @@ CREATE TABLE `web_domain` (
19941996
`enable_pagespeed` ENUM('y','n') NOT NULL DEFAULT 'n',
19951997
`http_port` int(11) unsigned NOT NULL DEFAULT '80',
19961998
`https_port` int(11) unsigned NOT NULL DEFAULT '443',
1997-
`folder_directive_snippets` text NOT NULL,
1999+
`folder_directive_snippets` text,
19982000
PRIMARY KEY (`domain_id`),
19992001
UNIQUE KEY `serverdomain` ( `server_id` , `ip_address`, `domain` )
20002002
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;

‎install/tpl/nginx_ispconfig.vhost.master‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ server {
55
{ssl_comment}ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
66
{ssl_comment}ssl_certificate /usr/local/ispconfig/interface/ssl/ispserver.crt;
77
{ssl_comment}ssl_certificate_key /usr/local/ispconfig/interface/ssl/ispserver.key;
8+
{ssl_comment}ssl_ciphers 'ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS';
9+
{ssl_comment}ssl_prefer_server_ciphers on;
810

911
# redirect to https if accessed with http
1012
{ssl_comment}error_page 497 https://$host:{vhost_port}$request_uri;

‎install/tpl/server.ini.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ fastcgi_phpini_path=/etc/php5/cgi/
128128
fastcgi_children=8
129129
fastcgi_max_requests=5000
130130
fastcgi_bin=/usr/bin/php-cgi
131-
fastcgi_config_syntax=1
131+
fastcgi_config_syntax=2
132132

133133
[jailkit]
134134
jailkit_chroot_home=/home/[username]

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,11 @@ private function _idn_encode_decode($domain, $encode = true) {
302302

303303
if($encode == true) {
304304
if(function_exists('idn_to_ascii')) {
305-
$domain = idn_to_ascii($domain, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
305+
if(defined('IDNA_NONTRANSITIONAL_TO_ASCII') && defined('INTL_IDNA_VARIANT_UTS46') && constant('IDNA_NONTRANSITIONAL_TO_ASCII')) {
306+
$domain = idn_to_ascii($domain, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
307+
} else {
308+
$domain = idn_to_ascii($domain);
309+
}
306310
} elseif(file_exists(ISPC_CLASS_PATH.'/idn/idna_convert.class.php')) {
307311
/* use idna class:
308312
* @author Matthias Sommerfeld <mso@phlylabs.de>
@@ -319,7 +323,11 @@ private function _idn_encode_decode($domain, $encode = true) {
319323
}
320324
} else {
321325
if(function_exists('idn_to_utf8')) {
322-
$domain = idn_to_utf8($domain, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
326+
if(defined('IDNA_NONTRANSITIONAL_TO_ASCII') && defined('INTL_IDNA_VARIANT_UTS46') && constant('IDNA_NONTRANSITIONAL_TO_ASCII')) {
327+
$domain = idn_to_utf8($domain, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
328+
} else {
329+
$domain = idn_to_utf8($domain);
330+
}
323331
} elseif(file_exists(ISPC_CLASS_PATH.'/idn/idna_convert.class.php')) {
324332
/* use idna class:
325333
* @author Matthias Sommerfeld <mso@phlylabs.de>

‎interface/lib/lang/cz.lng‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,5 +154,3 @@ $wb['select_directive_snippet_txt'] = 'Directive Snippets';
154154
$wb['select_master_directive_snippet_txt'] = 'Master Directive Snippets';
155155
?>
156156

157-
158-

‎interface/lib/lang/dk.lng‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ $wb['strength_2'] = 'Nogenlunde';
146146
$wb['strength_3'] = 'God';
147147
$wb['strength_4'] = 'Stærk';
148148
$wb['strength_5'] = 'Meget Stærk';
149-
$wb['weak_password_txt'] = 'Den valgte adgangskode matcher ikke retningslinjerne for sikkerhedsindstillingerne. Det skal være mindst {chars} tegn i længden og have en styrke på \"{strength}\".';
149+
$wb['weak_password_txt'] = 'Den valgte adgangskode matcher ikke retningslinjerne for sikkerhedsindstillingerne. Det skal være mindst {chars} tegn i længden og have en styrke på \\"{strength}\\".';
150150
$wb['weak_password_length_txt'] = 'Den valgte adgangskode matcher ikke retningslinjerne for sikkerhedsindstillingerne. Det skal være mindst {chars} tegn i længden.';
151151
$wb['security_check1_txt'] = 'Check for sikkerheds tilladelse:';
152152
$wb['security_check2_txt'] = 'mislykkedes.';

0 commit comments

Comments
 (0)