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

Author: Florian Schaal

install/dist/lib/opensuse.lib.php

@@ -1141,7 +1141,9 @@ public function install_ispconfig()
 
 			$tpl->setVar('apache_version',getapacheversion());
 
-			wf($vhost_conf_dir.'/ispconfig.vhost', $tpl->grab());
+			$content = $tpl->grab();
+			$content = str_replace('/var/www/', '/srv/www/', $content);
+			wf($vhost_conf_dir.'/ispconfig.vhost', $content);
 
 			//if(!is_file('/srv/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
 			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/apache_ispconfig_fcgi_starter.master', 'tpl/apache_ispconfig_fcgi_starter.master');

install/lib/install.lib.php

@@ -812,6 +812,7 @@ function get_system_timezone() {
 	if(!$timezone && is_link('/etc/localtime')) {
 		$timezone = readlink('/etc/localtime');
 		$timezone = str_replace('/usr/share/zoneinfo/', '', $timezone);
+		$timezone = str_replace('..', '', $timezone);
 		if(substr($timezone, 0, 6) === 'posix/') $timezone = substr($timezone, 6);
 	} elseif(!$timezone) {
 		$hash = md5_file('/etc/localtime');

install/tpl/apache_ispconfig.conf.master

@@ -9,7 +9,7 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
 <Directory /var/www/clients>
     AllowOverride None
 	<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
-	Require all deny
+	Require all denied
 	<tmpl_else>
 	Order Deny,Allow
 	Deny from all
@@ -20,7 +20,7 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
 <Directory />
     AllowOverride None
 	<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
-	Require all deny
+	Require all denied
 	<tmpl_else>
 	Order Deny,Allow
 	Deny from all
@@ -30,7 +30,7 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
 <Directory /var/www/conf>
     AllowOverride None
 	<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
-	Require all deny
+	Require all denied
 	<tmpl_else>
 	Order Deny,Allow
 	Deny from all

server/conf/apache_ispconfig.conf.master

@@ -9,7 +9,7 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
 <Directory /var/www/clients>
     AllowOverride None
 	<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
-	Require all deny
+	Require all denied
 	<tmpl_else>
 	Order Deny,Allow
 	Deny from all
@@ -20,7 +20,7 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
 <Directory />
     AllowOverride None
 	<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
-	Require all deny
+	Require all denied
 	<tmpl_else>
 	Order Deny,Allow
 	Deny from all
@@ -30,7 +30,7 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
 <Directory /var/www/conf>
     AllowOverride None
 	<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
-	Require all deny
+	Require all denied
 	<tmpl_else>
 	Order Deny,Allow
 	Deny from all

server/conf/vhost.conf.master

@@ -2,7 +2,7 @@
 <Directory {tmpl_var name='web_basedir'}/{tmpl_var name='domain'}>
 		AllowOverride None
 		<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
-		Require all deny
+		Require all denied
 		<tmpl_else>
 		Order Deny,Allow
 		Deny from all
@@ -351,4 +351,4 @@
 
 <tmpl_var name='apache_directives'>
 </VirtualHost>
-</tmpl_loop>
+</tmpl_loop>

server/lib/classes/cron.d/500-backup.inc.php

@@ -85,7 +85,7 @@ public function onRunJob() {
 
 			if($run_backups){
 				//* backup only active domains
-				$sql = "SELECT * FROM web_domain WHERE server_id = '".$conf['server_id']."' AND (type = 'vhost' OR type = 'vhostsubdomain') AND active = 'y'";
+				$sql = "SELECT * FROM web_domain WHERE server_id = '".$conf['server_id']."' AND (type = 'vhost' OR type = 'vhostsubdomain' OR type = 'vhostalias') AND active = 'y'";
 				$records = $app->db->queryAllRecords($sql);
 				if(is_array($records)) {
 					foreach($records as $rec) {