From 12ea25ffbffb4c82a4a534afa64ef585e53c1a57 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 13 Nov 2008 11:26:50 -0500
Subject: [PATCH] temporary renamed is_errordocs field back to errordocs

---
 server/conf/vhost.conf.master                       |    2 
 install/sql/ispconfig3.sql                          |    2 
 server/plugins-available/apache2_plugin.inc.php     |    4 
 interface/web/themes/default/templates/main.tpl.htm |  142 +++++++++++-----------
 interface/web/sites/lib/lang/en_web_domain.lng      |    2 
 interface/web/sites/form/web_domain.tform.php       |    2 
 interface/web/sites/templates/web_domain_edit.htm   |  190 +++++++++++++++---------------
 7 files changed, 172 insertions(+), 172 deletions(-)

diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index ed0c552..c06cd42 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -1000,7 +1000,7 @@
   `cgi` char(1) NOT NULL default 'y',
   `ssi` char(1) NOT NULL default 'y',
   `suexec` char(1) NOT NULL default 'y',
-  `is_errordocs` tinyint(1) NOT NULL default '1',
+  `errordocs` tinyint(1) NOT NULL default '1',
   `is_subdomainwww` tinyint(1) NOT NULL default '1',
   `php` varchar(255) NOT NULL default 'y',
   `redirect_type` varchar(255) default NULL,
diff --git a/interface/web/sites/form/web_domain.tform.php b/interface/web/sites/form/web_domain.tform.php
index c31977b..bdfed25 100644
--- a/interface/web/sites/form/web_domain.tform.php
+++ b/interface/web/sites/form/web_domain.tform.php
@@ -168,7 +168,7 @@
 			'default'	=> 'n',
 			'value'		=> array(0 => 'n',1 => 'y')
 		),
-		'is_errordocs' => array (
+		'errordocs' => array (
 			'datatype'	=> 'INTEGER',
 			'formtype'	=> 'CHECKBOX',
 			'default'	=> '1',
diff --git a/interface/web/sites/lib/lang/en_web_domain.lng b/interface/web/sites/lib/lang/en_web_domain.lng
index 34f18aa..2853a5d 100644
--- a/interface/web/sites/lib/lang/en_web_domain.lng
+++ b/interface/web/sites/lib/lang/en_web_domain.lng
@@ -26,7 +26,7 @@
 $wb["traffic_quota_txt"] = 'Traffic Quota';
 $wb["cgi_txt"] = 'CGI';
 $wb["ssi_txt"] = 'SSI';
-$wb["is_errordocs_txt"] = 'Own Error-Documents';
+$wb["errordocs_txt"] = 'Own Error-Documents';
 $wb["is_subdomainwww_txt"] = 'www. Subdomain';
 $wb["ssl_txt"] = 'SSL';
 $wb["suexec_txt"] = 'SuEXEC';
diff --git a/interface/web/sites/templates/web_domain_edit.htm b/interface/web/sites/templates/web_domain_edit.htm
index 8752563..a33cf4f 100644
--- a/interface/web/sites/templates/web_domain_edit.htm
+++ b/interface/web/sites/templates/web_domain_edit.htm
@@ -1,95 +1,95 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-
-<div class="panel panel_web_domain">
-
-  <div class="pnl_formsarea">
-    <fieldset id="wf_area_web_domain"><legend>Domain</legend>
-      <tmpl_if name="is_admin">
-      <span class="wf_oneField">
-        <label for="server_id" class="wf_preField">{tmpl_var name='server_id_txt'}</label>
-        <select id="server_id" name="server_id" onChange="loadContentInto('ip_address','sites/ajax_get_ip.php?server_id='+document.getElementById('server_id').value)">{tmpl_var name='server_id'}</select>
-      </span>
-      <span class="wf_oneField">
-        <label for="client_group_id" class="wf_preField">{tmpl_var name='client_txt'}</label>
-        <select id="client_group_id" name="client_group_id">{tmpl_var name='client_group_id'}</select>
-      </span>
-      </tmpl_if>
-      <tmpl_if name="is_reseller">
-      <span class="wf_oneField">
-        <label for="client_group_id" class="wf_preField">{tmpl_var name='client_group_id_txt'}</label>
-        <select id="client_group_id" name="client_group_id">{tmpl_var name='client_group_id'}</select>
-      </span>
-      </tmpl_if>
-      <span class="wf_oneField">
-        <label for="ip_address" class="wf_preField">{tmpl_var name='ip_address_txt'}</label>
-        <select id="ip_address" name="ip_address">{tmpl_var name='ip_address'}</select>
-      </span>
-      <span class="wf_oneField">
-        <label for="domain" class="wf_preField">{tmpl_var name='domain_txt'}</label>
-        <input type="text" id="domain" name="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255">
-      </span>
-<!--
-      <span class="wf_oneField">
-        <label for="type" class="wf_preField">{tmpl_var name='type_txt'}</label>
-        <select id="type" name="type">{tmpl_var name='type'}</select>
-      </span>
-      <span class="wf_oneField">
-        <label for="parent_domain_id" class="wf_preField">{tmpl_var name='parent_domain_id_txt'}</label>
-        <select id="parent_domain_id" name="parent_domain_id">{tmpl_var name='parent_domain_id'}</select>
-      </span>
-      <span class="wf_oneField">
-        <label for="vhost_type" class="wf_preField">{tmpl_var name='vhost_type_txt'}</label>
-        <select id="vhost_type" name="vhost_type">{tmpl_var name='vhost_type'}</select>
-      </span>
--->      
-      <span class="wf_oneField">
-        <label for="hd_quota" class="wf_preField">{tmpl_var name='hd_quota_txt'}</label>
-        <input type="text" id="hd_quota" name="hd_quota" value="{tmpl_var name='hd_quota'}" size="7" maxlength="7">
-      </span>
-      <span class="wf_oneField">
-        <label for="traffic_quota" class="wf_preField">{tmpl_var name='traffic_quota_txt'}</label>
-        <input type="text" id="traffic_quota" name="traffic_quota" value="{tmpl_var name='traffic_quota'}" size="7" maxlength="7">
-      </span>
-      <span class="wf_oneField">
-        <label for="cgi" class="wf_preField">{tmpl_var name='cgi_txt'}</label>                    
-        <span class="">{tmpl_var name='cgi'}</span>
-      </span>
-      <span class="wf_oneField">
-        <label for="ssi" class="wf_preField">{tmpl_var name='ssi_txt'}</label>                    
-        <span class="">{tmpl_var name='ssi'}</span>
-      </span>
-      <span class="wf_oneField">
-        <label for="suexec" class="wf_preField">{tmpl_var name='suexec_txt'}</label>                    
-        <span class="">{tmpl_var name='suexec'}</span>
-      </span>
-      <span class="wf_oneField">
-        <label for="is_errordocs" class="wf_preField">{tmpl_var name='is_errordocs_txt'}</label>                    
-        <span class="">{tmpl_var name='is_errordocs'}</span>
-      </span>
-      <span class="wf_oneField">
-        <label for="is_subdomainwww" class="wf_preField">{tmpl_var name='is_subdomainwww_txt'}</label>                    
-        <span class="">{tmpl_var name='is_subdomainwww'}</span>
-      </span>
-      <span class="wf_oneField">
-        <label for="ssl" class="wf_preField">{tmpl_var name='ssl_txt'}</label>                    
-        <span class="">{tmpl_var name='ssl'}</span>
-      </span>
-      <span class="wf_oneField">
-        <label for="php" class="wf_preField">{tmpl_var name='php_txt'}</label>
-        <select id="php" name="php">{tmpl_var name='php'}</select>
-      </span>
-      <span class="wf_oneField">
-        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
-        <span class="">{tmpl_var name='active'}</span>
-      </span>
-    </fieldset>
-
-    <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
-    <div class="wf_actions buttons">
-      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
-      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
-    </div>
-  </div>
-  
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_web_domain">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_web_domain"><legend>Domain</legend>
+      <tmpl_if name="is_admin">
+      <span class="wf_oneField">
+        <label for="server_id" class="wf_preField">{tmpl_var name='server_id_txt'}</label>
+        <select id="server_id" name="server_id" onChange="loadContentInto('ip_address','sites/ajax_get_ip.php?server_id='+document.getElementById('server_id').value)">{tmpl_var name='server_id'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="client_group_id" class="wf_preField">{tmpl_var name='client_txt'}</label>
+        <select id="client_group_id" name="client_group_id">{tmpl_var name='client_group_id'}</select>
+      </span>
+      </tmpl_if>
+      <tmpl_if name="is_reseller">
+      <span class="wf_oneField">
+        <label for="client_group_id" class="wf_preField">{tmpl_var name='client_group_id_txt'}</label>
+        <select id="client_group_id" name="client_group_id">{tmpl_var name='client_group_id'}</select>
+      </span>
+      </tmpl_if>
+      <span class="wf_oneField">
+        <label for="ip_address" class="wf_preField">{tmpl_var name='ip_address_txt'}</label>
+        <select id="ip_address" name="ip_address">{tmpl_var name='ip_address'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="domain" class="wf_preField">{tmpl_var name='domain_txt'}</label>
+        <input type="text" id="domain" name="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255">
+      </span>
+<!--
+      <span class="wf_oneField">
+        <label for="type" class="wf_preField">{tmpl_var name='type_txt'}</label>
+        <select id="type" name="type">{tmpl_var name='type'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="parent_domain_id" class="wf_preField">{tmpl_var name='parent_domain_id_txt'}</label>
+        <select id="parent_domain_id" name="parent_domain_id">{tmpl_var name='parent_domain_id'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="vhost_type" class="wf_preField">{tmpl_var name='vhost_type_txt'}</label>
+        <select id="vhost_type" name="vhost_type">{tmpl_var name='vhost_type'}</select>
+      </span>
+-->      
+      <span class="wf_oneField">
+        <label for="hd_quota" class="wf_preField">{tmpl_var name='hd_quota_txt'}</label>
+        <input type="text" id="hd_quota" name="hd_quota" value="{tmpl_var name='hd_quota'}" size="7" maxlength="7">
+      </span>
+      <span class="wf_oneField">
+        <label for="traffic_quota" class="wf_preField">{tmpl_var name='traffic_quota_txt'}</label>
+        <input type="text" id="traffic_quota" name="traffic_quota" value="{tmpl_var name='traffic_quota'}" size="7" maxlength="7">
+      </span>
+      <span class="wf_oneField">
+        <label for="cgi" class="wf_preField">{tmpl_var name='cgi_txt'}</label>                    
+        <span class="">{tmpl_var name='cgi'}</span>
+      </span>
+      <span class="wf_oneField">
+        <label for="ssi" class="wf_preField">{tmpl_var name='ssi_txt'}</label>                    
+        <span class="">{tmpl_var name='ssi'}</span>
+      </span>
+      <span class="wf_oneField">
+        <label for="suexec" class="wf_preField">{tmpl_var name='suexec_txt'}</label>                    
+        <span class="">{tmpl_var name='suexec'}</span>
+      </span>
+      <span class="wf_oneField">
+        <label for="errordocs" class="wf_preField">{tmpl_var name='errordocs_txt'}</label>                    
+        <span class="">{tmpl_var name='errordocs'}</span>
+      </span>
+      <span class="wf_oneField">
+        <label for="is_subdomainwww" class="wf_preField">{tmpl_var name='is_subdomainwww_txt'}</label>                    
+        <span class="">{tmpl_var name='is_subdomainwww'}</span>
+      </span>
+      <span class="wf_oneField">
+        <label for="ssl" class="wf_preField">{tmpl_var name='ssl_txt'}</label>                    
+        <span class="">{tmpl_var name='ssl'}</span>
+      </span>
+      <span class="wf_oneField">
+        <label for="php" class="wf_preField">{tmpl_var name='php_txt'}</label>
+        <select id="php" name="php">{tmpl_var name='php'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index 723d125..e2c9a1c 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -1,71 +1,71 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<title>ISPConfig 3</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<!-- (en) Add your meta data here -->
-<!-- (de) Fuegen Sie hier ihre Meta-Daten ein -->
-<link href="/themes/default/css/central.css" rel="stylesheet" type="text/css"/>
-<!--[if lte IE 7]>
-<link href="/themes/default/css/patches/central.css" rel="stylesheet" type="text/css" />
-<![endif]-->
-
-<script src="/js/yui/yahoo/yahoo-min.js"></script>
-<script src="/js/yui/connection/connection-min.js"></script>
-<script src="/js/scrigo.js"></script>
-<script src="/js/wforms.js"></script>
-
-</head>
-<body onLoad="loadInitContent()">
-<div id="page_margins">
-	<div id="page">
-		<div id="header">
-			<div id="topsubnav">
-				<!-- start: skip link navigation -->
-				<a class="skip" href="#navigation" title="skip link">Skip to the navigation</a><span class="hideme">.</span>
-				<a class="skip" href="#content" title="skip link">Skip to the content</a><span class="hideme">.</span>
-				<!-- end: skip link navigation -->
-				<span><a href="login/logout.php">Logout</a> | <a href="help/index.php">Help</a> | <a href="#">Imprint</a></span>
-      </div>
-			<h1 id="ir-HeaderLogo" class="swap"><span>ISPConfig 3</span></h1>
-			<span>hosting control panel</span>
-    </div>
-		<!-- begin: main navigation #nav -->
-		<div id="nav"> <a id="navigation" name="navigation"></a>
-			<!-- skiplink anchor: navigation -->
-			<div id="nav_main">
-        <div id="topNav">&nbsp;</div>
-			</div>
-		</div>
-		<!-- end: main navigation -->
-		<!-- begin: main content area #main -->
-		<div id="main">
-			<!-- begin: #col1 - first float column -->
-			<div id="col1">
-				<div id="col1_content" class="clearfix">
-          <div id="sideNav">&nbsp;</div>
-				</div>
-			</div>
-			<!-- end: #col1 -->
-			<!-- begin: #col3 static column -->
-			<div id="col3">
-				<div id="col3_content" class="clearfix"> <a id="content" name="content"></a>
-					<!-- skiplink anchor: Content -->
-          <form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data"><div id="pageContent"><!-- AJAX CONTENT --></div></form>
-        </div>
-				<div id="ie_clearing">&nbsp;</div>
-				<!-- End: IE Column Clearing -->
-			</div>
-			<!-- end: #col3 -->
-		</div>
-		<!-- end: #main -->
-		<!-- begin: #footer -->
-		<div id="footer">
-      Powered by <a href="http://www.ispconfig.com/">ISPConfig 3</a></div>
-    </div>
-		<!-- end: #footer -->
-	</div>
-</div>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<title>ISPConfig 3</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<!-- (en) Add your meta data here -->
+<!-- (de) Fuegen Sie hier ihre Meta-Daten ein -->
+<link href="themes/default/css/central.css" rel="stylesheet" type="text/css"/>
+<!--[if lte IE 7]>
+<link href="themes/default/css/patches/central.css" rel="stylesheet" type="text/css" />
+<![endif]-->
+
+<script src="js/yui/yahoo/yahoo-min.js"></script>
+<script src="js/yui/connection/connection-min.js"></script>
+<script src="js/scrigo.js"></script>
+<script src="js/wforms.js"></script>
+
+</head>
+<body onLoad="loadInitContent()">
+<div id="page_margins">
+	<div id="page">
+		<div id="header">
+			<div id="topsubnav">
+				<!-- start: skip link navigation -->
+				<a class="skip" href="#navigation" title="skip link">Skip to the navigation</a><span class="hideme">.</span>
+				<a class="skip" href="#content" title="skip link">Skip to the content</a><span class="hideme">.</span>
+				<!-- end: skip link navigation -->
+				<span><a href="login/logout.php">Logout</a> | <a href="help/index.php">Help</a> | <a href="#">Imprint</a></span>
+      </div>
+			<h1 id="ir-HeaderLogo" class="swap"><span>ISPConfig 3</span></h1>
+			<span>hosting control panel</span>
+    </div>
+		<!-- begin: main navigation #nav -->
+		<div id="nav"> <a id="navigation" name="navigation"></a>
+			<!-- skiplink anchor: navigation -->
+			<div id="nav_main">
+        <div id="topNav">&nbsp;</div>
+			</div>
+		</div>
+		<!-- end: main navigation -->
+		<!-- begin: main content area #main -->
+		<div id="main">
+			<!-- begin: #col1 - first float column -->
+			<div id="col1">
+				<div id="col1_content" class="clearfix">
+          <div id="sideNav">&nbsp;</div>
+				</div>
+			</div>
+			<!-- end: #col1 -->
+			<!-- begin: #col3 static column -->
+			<div id="col3">
+				<div id="col3_content" class="clearfix"> <a id="content" name="content"></a>
+					<!-- skiplink anchor: Content -->
+          <form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data"><div id="pageContent"><!-- AJAX CONTENT --></div></form>
+        </div>
+				<div id="ie_clearing">&nbsp;</div>
+				<!-- End: IE Column Clearing -->
+			</div>
+			<!-- end: #col3 -->
+		</div>
+		<!-- end: #main -->
+		<!-- begin: #footer -->
+		<div id="footer">
+      Powered by <a href="http://www.ispconfig.com/">ISPConfig 3</a></div>
+    </div>
+		<!-- end: #footer -->
+	</div>
+</div>
+</body>
+</html>
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index e7e1e90..1f88fdd 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -13,7 +13,7 @@
   ServerAdmin webmaster@<tmpl_var name='domain'>
 
   ErrorLog <tmpl_var name='document_root'>/log/error.log
-<tmpl_if name='is_errordocs'>
+<tmpl_if name='errordocs'>
 
 	ErrorDocument 400 /error/invalidSyntax.html
 	ErrorDocument 401 /error/authorizationRequired.html
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 1dae20f..632fda5 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -212,7 +212,7 @@
 		
 		// Check if the directories are there and create them if nescessary.
 		if(!is_dir($data["new"]["document_root"]."/web")) exec("mkdir -p ".$data["new"]["document_root"]."/web");
-		if(!is_dir($data["new"]["document_root"]."/web/error") and $data["new"]["is_errordocs"]) exec("mkdir -p ".$data["new"]["document_root"]."/web/error");
+		if(!is_dir($data["new"]["document_root"]."/web/error") and $data["new"]["errordocs"]) exec("mkdir -p ".$data["new"]["document_root"]."/web/error");
 		//if(!is_dir($data["new"]["document_root"]."/log")) exec("mkdir -p ".$data["new"]["document_root"]."/log");
 		if(!is_dir($data["new"]["document_root"]."/ssl")) exec("mkdir -p ".$data["new"]["document_root"]."/ssl");
 		if(!is_dir($data["new"]["document_root"]."/cgi-bin")) exec("mkdir -p ".$data["new"]["document_root"]."/cgi-bin");
@@ -288,7 +288,7 @@
 		
 		if($this->action == 'insert' && $data["new"]["type"] == 'vhost') {
 			// Copy the error pages
-      if($data["new"]["is_errordocs"]){
+      if($data["new"]["errordocs"]){
   			$error_page_path = escapeshellcmd($data["new"]["document_root"])."/web/error/";
   			exec("cp /usr/local/ispconfig/server/conf/error/".substr(escapeshellcmd($conf["language"]),0,2)."/* ".$error_page_path);
   			exec("chmod -R +r ".$error_page_path);

--
Gitblit v1.9.1