path: root/syscp/patches/options-patch/syscp-1.2.13-moreoptions.patch

diff -Nru syscp-mysql-ftp-imp/admin_customers.php syscp-options/admin_customers.php
--- syscp-mysql-ftp-imp/admin_customers.php	2006-03-26 01:05:47.000000000 +0100
+++ syscp-options/admin_customers.php	2006-03-26 01:06:22.000000000 +0100
@@ -424,8 +424,8 @@
 							
 							$db->query(
 								"INSERT INTO `".TABLE_PANEL_DOMAINS."` " .
-								"(`domain`, `customerid`, `adminid`, `parentdomainid`, `documentroot`, `zonefile`, `isemaildomain`, `caneditdomain`, `openbasedir`, `safemode`, `speciallogfile`, `specialsettings`) " .
-								"VALUES ('$loginname.{$settings['system']['hostname']}', '$customerid', '{$userinfo['adminid']}', '-1', '$documentroot', '', '1', '1', '1', '1', '0', '')"
+								"(`domain`, `customerid`, `adminid`, `parentdomainid`, `documentroot`, `zonefile`, `isemaildomain`, `caneditdomain`, `ssi_includes`, `php_engine`, `openbasedir`, `safemode`, `php_errordisplay`, `speciallogfile`, `specialsettings`) " .
+								"VALUES ('$loginname.{$settings['system']['hostname']}', '$customerid', '{$userinfo['adminid']}', '-1', '$documentroot', '', '1', '1', '0', '1', '1', '1', '0', '0', '')"
 							);
 							$domainid=$db->insert_id();
 							$db->query(
@@ -555,8 +555,8 @@
 						{
 							$db->query(
 								"INSERT INTO `".TABLE_PANEL_DOMAINS."` " .
-								"(`domain`, `customerid`, `adminid`, `documentroot`, `zonefile`, `isemaildomain`, `caneditdomain`, `openbasedir`, `safemode`, `speciallogfile`, `specialsettings`) " .
-								"VALUES ('{$result['loginname']}.{$settings['system']['hostname']}', '{$result['customerid']}', '{$userinfo['adminid']}', '{$result['documentroot']}', '', '1', '1', '1', '1', '0', '')"
+								"(`domain`, `customerid`, `adminid`, `documentroot`, `zonefile`, `isemaildomain`, `caneditdomain`, `ssi_includes`, `php_engine`, `openbasedir`, `safemode`, `php_errordisplay`, `speciallogfile`, `specialsettings`) " .
+								"VALUES ('{$result['loginname']}.{$settings['system']['hostname']}', '{$result['customerid']}', '{$userinfo['adminid']}', '{$result['documentroot']}', '', '1', '1', '0', '1', '1', '1', '0', '0', '')"
 							);
 							$domainid=$db->insert_id();
 							$db->query(
diff -Nru syscp-mysql-ftp-imp/admin_domains.php syscp-options/admin_domains.php
--- syscp-mysql-ftp-imp/admin_domains.php	2006-03-26 01:05:34.000000000 +0100
+++ syscp-options/admin_domains.php	2006-03-26 01:12:53.000000000 +0100
@@ -56,7 +56,7 @@
 
 			$domains='';
 			$result=$db->query(
-				"SELECT `d`.`id`, `d`.`domain`, `d`.`customerid`, `d`.`documentroot`, CONCAT(`ip`.`ip`,':',`ip`.`port`) AS `ipandport`, `d`.`zonefile`, `d`.`openbasedir`, `d`.`safemode`, `d`.`isemaildomain`, `d`.`parentdomainid`, `c`.`loginname`, `c`.`name`, `c`.`firstname`, `ad`.`domain` AS `alias` " .
+				"SELECT `d`.`id`, `d`.`domain`, `d`.`customerid`, `d`.`documentroot`, CONCAT(`ip`.`ip`,':',`ip`.`port`) AS `ipandport`, `d`.`zonefile`, `d`.`ssi_includes`, `d`.`php_engine`, `d`.`openbasedir`, `d`.`safemode`, `d`.`php_errordisplay`, `d`.`isemaildomain`, `d`.`parentdomainid`, `c`.`loginname`, `c`.`name`, `c`.`firstname`, `ad`.`domain` AS `alias` " .
 				"FROM `".TABLE_PANEL_DOMAINS."` `d` " .
 				"LEFT JOIN `".TABLE_PANEL_CUSTOMERS."` `c` USING(`customerid`) " .
 				"LEFT JOIN `".TABLE_PANEL_DOMAINS."` `ad` ON `d`.`aliasdomain`=`ad`.`id` " .
@@ -93,7 +93,7 @@
 				}
 				$pagestart = ($pageno - 1) * $settings['panel']['paging'];
 				$result=$db->query(
-					"SELECT `d`.`id`, `d`.`domain`, `d`.`customerid`, `d`.`documentroot`, CONCAT(`ip`.`ip`,':',`ip`.`port`) AS `ipandport`, `d`.`zonefile`, `d`.`openbasedir`, `d`.`safemode`, `d`.`isemaildomain`, `d`.`parentdomainid`, `c`.`loginname`, `c`.`name`, `c`.`firstname`, `ad`.`domain` AS `alias` " .
+					"SELECT `d`.`id`, `d`.`domain`, `d`.`customerid`, `d`.`documentroot`, CONCAT(`ip`.`ip`,':',`ip`.`port`) AS `ipandport`, `d`.`zonefile`, `d`.`ssi_includes`, `d`.`php_engine`, `d`.`openbasedir`, `d`.`safemode`, `d`.`php_errordisplay`, `d`.`isemaildomain`, `d`.`parentdomainid`, `c`.`loginname`, `c`.`name`, `c`.`firstname`, `ad`.`domain` AS `alias` " .
 					"FROM `".TABLE_PANEL_DOMAINS."` `d` " .
 					"LEFT JOIN `".TABLE_PANEL_CUSTOMERS."` `c` USING(`customerid`) " .
 					"LEFT JOIN `".TABLE_PANEL_DOMAINS."` `ad` ON `d`.`aliasdomain`=`ad`.`id` " .
@@ -214,6 +214,9 @@
 					$aliasdomain = intval($_POST['alias']);
 					$customer = $db->query_first("SELECT `documentroot` FROM `".TABLE_PANEL_CUSTOMERS."` WHERE `customerid`='$customerid'");
 					$documentroot = $customer['documentroot'];
+					$ssi_includes = intval($_POST['ssi_includes']);
+					$php_engine = intval($_POST['php_engine']);
+					$php_errordisplay = intval($_POST['php_errordisplay']);
 					if($userinfo['change_serversettings'] == '1')
 					{
 						$isbinddomain = $_POST['isbinddomain'];
@@ -260,6 +263,14 @@
 						$aliasdomain_check = $db->query_first('SELECT `id` FROM `'.TABLE_PANEL_DOMAINS.'` `d`,`'.TABLE_PANEL_CUSTOMERS.'` `c` WHERE `d`.`customerid`=\''.$customerid.'\' AND `d`.`aliasdomain` IS NULL AND `d`.`id`<>`c`.`standardsubdomain` AND `c`.`customerid`=\''.$customerid.'\' AND `d`.`id`=\''.$aliasdomain.'\'');
 					}
 
+					if($ssi_includes != '1')
+					{
+						$ssi_includes = '0';
+					}
+					if($php_engine != '1')
+					{
+						$php_engine = '0';
+					}
 					if($openbasedir != '1')
 					{
 						$openbasedir = '0';
@@ -268,6 +279,10 @@
 					{
 						$safemode = '0';
 					}
+					if($php_errordisplay != '1')
+					{
+						$php_errordisplay = '0';
+					}
 					if($speciallogfile != '1')
 					{
 						$speciallogfile = '0';
@@ -321,7 +336,7 @@
 						    && (!isset($_POST['reallydoit']) 
 						       || $_POST['reallydoit'] != 'reallydoit') )
 						{
-							ask_yesno('admin_domain_reallydisablesecuritysetting', $filename, "page=$page;action=$action;domain=$domain;documentroot=$documentroot;customerid=$customerid;alias=$aliasdomain;isbinddomain=$isbinddomain;isemaildomain=$isemaildomain;subcanemaildomain=$subcanemaildomain;caneditdomain=$caneditdomain;zonefile=$zonefile;speciallogfile=$speciallogfile;openbasedir=$openbasedir;ipandport=$ipandport;safemode=$safemode;specialsettings=".urlencode($specialsettings).";reallydoit=reallydoit");
+							ask_yesno('admin_domain_reallydisablesecuritysetting', $filename, "page=$page;action=$action;domain=$domain;documentroot=$documentroot;customerid=$customerid;alias=$aliasdomain;isbinddomain=$isbinddomain;isemaildomain=$isemaildomain;subcanemaildomain=$subcanemaildomain;caneditdomain=$caneditdomain;zonefile=$zonefile;speciallogfile=$speciallogfile;ssi_includes=$ssi_includes;php_engine=$php_engine;openbasedir=$openbasedir;ipandport=$ipandport;safemode=$safemode;php_errordisplay=$php_errordisplay;specialsettings=".urlencode($specialsettings).";reallydoit=reallydoit");
 							exit;
 						}
 						$pattern = sprintf('^%s', $customer['documentroot']);
@@ -329,7 +344,7 @@
 						    && ( !isset($_POST['reallydocroot'] ) 
 						       || $_POST['reallydocroot'] != 'reallydocroot') )
 						{
-							$params = "page=$page;action=$action;domain=$domain;documentroot=$documentroot;customerid=$customerid;alias=$aliasdomain;isbinddomain=$isbinddomain;isemaildomain=$isemaildomain;subcanemaildomain=$subcanemaildomain;caneditdomain=$caneditdomain;zonefile=$zonefile;speciallogfile=$speciallogfile;openbasedir=$openbasedir;ipandport=$ipandport;safemode=$safemode;specialsettings=".urlencode($specialsettings).';reallydocroot=reallydocroot';
+							$params = "page=$page;action=$action;domain=$domain;documentroot=$documentroot;customerid=$customerid;alias=$aliasdomain;isbinddomain=$isbinddomain;isemaildomain=$isemaildomain;subcanemaildomain=$subcanemaildomain;caneditdomain=$caneditdomain;zonefile=$zonefile;speciallogfile=$speciallogfile;ssi_includes=$ssi_includes;php_engine=$php_engine;openbasedir=$openbasedir;ipandport=$ipandport;safemode=$safemode;php_errordisplay=$php_errordisplay;specialsettings=".urlencode($specialsettings).';reallydocroot=reallydocroot';
 							if ( isset($_POST['reallydoit']) )
 							{
 								$params .= ';reallydoit=reallydoit';
@@ -345,7 +360,7 @@
 						}
 
 						$specialsettings = addslashes($specialsettings);
-						$db->query("INSERT INTO `".TABLE_PANEL_DOMAINS."` (`domain`, `customerid`, `adminid`, `documentroot`, `ipandport`, `aliasdomain`, `zonefile`, `isbinddomain`, `isemaildomain`, `subcanemaildomain`, `caneditdomain`, `openbasedir`, `safemode`, `speciallogfile`, `specialsettings`) VALUES ('$domain', '$customerid', '{$userinfo['adminid']}', '$documentroot', '$ipandport', ".(($aliasdomain!=0) ? '\''.$aliasdomain.'\'' : 'NULL').", '$zonefile', '$isbinddomain', '$isemaildomain', '$subcanemaildomain', '$caneditdomain', '$openbasedir', '$safemode', '$speciallogfile', '$specialsettings')");
+						$db->query("INSERT INTO `".TABLE_PANEL_DOMAINS."` (`domain`, `customerid`, `adminid`, `documentroot`, `ipandport`, `aliasdomain`, `zonefile`, `isbinddomain`, `isemaildomain`, `subcanemaildomain`, `caneditdomain`, `ssi_includes`, `php_engine`, `openbasedir`, `safemode`, `php_errordisplay`, `speciallogfile`, `specialsettings`) VALUES ('$domain', '$customerid', '{$userinfo['adminid']}', '$documentroot', '$ipandport', ".(($aliasdomain!=0) ? '\''.$aliasdomain.'\'' : 'NULL').", '$zonefile', '$isbinddomain', '$isemaildomain', '$subcanemaildomain', '$caneditdomain', '$ssi_includes', '$php_engine', '$openbasedir', '$safemode', '$php_errordisplay', '$speciallogfile', '$specialsettings')");
 						$domainid=$db->insert_id();
 						$db->query("UPDATE `".TABLE_PANEL_ADMINS."` SET `domains_used` = `domains_used` + 1 WHERE `adminid` = '{$userinfo['adminid']}'");
 
@@ -394,8 +409,11 @@
 					$isemaildomain=makeyesno('isemaildomain', '1', '0', '1');
 					$subcanemaildomain=makeyesno('subcanemaildomain', '1', '0', '1');
 					$caneditdomain=makeyesno('caneditdomain', '1', '0', '1');
+					$ssi_includes=makeyesno('ssi_includes', '1', '0', '0');
+					$php_engine=makeyesno('php_engine', '1', '0', '1');
 					$openbasedir=makeyesno('openbasedir', '1', '0', '1');
 					$safemode=makeyesno('safemode', '1', '0', '1');
+					$php_errordisplay=makeyesno('php_errordisplay', '1', '0', '0');
 					$speciallogfile=makeyesno('speciallogfile', '1', '0', '0');
 					eval("echo \"".getTemplate("domains/domains_add")."\";");
 				}
@@ -405,7 +423,7 @@
 		elseif($action=='edit' && $id!=0)
 		{
 			$result=$db->query_first(
-				"SELECT `d`.`id`, `d`.`domain`, `d`.`customerid`, `d`.`documentroot`, `d`.`ipandport`, `d`.`aliasdomain`, `d`.`isbinddomain`, `d`.`isemaildomain`, `d`.`subcanemaildomain`, `d`.`caneditdomain`, `d`.`zonefile`, `d`.`openbasedir`, `d`.`safemode`, `d`.`speciallogfile`, `d`.`specialsettings`, `c`.`loginname`, `c`.`name`, `c`.`firstname` " .
+				"SELECT `d`.`id`, `d`.`domain`, `d`.`customerid`, `d`.`documentroot`, `d`.`ipandport`, `d`.`aliasdomain`, `d`.`isbinddomain`, `d`.`isemaildomain`, `d`.`subcanemaildomain`, `d`.`caneditdomain`, `d`.`zonefile`, `d`.`ssi_includes`, `d`.`php_engine`, `d`.`openbasedir`, `d`.`safemode`, `d`.`php_errordisplay`, `d`.`speciallogfile`, `d`.`specialsettings`, `c`.`loginname`, `c`.`name`, `c`.`firstname` " .
 				"FROM `".TABLE_PANEL_DOMAINS."` `d` " .
 				"LEFT JOIN `".TABLE_PANEL_CUSTOMERS."` `c` USING(`customerid`) " .
 				"WHERE `d`.`parentdomainid`='0' AND `d`.`id`='$id'".( $userinfo['customers_see_all'] ? '' : " AND `d`.`adminid` = '{$userinfo['adminid']}' ")
@@ -422,6 +440,9 @@
 					$isemaildomain = intval($_POST['isemaildomain']);
 					$subcanemaildomain = intval($_POST['subcanemaildomain']);
 					$caneditdomain = intval($_POST['caneditdomain']);
+					$ssi_includes = intval($_POST['ssi_includes']);
+					$php_engine = intval($_POST['php_engine']);
+					$php_errordisplay = intval($_POST['php_errordisplay']);
 					if($userinfo['change_serversettings'] == '1')
 					{
 						$isbinddomain = $_POST['isbinddomain'];
@@ -452,6 +473,14 @@
 						$documentroot = makeCorrectDir($documentroot);
 					}
 
+					if($ssi_includes != '1')
+					{
+						$ssi_includes = '0';
+					}
+					if($php_engine != '1')
+					{
+						$php_engine = '0';
+					}
 					if($openbasedir != '1')
 					{
 						$openbasedir = '0';
@@ -460,6 +489,10 @@
 					{
 						$safemode = '0';
 					}
+					if($php_errordisplay != '1')
+					{
+						$php_errordisplay = '0';
+					}
 					if($isbinddomain != '1')
 					{
 						$isbinddomain = '0';
@@ -489,7 +522,7 @@
 					
 					if(($openbasedir == '0' || $safemode == '0') && (!isset($_POST['reallydoit']) || $_POST['reallydoit'] != 'reallydoit') && $userinfo['change_serversettings'] == '1')
 					{
-						ask_yesno('admin_domain_reallydisablesecuritysetting', $filename, "id=$id;page=$page;action=$action;documentroot=$documentroot;alias=$aliasdomain;isbinddomain=$isbinddomain;isemaildomain=$isemaildomain;subcanemaildomain=$subcanemaildomain;caneditdomain=$caneditdomain;zonefile=$zonefile;openbasedir=$openbasedir;ipandport=$ipandport;safemode=$safemode;specialsettings=".urlencode($specialsettings).";reallydoit=reallydoit");
+						ask_yesno('admin_domain_reallydisablesecuritysetting', $filename, "id=$id;page=$page;action=$action;documentroot=$documentroot;alias=$aliasdomain;isbinddomain=$isbinddomain;isemaildomain=$isemaildomain;subcanemaildomain=$subcanemaildomain;caneditdomain=$caneditdomain;zonefile=$zonefile;ssi_includes=$ssi_includes;php_engine=$php_engine;openbasedir=$openbasedir;ipandport=$ipandport;safemode=$safemode;php_errordisplay=$php_errordisplay;specialsettings=".urlencode($specialsettings).";reallydoit=reallydoit");
 						exit;
 					}
 					$pattern = sprintf('^%s', $customer['documentroot']);
@@ -497,7 +530,7 @@
 					    && ( !isset($_POST['reallydocroot'] ) 
 					       || $_POST['reallydocroot'] != 'reallydocroot') )
 					{
-						$params = "id=$id;page=$page;action=$action;documentroot=$documentroot;alias=$aliasdomain;isbinddomain=$isbinddomain;isemaildomain=$isemaildomain;subcanemaildomain=$subcanemaildomain;caneditdomain=$caneditdomain;zonefile=$zonefile;openbasedir=$openbasedir;ipandport=$ipandport;safemode=$safemode;specialsettings=".urlencode($specialsettings).';reallydocroot=reallydocroot';
+						$params = "id=$id;page=$page;action=$action;documentroot=$documentroot;alias=$aliasdomain;isbinddomain=$isbinddomain;isemaildomain=$isemaildomain;subcanemaildomain=$subcanemaildomain;caneditdomain=$caneditdomain;zonefile=$zonefile;ssi_includes=$ssi_includes;php_engine=$php_engine;openbasedir=$openbasedir;ipandport=$ipandport;safemode=$safemode;php_errordisplay=$php_errordisplay;specialsettings=".urlencode($specialsettings).';reallydocroot=reallydocroot';
 						if ( isset($_POST['reallydoit']) )
 						{
 							$params .= ';reallydoit=reallydoit';
@@ -513,7 +546,7 @@
 						$specialsettings = urldecode($specialsettings);
 					}
 
-					if($documentroot != $result['documentroot'] || $ipandport != $result['ipandport'] || $openbasedir != $result['openbasedir'] || $safemode != $result['safemode'] || $specialsettings != $result['specialsettings'])
+					if($documentroot != $result['documentroot'] || $ipandport != $result['ipandport'] || $ssi_includes != $result['ssi_includes'] || $php_engine != $result['php_engine'] || $openbasedir != $result['openbasedir'] || $safemode != $result['safemode'] || $php_errordisplay != $result['php_errordisplay'] || $specialsettings != $result['specialsettings'])
 					{
 						inserttask('1');
 					}
@@ -528,8 +561,8 @@
 					}
 
 					$specialsettings = addslashes($specialsettings);
-					$result=$db->query("UPDATE `".TABLE_PANEL_DOMAINS."` SET `documentroot`='$documentroot', `ipandport`='$ipandport', `aliasdomain`=".(($aliasdomain!=0 && $alias_check==0) ? '\''.$aliasdomain.'\'' : 'NULL').", `isbinddomain`='$isbinddomain', `isemaildomain`='$isemaildomain', `subcanemaildomain`='$subcanemaildomain', `caneditdomain`='$caneditdomain', `zonefile`='$zonefile', `openbasedir`='$openbasedir', `safemode`='$safemode', `specialsettings`='$specialsettings' WHERE `id`='$id'");
-					$result=$db->query("UPDATE `".TABLE_PANEL_DOMAINS."` SET `ipandport`='$ipandport', `openbasedir`='$openbasedir', `safemode`='$safemode', `specialsettings`='$specialsettings'  WHERE `parentdomainid`='$id'");
+					$result=$db->query("UPDATE `".TABLE_PANEL_DOMAINS."` SET `documentroot`='$documentroot', `ipandport`='$ipandport', `aliasdomain`=".(($aliasdomain!=0 && $alias_check==0) ? '\''.$aliasdomain.'\'' : 'NULL').", `isbinddomain`='$isbinddomain', `isemaildomain`='$isemaildomain', `subcanemaildomain`='$subcanemaildomain', `caneditdomain`='$caneditdomain', `zonefile`='$zonefile', `ssi_includes`='$ssi_includes', `php_engine`='$php_engine', `openbasedir`='$openbasedir', `safemode`='$safemode', `php_errordisplay`='$php_errordisplay', `specialsettings`='$specialsettings' WHERE `id`='$id'");
+					$result=$db->query("UPDATE `".TABLE_PANEL_DOMAINS."` SET `ipandport`='$ipandport', `ssi_includes`='$ssi_includes', `php_engine`='$php_engine', `openbasedir`='$openbasedir', `safemode`='$safemode', `php_errordisplay`='$php_errordisplay', `specialsettings`='$specialsettings'  WHERE `parentdomainid`='$id'");
 	
 					redirectTo ( $filename , Array ( 'page' => $page , 's' => $s ) ) ;
 				}
@@ -553,8 +586,11 @@
 					$isemaildomain=makeyesno('isemaildomain', '1', '0', $result['isemaildomain']);
 					$subcanemaildomain=makeyesno('subcanemaildomain', '1', '0', $result['subcanemaildomain']);
 					$caneditdomain=makeyesno('caneditdomain', '1', '0', $result['caneditdomain']);
+					$ssi_includes=makeyesno('ssi_includes', '1', '0', $result['ssi_includes']);
+					$php_engine=makeyesno('php_engine', '1', '0', $result['php_engine']);
 					$openbasedir=makeyesno('openbasedir', '1', '0', $result['openbasedir']);
 					$safemode=makeyesno('safemode', '1', '0', $result['safemode']);
+					$php_errordisplay=makeyesno('php_errordisplay', '1', '0', $result['php_errordisplay']);
 					$speciallogfile=($result['speciallogfile'] == 1 ? $lng['panel']['yes'] : $lng['panel']['no']);
 					eval("echo \"".getTemplate("domains/domains_edit")."\";");
 				}
@@ -562,4 +598,4 @@
 		}
 	}
 
-?>
+?>
\ No newline at end of file
diff -Nru syscp-mysql-ftp-imp/customer_domains.php syscp-options/customer_domains.php
--- syscp-mysql-ftp-imp/customer_domains.php	2006-03-26 01:05:34.000000000 +0100
+++ syscp-options/customer_domains.php	2006-03-26 01:06:22.000000000 +0100
@@ -224,7 +224,7 @@
 				{
 					$subdomain = $idna_convert->encode(preg_replace(Array('/\:(\d)+$/','/^https?\:\/\//'),'',addslashes($_POST['subdomain'])));
 					$domain=$idna_convert->encode(addslashes($_POST['domain']));
-					$domain_check=$db->query_first("SELECT `id`, `customerid`, `domain`, `documentroot`, `isemaildomain`, `openbasedir`, `safemode`, `speciallogfile`, `specialsettings` FROM `".TABLE_PANEL_DOMAINS."` WHERE `domain`='$domain' AND `customerid`='".$userinfo['customerid']."' AND `parentdomainid`='0' AND `iswildcarddomain`='0' AND `caneditdomain`='1' ");
+					$domain_check=$db->query_first("SELECT `id`, `customerid`, `domain`, `documentroot`, `isemaildomain`, `ssi_includes`, `php_engine`, `openbasedir`, `safemode`, `php_errordisplay`, `speciallogfile`, `specialsettings` FROM `".TABLE_PANEL_DOMAINS."` WHERE `domain`='$domain' AND `customerid`='".$userinfo['customerid']."' AND `parentdomainid`='0' AND `iswildcarddomain`='0' AND `caneditdomain`='1' ");
 					$completedomain=$subdomain.'.'.$domain;
 					$completedomain_check=$db->query_first("SELECT `id`, `customerid`, `domain`, `documentroot`, `isemaildomain` FROM `".TABLE_PANEL_DOMAINS."` WHERE `domain`='$completedomain' AND `customerid`='".$userinfo['customerid']."' AND `caneditdomain` = '1'");
 					$aliasdomain = intval($_POST['alias']);
@@ -283,7 +283,7 @@
 
 					else
 					{
-						$result=$db->query("INSERT INTO `".TABLE_PANEL_DOMAINS."` (`customerid`, `domain`, `documentroot`, `aliasdomain`, `parentdomainid`, `isemaildomain`, `openbasedir`, `safemode`, `speciallogfile`, `specialsettings`) VALUES ('".$userinfo['customerid']."', '$completedomain', '$path', ".(($aliasdomain != 0) ? "'".$aliasdomain."'" : "NULL").", '".$domain_check['id']."', '0', '".$domain_check['openbasedir']."', '".$domain_check['safemode']."', '".$domain_check['speciallogfile']."', '".$domain_check['specialsettings']."')");
+						$result=$db->query("INSERT INTO `".TABLE_PANEL_DOMAINS."` (`customerid`, `domain`, `documentroot`, `aliasdomain`, `parentdomainid`, `isemaildomain`, `ssi_includes`, `php_engine`, `openbasedir`, `safemode`, `php_errordisplay`, `speciallogfile`, `specialsettings`) VALUES ('".$userinfo['customerid']."', '$completedomain', '$path', ".(($aliasdomain != 0) ? "'".$aliasdomain."'" : "NULL").", '".$domain_check['id']."', '0', '".$domain_check['ssi_includes']."', '".$domain_check['php_engine']."', '".$domain_check['openbasedir']."', '".$domain_check['safemode']."', '".$domain_check['php_errordisplay']."', '".$domain_check['speciallogfile']."', '".$domain_check['specialsettings']."')");
 						$result=$db->query("UPDATE `".TABLE_PANEL_CUSTOMERS."` SET `subdomains_used`=`subdomains_used`+1 WHERE `customerid`='".$userinfo['customerid']."'");
 						inserttask('1');
     					redirectTo ( $filename , Array ( 'page' => $page , 's' => $s ) ) ;
@@ -312,7 +312,7 @@
 
 		elseif($action=='edit' && $id!=0)
 		{
-			$result=$db->query_first("SELECT `d`.`id`, `d`.`customerid`, `d`.`domain`, `d`.`documentroot`, `d`.`isemaildomain`, `d`.`iswildcarddomain`, `d`.`parentdomainid`, `d`.`aliasdomain`, `pd`.`subcanemaildomain` FROM `".TABLE_PANEL_DOMAINS."` `d`, `".TABLE_PANEL_DOMAINS."` `pd` WHERE `d`.`customerid`='".$userinfo['customerid']."' AND `d`.`id`='$id' AND ((`d`.`parentdomainid`!='0' AND `pd`.`id`=`d`.`parentdomainid`) OR (`d`.`parentdomainid`='0' AND `pd`.`id`=`d`.`id`)) AND `d`.`caneditdomain`='1'");
+			$result=$db->query_first("SELECT `d`.`id`, `d`.`customerid`, `d`.`domain`, `d`.`documentroot`, `d`.`isemaildomain`, `d`.`php_errordisplay`, `d`.`iswildcarddomain`, `d`.`parentdomainid`, `d`.`aliasdomain`, `pd`.`subcanemaildomain` FROM `".TABLE_PANEL_DOMAINS."` `d`, `".TABLE_PANEL_DOMAINS."` `pd` WHERE `d`.`customerid`='".$userinfo['customerid']."' AND `d`.`id`='$id' AND ((`d`.`parentdomainid`!='0' AND `pd`.`id`=`d`.`parentdomainid`) OR (`d`.`parentdomainid`='0' AND `pd`.`id`=`d`.`id`)) AND `d`.`caneditdomain`='1'");
 			$alias_check=$db->query_first('SELECT COUNT(`id`) AS count FROM `'.TABLE_PANEL_DOMAINS.'` WHERE `aliasdomain`=\''.$result['id'].'\'');
 			$alias_check=$alias_check['count'];
 			
@@ -358,6 +358,12 @@
 						$isemaildomain = $result['isemaildomain'];
 					}
 
+					$php_errordisplay = intval($_POST['php_errordisplay']);
+					if($php_errordisplay != '1')
+					{
+						$php_errordisplay = '0';
+					}
+
 					$aliasdomain_check=array('id' => 0);
 					if($aliasdomain!=0)
 					{
@@ -380,10 +386,10 @@
 							$db->query("DELETE FROM `".TABLE_MAIL_USERS."` WHERE `customerid`='".$userinfo['customerid']."' AND `domainid`='$id'");
 							$db->query("DELETE FROM `".TABLE_MAIL_VIRTUAL."` WHERE `customerid`='".$userinfo['customerid']."' AND `domainid`='$id'");
 						}
-						if($path != $result['documentroot'] || $isemaildomain != $result['isemaildomain'] || $iswildcarddomain != $result['iswildcarddomain'] || $aliasdomain != $result['aliasdomain'])
+						if($path != $result['documentroot'] || $isemaildomain != $result['isemaildomain'] || $php_errordisplay != $result['php_errordisplay'] || $iswildcarddomain != $result['iswildcarddomain'] || $aliasdomain != $result['aliasdomain'])
 						{
 							inserttask('1');
-							$result=$db->query("UPDATE `".TABLE_PANEL_DOMAINS."` SET `documentroot`='$path', `isemaildomain`='$isemaildomain', `iswildcarddomain`='$iswildcarddomain', `aliasdomain`=".(($aliasdomain!=0 && $alias_check==0) ? '\''.$aliasdomain.'\'' : 'NULL')." WHERE `customerid`='".$userinfo['customerid']."' AND `id`='$id'");
+							$result=$db->query("UPDATE `".TABLE_PANEL_DOMAINS."` SET `documentroot`='$path', `isemaildomain`='$isemaildomain', `php_errordisplay`='$php_errordisplay', `iswildcarddomain`='$iswildcarddomain', `aliasdomain`=".(($aliasdomain!=0 && $alias_check==0) ? '\''.$aliasdomain.'\'' : 'NULL')." WHERE `customerid`='".$userinfo['customerid']."' AND `id`='$id'");
 						}
             			redirectTo ( $filename , Array ( 'page' => $page , 's' => $s ) ) ;
 					}
@@ -403,6 +409,7 @@
 //					$result['documentroot']=str_replace($userinfo['documentroot'],'',$result['documentroot']);
 					$iswildcarddomain=makeyesno('iswildcarddomain', '1', '0', $result['iswildcarddomain']);
 					$isemaildomain=makeyesno('isemaildomain', '1', '0', $result['isemaildomain']);
+					$php_errordisplay=makeyesno('php_errordisplay', '1', '0', $result['php_errordisplay']);
 					eval("echo \"".getTemplate("domains/domains_edit")."\";");
 				}
 			}
diff -Nru syscp-mysql-ftp-imp/customer_extras.php syscp-options/customer_extras.php
--- syscp-mysql-ftp-imp/customer_extras.php	2006-03-26 01:05:34.000000000 +0100
+++ syscp-options/customer_extras.php	2006-03-26 01:06:22.000000000 +0100
@@ -176,6 +176,8 @@
 				$row['path']=str_replace($userinfo['documentroot'],'',$row['path']);
 				$row['options_indexes'] = str_replace('1', $lng['panel']['yes'], $row['options_indexes']);
 				$row['options_indexes'] = str_replace('0', $lng['panel']['no'], $row['options_indexes']);
+				$row['options_execcgi'] = str_replace('1', $lng['panel']['yes'], $row['options_execcgi']);
+				$row['options_execcgi'] = str_replace('0', $lng['panel']['no'], $row['options_execcgi']);
 				eval("\$htaccess.=\"".getTemplate("extras/htaccess_htaccess")."\";");
 			}
 			eval("echo \"".getTemplate("extras/htaccess")."\";");
@@ -270,6 +272,7 @@
 						'       (`customerid`, ' .
 						'        `path`, ' .
 						'        `options_indexes`, ' .
+						'        `options_execcgi`, ' .
 						'        `error404path`, ' .
 						'        `error403path`, ' .
 //						'        `error401path`, ' .
@@ -278,6 +281,7 @@
 						'VALUES ("'.$userinfo['customerid'].'", ' .
 						'        "'.$path.'", ' .
 						'        "'.$_POST['options_indexes'].'", ' .
+						'        "'.$_POST['options_execcgi'].'", ' .
 						'        "'.$error404path.'", ' .
 						'        "'.$error403path.'", ' .
 //						'        "'.$error401path.'", ' .
@@ -293,6 +297,7 @@
 				$pathSelect = makePathfield( $userinfo['documentroot'], $userinfo['guid'], 
 				                             $userinfo['guid'], $settings['panel']['pathedit'] );				
 				$options_indexes = makeyesno('options_indexes','1','0','1');
+				$options_execcgi = makeyesno('options_execcgi','1','0','0');
 				eval("echo \"".getTemplate("extras/htaccess_add")."\";");
 			}
 		}
@@ -317,6 +322,11 @@
 					{
 						$option_indexes = '0';
 					}
+					$option_execcgi = intval($_POST['options_execcgi']);
+					if ($option_execcgi != '1')
+					{
+						$option_execcgi = '0';
+					}
 					if (    ($_POST['error404path'] == '')
 					     || (preg_match('/^https?\:\/\//', $_POST['error404path']) )
 					   )
@@ -359,6 +369,7 @@
 //					}
 
 					if (    ($option_indexes != $result['options_indexes'])
+					     || ($option_execcgi != $result['options_execcgi'])
 					     || ($error404path   != $result['error404path'])
 					     || ($error403path   != $result['error403path'])
 //					     || ($error401path   != $result['error401path'])
@@ -369,6 +380,7 @@
 						$db->query(
 							'UPDATE `'.TABLE_PANEL_HTACCESS.'` ' .
 							'SET `options_indexes` = "'.$option_indexes.'",' .
+							'    `options_execcgi` = "'.$option_execcgi.'",' .
 							'    `error404path`    = "'.$error404path.'", ' .
 							'    `error403path`    = "'.$error403path.'", ' .
 //							'    `error401path`    = "'.$error401path.'", ' .
@@ -387,6 +399,7 @@
 //					$result['error401path'] = $result['error401path'];
 					$result['error500path'] = $result['error500path'];
 					$options_indexes = makeyesno('options_indexes', '1', '0', $result['options_indexes']);
+					$options_execcgi = makeyesno('options_execcgi', '1', '0', $result['options_execcgi']);
 					eval("echo \"".getTemplate("extras/htaccess_edit")."\";");
 				}
 			}
diff -Nru syscp-mysql-ftp-imp/lng/english.lng.php syscp-options/lng/english.lng.php
--- syscp-mysql-ftp-imp/lng/english.lng.php	2006-03-26 01:05:47.000000000 +0100
+++ syscp-options/lng/english.lng.php	2006-03-26 01:06:22.000000000 +0100
@@ -413,4 +413,14 @@
 $lng['error']['dbuserstillhasdb'] = 'You cannot delete this database user, databases are still assigned to it!<br />Please reassign or delete all databases assigned to this user first.';
 $lng['question']['mysql_reallydelete_user'] = 'Do you really want to delete the user %s? This cannot be undone!';
 $lng['ftp']['ftpsuffix'] = 'Account suffix';
+
+/**
+ * CHANGED FOR MOREOPTIONS PATCH
+ */
+
+/**
+ * ADDED FOR MOREOPTIONS PATCH
+ */
+$lng['extras']['view_execcgi'] = 'permit CGI execution';
+$lng['extras']['directory_execcgi'] = 'execute CGI scripts';
 ?>
\ No newline at end of file
diff -Nru syscp-mysql-ftp-imp/scripts/cron_tasks.php syscp-options/scripts/cron_tasks.php
--- syscp-mysql-ftp-imp/scripts/cron_tasks.php	2006-03-26 01:05:34.000000000 +0100
+++ syscp-options/scripts/cron_tasks.php	2006-03-26 01:06:22.000000000 +0100
@@ -75,7 +75,7 @@
 //			$vhosts_file.='ServerName '.$settings['system']['hostname']."\n";
 //			$vhosts_file.='</VirtualHost>'."\n"."\n";
 
-			$result_domains=$db->query("SELECT `d`.`id`, `d`.`domain`, `d`.`customerid`, `d`.`documentroot`, CONCAT(`ip`.`ip`,':',`ip`.`port`) AS `ipandport`, `d`.`parentdomainid`, `d`.`isemaildomain`, `d`.`iswildcarddomain`, `d`.`openbasedir`, `d`.`safemode`, `d`.`speciallogfile`, `d`.`specialsettings`, `pd`.`domain` AS `parentdomain`, `c`.`loginname`, `c`.`guid`, `c`.`email`, `c`.`documentroot` AS `customerroot` FROM `".TABLE_PANEL_DOMAINS."` `d` LEFT JOIN `".TABLE_PANEL_CUSTOMERS."` `c` USING(`customerid`) LEFT JOIN `".TABLE_PANEL_DOMAINS."` `pd` ON (`pd`.`id` = `d`.`parentdomainid`) LEFT JOIN `".TABLE_PANEL_IPSANDPORTS."` `ip` ON (`d`.`ipandport` = `ip`.`id`) WHERE `d`.`deactivated` <> '1' AND `d`.`aliasdomain` IS NULL ORDER BY `d`.`iswildcarddomain`, `d`.`domain` ASC");
+			$result_domains=$db->query("SELECT `d`.`id`, `d`.`domain`, `d`.`customerid`, `d`.`documentroot`, CONCAT(`ip`.`ip`,':',`ip`.`port`) AS `ipandport`, `d`.`parentdomainid`, `d`.`isemaildomain`, `d`.`iswildcarddomain`, `d`.`ssi_includes`, `d`.`php_engine`, `d`.`openbasedir`, `d`.`safemode`, `d`.`php_errordisplay`, `d`.`speciallogfile`, `d`.`specialsettings`, `pd`.`domain` AS `parentdomain`, `c`.`loginname`, `c`.`guid`, `c`.`email`, `c`.`documentroot` AS `customerroot` FROM `".TABLE_PANEL_DOMAINS."` `d` LEFT JOIN `".TABLE_PANEL_CUSTOMERS."` `c` USING(`customerid`) LEFT JOIN `".TABLE_PANEL_DOMAINS."` `pd` ON (`pd`.`id` = `d`.`parentdomainid`) LEFT JOIN `".TABLE_PANEL_IPSANDPORTS."` `ip` ON (`d`.`ipandport` = `ip`.`id`) WHERE `d`.`deactivated` <> '1' AND `d`.`aliasdomain` IS NULL ORDER BY `d`.`iswildcarddomain`, `d`.`domain` ASC");
 			while($domain=$db->fetch_array($result_domains))
 			{
 				fwrite( $debugHandler, '  cron_tasks: Task1 - Writing Domain '.$domain['id'].'::'.$domain['domain']);
@@ -108,19 +108,43 @@
 				{
 					$domain['documentroot'] = makeCorrectDir ($domain['documentroot']);
 					$vhosts_file.='  DocumentRoot "'.$domain['documentroot']."\"\n";
- 					if($domain['openbasedir'] == '1')
- 					{
-						$vhosts_file.='  php_admin_value open_basedir "'.$domain['documentroot']."\"\n";
- 					}
- 					if($domain['safemode'] == '1')
- 					{
- 						$vhosts_file.='  php_admin_flag safe_mode On '."\n";
- 					}
-					if($domain['safemode'] == '0')
+					if($domain['ssi_includes'] == '1')
 					{
-						$vhosts_file.='  php_admin_flag safe_mode Off '."\n";
+						$vhosts_file.='  Options +Includes'."\n";
 					}
- 
+					if($domain['ssi_includes'] == '0')
+					{
+						$vhosts_file.='  Options -Includes'."\n";
+					}
+					if($domain['php_engine'] == '1')
+					{
+						$vhosts_file.='  php_admin_flag engine On'."\n";
+						if($domain['openbasedir'] == '1')
+						{
+							$vhosts_file.='  php_admin_value open_basedir "'.$domain['documentroot']."\"\n";
+						}
+						if($domain['safemode'] == '1')
+						{
+							$vhosts_file.='  php_admin_flag safe_mode On '."\n";
+						}
+						if($domain['safemode'] == '0')
+						{
+							$vhosts_file.='  php_admin_flag safe_mode Off '."\n";
+						}
+						if($domain['php_errordisplay'] == '1')
+						{
+							$vhosts_file.='  php_admin_flag display_errors On '."\n";
+						}
+						if($domain['php_errordisplay'] == '0')
+						{
+							$vhosts_file.='  php_admin_flag display_errors Off '."\n";
+						}
+					}
+					if($domain['php_engine'] == '0')
+					{
+						$vhosts_file.='  php_admin_flag engine Off'."\n";
+					}
+
  					if(!is_dir($domain['documentroot']))
  					{					
  						safe_exec('mkdir -p "'.$domain['documentroot'].'"');
@@ -238,6 +262,16 @@
 						$diroptions_file .= '  Options -Indexes'."\n";
 						fwrite( $debugHandler, '  cron_tasks: Task3 - Setting Options -Indexes');
  					}
+ 					if ( isset ( $row_diroptions['options_execcgi'] ) && $row_diroptions['options_execcgi'] == '1' )
+ 					{
+						$diroptions_file .= '  Options +ExecCGI'."\n";
+						fwrite( $debugHandler, '  cron_tasks: Task3 - Setting Options +ExecCGI');
+					}
+					if ( isset ( $row_diroptions['options_execcgi'] ) && $row_diroptions['options_execcgi'] == '0' )
+					{
+						$diroptions_file .= '  Options -ExecCGI'."\n";
+						fwrite( $debugHandler, '  cron_tasks: Task3 - Setting Options -ExecCGI');
+ 					}
  					if ( isset ( $row_diroptions['error404path'] ) && $row_diroptions['error404path'] != '')
  					{
 						$diroptions_file .= '  ErrorDocument 404 "'.$row_diroptions['error404path']."\"\n";
diff -Nru syscp-mysql-ftp-imp/templates/admin/domains/domains_add.tpl syscp-options/templates/admin/domains/domains_add.tpl
--- syscp-mysql-ftp-imp/templates/admin/domains/domains_add.tpl	2006-03-26 01:05:34.000000000 +0100
+++ syscp-options/templates/admin/domains/domains_add.tpl	2006-03-26 01:06:22.000000000 +0100
@@ -49,6 +49,18 @@
 				<td class="install_nomecampo">{$lng['admin']['domain_edit']}:</td>
 				<td class="install_campodisplay" nowrap="nowrap">$caneditdomain</td>
 			</tr>
+			<tr>
+				<td class="install_nomecampo">ServerSideIncludes:</td>
+				<td class="install_campodisplay" nowrap="nowrap">$ssi_includes</td>
+			</tr>
+			<tr>
+				<td class="install_nomecampo">PHP Engine:</td>
+				<td class="install_campodisplay" nowrap="nowrap">$php_engine</td>
+			</tr>
+			<tr>
+				<td class="install_nomecampo">PHP Error Display:</td>
+				<td class="install_campodisplay" nowrap="nowrap">$php_errordisplay</td>
+			</tr>
 			<if $userinfo['change_serversettings'] == '1'>
 			<tr>
 				<td class="install_nomecampo">OpenBasedir:</td>
diff -Nru syscp-mysql-ftp-imp/templates/admin/domains/domains_edit.tpl syscp-options/templates/admin/domains/domains_edit.tpl
--- syscp-mysql-ftp-imp/templates/admin/domains/domains_edit.tpl	2006-03-26 01:05:34.000000000 +0100
+++ syscp-options/templates/admin/domains/domains_edit.tpl	2006-03-26 01:06:22.000000000 +0100
@@ -52,6 +52,18 @@
 				<td class="install_nomecampo">{$lng['admin']['domain_edit']}:</td>
 				<td class="install_campodisplay" nowrap="nowrap">$caneditdomain</td>
 			</tr>
+			<tr>
+				<td class="install_nomecampo">ServerSideIncludes:</td>
+				<td class="install_campodisplay" nowrap="nowrap">$ssi_includes</td>
+			</tr>
+			<tr>
+				<td class="install_nomecampo">PHP Engine:</td>
+				<td class="install_campodisplay" nowrap="nowrap">$php_engine</td>
+			</tr>
+			<tr>
+				<td class="install_nomecampo">PHP Error Display:</td>
+				<td class="install_campodisplay" nowrap="nowrap">$php_errordisplay</td>
+			</tr>
 			<if $userinfo['change_serversettings'] == '1'>
 			<tr>
 				<td class="install_nomecampo">OpenBasedir:</td>
diff -Nru syscp-mysql-ftp-imp/templates/customer/domains/domains_edit.tpl syscp-options/templates/customer/domains/domains_edit.tpl
--- syscp-mysql-ftp-imp/templates/customer/domains/domains_edit.tpl	2006-03-26 01:05:34.000000000 +0100
+++ syscp-options/templates/customer/domains/domains_edit.tpl	2006-03-26 01:06:22.000000000 +0100
@@ -35,6 +35,10 @@
 			</tr>
 			</if>
 			<tr>
+				<td class="install_nomecampo">PHP Error Display:</td>
+				<td class="install_campodisplay" nowrap="nowrap">$php_errordisplay</td>
+			</tr>
+			<tr>
 				<td class="install_confermacampo" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottone" value="{$lng['panel']['save']}" /></td>
 			</tr>
 		</table>
diff -Nru syscp-mysql-ftp-imp/templates/customer/extras/htaccess_add.tpl syscp-options/templates/customer/extras/htaccess_add.tpl
--- syscp-mysql-ftp-imp/templates/customer/extras/htaccess_add.tpl	2006-03-26 01:05:34.000000000 +0100
+++ syscp-options/templates/customer/extras/htaccess_add.tpl	2006-03-26 01:06:22.000000000 +0100
@@ -16,6 +16,10 @@
 				<td class="install_campodisplay" nowrap="nowrap">$options_indexes</td>
 			</tr>
 			<tr>
+				<td class="install_nomecampo"><b>{$lng['extras']['directory_execcgi']}:</b></td>
+				<td class="install_campodisplay" nowrap="nowrap">$options_execcgi</td>
+			</tr>
+			<tr>
 				<td class="install_nomecampo"><b>{$lng['extras']['errordocument404path']}:</b><br />{$lng['panel']['emptyfordefault']}</td>
 				<td class="install_campodisplay" nowrap="nowrap"><input type="text" name="error404path" value="" maxlength="50" /></td>
 			</tr>
diff -Nru syscp-mysql-ftp-imp/templates/customer/extras/htaccess_edit.tpl syscp-options/templates/customer/extras/htaccess_edit.tpl
--- syscp-mysql-ftp-imp/templates/customer/extras/htaccess_edit.tpl	2006-03-26 01:05:34.000000000 +0100
+++ syscp-options/templates/customer/extras/htaccess_edit.tpl	2006-03-26 01:06:22.000000000 +0100
@@ -17,6 +17,10 @@
 				<td class="install_campodisplay" nowrap="nowrap">$options_indexes</td>
 			</tr>
 			<tr>
+				<td class="install_nomecampo"><b>{$lng['extras']['directory_execcgi']}:</b></td>
+				<td class="install_campodisplay" nowrap="nowrap">$options_execcgi</td>
+			</tr>
+			<tr>
 				<td class="install_nomecampo"><b>{$lng['extras']['errordocument404path']}:</b><br />{$lng['panel']['emptyfordefault']}</td>
 				<td class="install_campodisplay" nowrap="nowrap"><input type="text" name="error404path" value="{$result['error404path']}" maxlength="50" /></td>
 			</tr>
diff -Nru syscp-mysql-ftp-imp/templates/customer/extras/htaccess_htaccess.tpl syscp-options/templates/customer/extras/htaccess_htaccess.tpl
--- syscp-mysql-ftp-imp/templates/customer/extras/htaccess_htaccess.tpl	2006-03-26 01:05:34.000000000 +0100
+++ syscp-options/templates/customer/extras/htaccess_htaccess.tpl	2006-03-26 01:06:22.000000000 +0100
@@ -1,6 +1,7 @@
 <tr>
 	<td class="nomecampo_bordosx">{$row['path']}</td>
 	<td class="nomecampo">{$row['options_indexes']}</td>
+	<td class="nomecampo">{$row['options_execcgi']}</td>
 	<td class="nomecampo">{$row['error404path']}</td>
 	<td class="nomecampo">{$row['error403path']}</td>
 	<td class="nomecampo">{$row['error500path']}</td>
diff -Nru syscp-mysql-ftp-imp/templates/customer/extras/htaccess.tpl syscp-options/templates/customer/extras/htaccess.tpl
--- syscp-mysql-ftp-imp/templates/customer/extras/htaccess.tpl	2006-03-26 01:05:34.000000000 +0100
+++ syscp-options/templates/customer/extras/htaccess.tpl	2006-03-26 01:06:22.000000000 +0100
@@ -1,11 +1,12 @@
 $header
 	<table cellpadding="5" cellspacing="0" border="0" align="center" class="install_tabella">
 		<tr>
-			<td class="install_titolo" colspan="7"><b><img src="../images/titolo.gif" alt="" />&nbsp;{$lng['menue']['extras']['pathoptions']}</b></td>
+			<td class="install_titolo" colspan="8"><b><img src="../images/titolo.gif" alt="" />&nbsp;{$lng['menue']['extras']['pathoptions']}</b></td>
 		</tr>
 		<tr>
 			<td class="campodisplay_bordosx">{$lng['panel']['path']}</td>
 			<td class="campodisplay">{$lng['extras']['view_directory']}</td>
+			<td class="campodisplay">{$lng['extras']['view_execcgi']}</td>
 			<td class="campodisplay">{$lng['extras']['error404path']}</td>
 			<td class="campodisplay">{$lng['extras']['error403path']}</td>
 			<td class="campodisplay">{$lng['extras']['error500path']}</td>
@@ -13,7 +14,7 @@
 		</tr>
 		$htaccess
 		<tr>
-			<td class="campodisplay_bordosx" colspan="7"><a href="$filename?page=htaccess&amp;action=add&amp;s=$s">{$lng['extras']['pathoptions_add']}</a></td>
+			<td class="campodisplay_bordosx" colspan="8"><a href="$filename?page=htaccess&amp;action=add&amp;s=$s">{$lng['extras']['pathoptions_add']}</a></td>
 		</tr>
 	</table>
 	<br />