Nun kann man auch https-Weiterleitungen anlegen (Michaels Patch)

git-svn-id: file:///var/svn/trunk@40 45fdb5c4-e40b-0410-b369-9aab4fe9a275

syscp/customer_domains.php

@@ -94,7 +94,7 @@
 					$completedomain_check=$db->query_first("SELECT `id`, `customerid`, `domain`, `documentroot`, `isemaildomain` FROM `".TABLE_PANEL_DOMAINS."` WHERE `domain`='$completedomain' AND `customerid`='".$userinfo['customerid']."'");
 
 					$path=addslashes($_POST['path']);
-					if(substr($path, 0, 7) != 'http://')
+					if(!preg_match('/^https?\:\/\//', $path))
 					{
 						$path=makeCorrectDir($path);
 						$path=$userinfo['documentroot'].$path;
@@ -139,7 +139,7 @@
 				if(isset($_POST['send']) && $_POST['send']=='send')
 				{
 					$path=addslashes($_POST['path']);
-					if(substr($path, 0, 7) != 'http://')
+					if(!preg_match('/^https?\:\/\//', $path))
 					{
 						$path=makeCorrectDir($path);
 						$path=$userinfo['documentroot'].$path;

syscp/scripts/cronscript.php

@@ -114,7 +114,6 @@
 			$result_domains=$db->query("SELECT `d`.`id`, `d`.`domain`, `d`.`customerid`, `d`.`documentroot`, `d`.`parentdomainid`, `d`.`isemaildomain`, `d`.`iswildcarddomain`, `d`.`openbasedir`, `d`.`safemode`, `d`.`speciallogfile`, `d`.`specialsettings`, `pd`.`domain` AS `parentdomain`, `c`.`loginname`, `c`.`guid` FROM `".TABLE_PANEL_DOMAINS."` `d` LEFT JOIN `".TABLE_PANEL_CUSTOMERS."` `c` USING(`customerid`) LEFT JOIN `".TABLE_PANEL_DOMAINS."` `pd` ON(`pd`.`id` = `d`.`parentdomainid`) WHERE `d`.`deactivated` <> '1' ORDER BY `d`.`domain` ASC");
 			while($domain=$db->fetch_array($result_domains))
 			{
-				$domain['documentroot'] = makeCorrectDir ($domain['documentroot']);
 				$vhosts_file.='# Domain ID: '.$domain['id'].' - CustomerID: '.$domain['customerid'].' - CustomerLogin: '.$domain['loginname']."\n";
 				$vhosts_file.='<VirtualHost '.$settings['system']['ipaddress'].'>'."\n";
 				$vhosts_file.='  ServerName '.$domain['domain']."\n";
@@ -130,12 +129,13 @@
 				$vhosts_file.='  ServerAlias '.$alias.'.'.$domain['domain']."\n";
 				$vhosts_file.='  ServerAdmin webmaster@'.$domain['domain']."\n";
 
-				if(substr($domain['documentroot'], 0, 7) == 'http://')
+				if(preg_match('/^https?\:\/\//', $domain['documentroot']))
 				{
 					$vhosts_file.='  Redirect / '.$domain['documentroot']."\n";
 				}
 				else
 				{
+					$domain['documentroot'] = makeCorrectDir ($domain['documentroot']);
 					$vhosts_file.='  DocumentRoot '.$domain['documentroot']."\n";
 					if($domain['openbasedir'] == '1')
 					{