Merge branch 'master' of https://git.ispconfig.org/ispconfig/ispconfig3

Author: Florian Schaal

install/lib/update.lib.php

@@ -59,6 +59,8 @@ function prepareDBDump() {
 
 		system("mysqldump -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -c -t --add-drop-table --create-options --quick --result-file=existing_db.sql ".$conf['mysql']['database']);
 	}
+	chmod('existing_db.sql', 0400);
+	chown('existing_db.sql', 'root');
 
 	/*
 	 * If we have a server with nothing in it except VE's then the database of thie server is empty.

interface/web/dns/lib/lang/bg_dns_a.lng

@@ -2,16 +2,16 @@
 $wb['server_id_txt'] = 'Сървър';
 $wb['zone_txt'] = 'Зона';
 $wb['name_txt'] = 'Име на хоста';
-$wb['type_txt'] = 'тип';
-$wb['data_txt'] = 'IP-адрес';
+$wb['type_txt'] = 'Tип';
+$wb['data_txt'] = 'IP адрес';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Активен';
 $wb['limit_dns_record_txt'] = 'Максималният брой за DNS записи в твоят профил е достигнат.';
 $wb['no_zone_perm'] = 'Нямате права да добавяте записи за DNS в тази зона.';
 $wb['name_error_empty'] = 'Полето за хост име е празно.';
 $wb['name_error_regex'] = 'Избраното име на хост е в грешен формат.';
-$wb['data_error_empty'] = 'Полето за IP-адреса е празно';
-$wb['ip_error_wrong'] = 'Формата на IP-адреса е грешен';
-$wb['data_error_duplicate'] = 'Дублиран A-Запис';
-$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['data_error_empty'] = 'Полето за IP адреса е празно';
+$wb['ip_error_wrong'] = 'Формата на IP адреса е грешен';
+$wb['data_error_duplicate'] = 'Дублиран A Запис';
+$wb['ttl_range_error'] = 'Минималния TTL е 60 секунди.';
 ?>

interface/web/tools/import_ispconfig.php

@@ -109,10 +109,21 @@
 
 
 		try {
+		    //* Second connections to self signed SSL certs
+			$context = stream_context_create(
+				array(
+						'ssl' => array (
+						'verify_peer' => false,
+						'verify_peer_name' => false,
+						'allow_self_signed' => true
+						)
+					)
+			);
 			$client = new SoapClient(null, array('location' => $_POST['remote_server'],
 					'uri'      => $_POST['remote_server'].'/index.php',
 					'trace' => 1,
-					'exceptions' => 1));
+					'exceptions' => 1,
+					'stream_context' => $context));
 
 			if(!isset($remote_session_id)) $remote_session_id = $_POST['remote_session_id'];
 

server/lib/classes/letsencrypt.inc.php

@@ -250,6 +250,12 @@ public function request_certificates($data, $server_type = 'apache') {
 		unset($le_domains);
 		@unlink('/usr/local/ispconfig/interface/acme/.well-known/acme-challenge/' . $le_rnd_file);
 
+		$le_domain_count = count($temp_domains);
+		if($le_domain_count > 100) {
+			$temp_domains = array_slice($temp_domains, 0, 100);
+			$app->log("There were " . $le_domain_count . " domains in the domain list. LE only supports 100, so we strip the rest.", LOGLEVEL_WARN);
+		}
+
 		// generate cli format
 		foreach($temp_domains as $temp_domain) {
 			$cli_domain_arg .= (string) " --domains " . $temp_domain;

server/plugins-available/apache2_plugin.inc.php

@@ -2744,7 +2744,7 @@ private function _patchVhostWebdav($fileName, $webdavRoot) {
 							$output .= "Dav On\n";
 							$output .= "BrowserMatch MSIE AuthDigestEnableQueryStringHack=On\n";
 							$output .= "AuthType Digest\n";
-							$output .= "AuthName \"Restricted Area\"\n";
+							$output .= 'AuthName "'.(empty($fn)?'/':$fn)."\"\n";
 							$output .= "AuthUserFile $webdavRoot/$file\n";
 							$output .= "Require valid-user\n";
 							$output .= "Options +Indexes\n";

server/plugins-available/mail_plugin.inc.php

@@ -213,11 +213,11 @@ function user_insert($event_name, $data) {
 		if(file_exists($conf['rootpath'].'/conf-custom/mail/welcome_email_'.$domain.'.html')) {
 			$lines = file($conf['rootpath'].'/conf-custom/mail/welcome_email_'.$domain.'.html');
 			$html = true;
+		} elseif(file_exists($conf['rootpath'].'/conf-custom/mail/welcome_email_'.$domain.'.txt')) {
+			$lines = file($conf['rootpath'].'/conf-custom/mail/welcome_email_'.$domain.'.txt');
 		} elseif(file_exists($conf['rootpath'].'/conf-custom/mail/welcome_email_'.$conf['language'].'.html')) {
 			$lines = file($conf['rootpath'].'/conf-custom/mail/welcome_email_'.$conf['language'].'.html');
 			$html = true;
-		} elseif(file_exists($conf['rootpath'].'/conf-custom/mail/welcome_email_'.$domain.'.txt')) {
-			$lines = file($conf['rootpath'].'/conf-custom/mail/welcome_email_'.$domain.'.txt');
 		} elseif(file_exists($conf['rootpath'].'/conf-custom/mail/welcome_email_'.$conf['language'].'.txt')) {
 			$lines = file($conf['rootpath'].'/conf-custom/mail/welcome_email_'.$conf['language'].'.txt');
 		} elseif(file_exists($conf['rootpath'].'/conf-custom/mail/welcome_email_en.txt')) {