Merge remote-tracking branch 'origin/stable-3.0.5'

Conflicts:
	install/sql/ispconfig3.sql
	install/tpl/config.inc.php.master
	install/tpl/debian_postfix.conf.master
	install/tpl/fedora_postfix.conf.master
	install/tpl/gentoo_postfix.conf.master
	install/tpl/opensuse_postfix.conf.master
	interface/lib/config.inc.php
	interface/web/sites/lib/lang/cz_web_subdomain.lng
	interface/web/sites/lib/lang/cz_web_subdomain_list.lng
	interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng
	interface/web/themes/blue/ispconfig_version

Author: Marius Cramer

install/lib/install.lib.php

@@ -865,7 +865,7 @@ function getapachemodules() {
 		return array();
 	}
 
-	exec($cmd, $output, $return_var);
+	exec($cmd . ' 2>/dev/null', $output, $return_var);
 	if($return_var != 0 || !$output[0]) {
 		$app->log("Could not check apache modules, apachectl did not return any data.", LOGLEVEL_WARN);
 		return array();

install/lib/installer_base.lib.php

@@ -1277,10 +1277,20 @@ public function configure_apache() {
 
 		if(is_file('/etc/apache2/apache.conf')) {
 			if(hasLine('/etc/apache2/apache.conf', 'Include sites-enabled/', 1) == false) {
-				if(hasLine('/etc/apache2/apache.conf', 'IncludeOptional sites-enabled/*.conf', 1) == false) {
+				if(hasLine('/etc/apache2/apache.conf', 'IncludeOptional sites-enabled/*.conf', 1) == false && hasLine('/etc/apache2/apache.conf', 'IncludeOptional sites-enabled/', 1) == false) {
 					replaceLine('/etc/apache2/apache.conf', 'Include sites-enabled/', 'Include sites-enabled/', 1, 1);
 				} elseif(hasLine('/etc/apache2/apache.conf', 'IncludeOptional sites-enabled/*.vhost', 1) == false) {
-					replaceLine('/etc/apache2/apache.conf', 'IncludeOptional sites-enabled/*.vhost', 'IncludeOptional sites-enabled/*.vhost', 1, 1);
+					replaceLine('/etc/apache2/apache.conf', 'IncludeOptional sites-enabled/*.vhost', 'IncludeOptional sites-enabled/', 1, 1);
+				}
+			}
+		}
+		
+		if(is_file('/etc/apache2/apache2.conf')) {
+			if(hasLine('/etc/apache2/apache2.conf', 'Include sites-enabled/', 1) == false && hasLine('/etc/apache2/apache2.conf', 'IncludeOptional sites-enabled/', 1) == false) {
+				if(hasLine('/etc/apache2/apache2.conf', 'Include sites-enabled/*.conf', 1) == true) {
+					replaceLine('/etc/apache2/apache2.conf', 'Include sites-enabled/*.conf', 'Include sites-enabled/', 1, 1);
+				} elseif(hasLine('/etc/apache2/apache2.conf', 'IncludeOptional sites-enabled/*.conf', 1) == true) {
+					replaceLine('/etc/apache2/apache2.conf', 'IncludeOptional sites-enabled/*.conf', 'IncludeOptional sites-enabled/', 1, 1);
 				}
 			}
 		}

install/tpl/apache_ispconfig.conf.master

@@ -104,7 +104,9 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
 		</tmpl_if>
 </Directory>
 
+<tmpl_if name='apache_version' op='<' value='2.4' format='version'>
 Alias /awstats-icon "/usr/share/awstats/icon"
+</tmpl_if>
 
 NameVirtualHost *:80
 NameVirtualHost *:443

install/tpl/debian_postfix.conf.master

@@ -31,3 +31,4 @@ mime_header_checks = regexp:{config_dir}/mime_header_checks
 nested_header_checks = regexp:{config_dir}/nested_header_checks
 body_checks = regexp:{config_dir}/body_checks
 owner_request_special = no
+smtp_tls_security_level = may

install/tpl/fedora_postfix.conf.master

@@ -28,3 +28,4 @@ mime_header_checks = regexp:{config_dir}/mime_header_checks
 nested_header_checks = regexp:{config_dir}/nested_header_checks
 body_checks = regexp:{config_dir}/body_checks
 inet_interfaces = all
+smtp_tls_security_level = may

install/tpl/gentoo_postfix.conf.master

@@ -28,3 +28,4 @@ mime_header_checks = regexp:{config_dir}/mime_header_checks
 nested_header_checks = regexp:{config_dir}/nested_header_checks
 body_checks = regexp:{config_dir}/body_checks
 inet_interfaces = all
+smtp_tls_security_level = may

install/tpl/opensuse_postfix.conf.master

@@ -28,3 +28,4 @@ mime_header_checks = regexp:{config_dir}/mime_header_checks
 nested_header_checks = regexp:{config_dir}/nested_header_checks
 body_checks = regexp:{config_dir}/body_checks
 inet_interfaces = all
+smtp_tls_security_level = may

interface/lib/lang/cz.lng

@@ -136,15 +136,16 @@ $wb['no_destination_perm'] = 'Nemáte oprávnění pro tuto destinaci.';
 $wb['client_you_are_locked'] = 'Nemáte oprávnění měnit žádná nastavení.';
 $wb['gender_m_txt'] = 'Pan';
 $wb['gender_f_txt'] = 'Paní';
-$wb['client_cannot_be_deleted_because_of_billing_module_txt'] = 'This client has records in the billing module, therefore he cannot be deleted.';
+$wb['client_cannot_be_deleted_because_of_billing_module_txt'] = 'Tento klient má záznamy v modulu fakturace, proto nemůže být odstraněn.';
 $wb['yes_txt'] = 'Ano';
 $wb['no_txt'] = 'Ne';
-$wb['None'] = 'None';
-$wb['strength_1'] = 'Slabé';
-$wb['strength_2'] = 'Podprůměrné';
-$wb['strength_3'] = 'Dobré';
-$wb['strength_4'] = 'Silné';
-$wb['strength_5'] = 'Velmi silné';
+$wb['None'] = 'Žádná';
+$wb['strength_1'] = 'Slabá';
+$wb['strength_2'] = 'Podprůměrná';
+$wb['strength_3'] = 'Dobrá';
+$wb['strength_4'] = 'Silná';
+$wb['strength_5'] = 'Velmi silná';
 $wb['weak_password_txt'] = 'Zvolené heslo neodpovídá požadavkům zásad pro tvorbu hesel. Heslo musí být alespoň {chars} znaků dlouhé a mající sílu \"{strength}\".';
 $wb['weak_password_length_txt'] = 'Zvolené heslo neodpovídá požadavkům zásad pro tvorbu hesel. Heslo musí být alespoň {chars} znaků dlouhé.';
 ?>
+

interface/web/admin/lib/lang/cz.lng

@@ -48,3 +48,4 @@ $wb['Do OS-Update'] = 'Aktualizovat operační systém';
 $wb['Do ISPConfig-Update'] = 'Aktualizovat ISPConfig';
 $wb['Directive Snippets'] = 'Directive Snippets';
 ?>
+

interface/web/admin/lib/lang/cz_directive_snippets.lng

@@ -8,3 +8,4 @@ $wb['directive_snippets_name_empty'] = 'Please specify a name for the snippet.';
 $wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.';
 $wb['variables_txt'] = 'Proměnné';
 ?>
+