Skip to content

Commit 12ea25f

Browse files
tbrehmtbrehm
committed
temporary renamed is_errordocs field back to errordocs
1 parent 3707cf6 commit 12ea25f

File tree

7 files changed

+172
-172
lines changed

7 files changed

+172
-172
lines changed

‎install/sql/ispconfig3.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1000,7 +1000,7 @@ CREATE TABLE `web_domain` (
10001000
`cgi` char(1) NOT NULL default 'y',
10011001
`ssi` char(1) NOT NULL default 'y',
10021002
`suexec` char(1) NOT NULL default 'y',
1003-
`is_errordocs` tinyint(1) NOT NULL default '1',
1003+
`errordocs` tinyint(1) NOT NULL default '1',
10041004
`is_subdomainwww` tinyint(1) NOT NULL default '1',
10051005
`php` varchar(255) NOT NULL default 'y',
10061006
`redirect_type` varchar(255) default NULL,

‎interface/web/sites/form/web_domain.tform.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@
168168
'default' => 'n',
169169
'value' => array(0 => 'n',1 => 'y')
170170
),
171-
'is_errordocs' => array (
171+
'errordocs' => array (
172172
'datatype' => 'INTEGER',
173173
'formtype' => 'CHECKBOX',
174174
'default' => '1',

‎interface/web/sites/lib/lang/en_web_domain.lng‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ $wb["hd_quota_txt"] = 'Harddisk Quota';
2626
$wb["traffic_quota_txt"] = 'Traffic Quota';
2727
$wb["cgi_txt"] = 'CGI';
2828
$wb["ssi_txt"] = 'SSI';
29-
$wb["is_errordocs_txt"] = 'Own Error-Documents';
29+
$wb["errordocs_txt"] = 'Own Error-Documents';
3030
$wb["is_subdomainwww_txt"] = 'www. Subdomain';
3131
$wb["ssl_txt"] = 'SSL';
3232
$wb["suexec_txt"] = 'SuEXEC';

‎interface/web/sites/templates/web_domain_edit.htm‎

Lines changed: 95 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,95 @@
1-
<h2><tmpl_var name="list_head_txt"></h2>
2-
3-
<div class="panel panel_web_domain">
4-
5-
<div class="pnl_formsarea">
6-
<fieldset id="wf_area_web_domain"><legend>Domain</legend>
7-
<tmpl_if name="is_admin">
8-
<span class="wf_oneField">
9-
<label for="server_id" class="wf_preField">{tmpl_var name='server_id_txt'}</label>
10-
<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>
11-
</span>
12-
<span class="wf_oneField">
13-
<label for="client_group_id" class="wf_preField">{tmpl_var name='client_txt'}</label>
14-
<select id="client_group_id" name="client_group_id">{tmpl_var name='client_group_id'}</select>
15-
</span>
16-
</tmpl_if>
17-
<tmpl_if name="is_reseller">
18-
<span class="wf_oneField">
19-
<label for="client_group_id" class="wf_preField">{tmpl_var name='client_group_id_txt'}</label>
20-
<select id="client_group_id" name="client_group_id">{tmpl_var name='client_group_id'}</select>
21-
</span>
22-
</tmpl_if>
23-
<span class="wf_oneField">
24-
<label for="ip_address" class="wf_preField">{tmpl_var name='ip_address_txt'}</label>
25-
<select id="ip_address" name="ip_address">{tmpl_var name='ip_address'}</select>
26-
</span>
27-
<span class="wf_oneField">
28-
<label for="domain" class="wf_preField">{tmpl_var name='domain_txt'}</label>
29-
<input type="text" id="domain" name="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255">
30-
</span>
31-
<!--
32-
<span class="wf_oneField">
33-
<label for="type" class="wf_preField">{tmpl_var name='type_txt'}</label>
34-
<select id="type" name="type">{tmpl_var name='type'}</select>
35-
</span>
36-
<span class="wf_oneField">
37-
<label for="parent_domain_id" class="wf_preField">{tmpl_var name='parent_domain_id_txt'}</label>
38-
<select id="parent_domain_id" name="parent_domain_id">{tmpl_var name='parent_domain_id'}</select>
39-
</span>
40-
<span class="wf_oneField">
41-
<label for="vhost_type" class="wf_preField">{tmpl_var name='vhost_type_txt'}</label>
42-
<select id="vhost_type" name="vhost_type">{tmpl_var name='vhost_type'}</select>
43-
</span>
44-
-->
45-
<span class="wf_oneField">
46-
<label for="hd_quota" class="wf_preField">{tmpl_var name='hd_quota_txt'}</label>
47-
<input type="text" id="hd_quota" name="hd_quota" value="{tmpl_var name='hd_quota'}" size="7" maxlength="7">
48-
</span>
49-
<span class="wf_oneField">
50-
<label for="traffic_quota" class="wf_preField">{tmpl_var name='traffic_quota_txt'}</label>
51-
<input type="text" id="traffic_quota" name="traffic_quota" value="{tmpl_var name='traffic_quota'}" size="7" maxlength="7">
52-
</span>
53-
<span class="wf_oneField">
54-
<label for="cgi" class="wf_preField">{tmpl_var name='cgi_txt'}</label>
55-
<span class="">{tmpl_var name='cgi'}</span>
56-
</span>
57-
<span class="wf_oneField">
58-
<label for="ssi" class="wf_preField">{tmpl_var name='ssi_txt'}</label>
59-
<span class="">{tmpl_var name='ssi'}</span>
60-
</span>
61-
<span class="wf_oneField">
62-
<label for="suexec" class="wf_preField">{tmpl_var name='suexec_txt'}</label>
63-
<span class="">{tmpl_var name='suexec'}</span>
64-
</span>
65-
<span class="wf_oneField">
66-
<label for="is_errordocs" class="wf_preField">{tmpl_var name='is_errordocs_txt'}</label>
67-
<span class="">{tmpl_var name='is_errordocs'}</span>
68-
</span>
69-
<span class="wf_oneField">
70-
<label for="is_subdomainwww" class="wf_preField">{tmpl_var name='is_subdomainwww_txt'}</label>
71-
<span class="">{tmpl_var name='is_subdomainwww'}</span>
72-
</span>
73-
<span class="wf_oneField">
74-
<label for="ssl" class="wf_preField">{tmpl_var name='ssl_txt'}</label>
75-
<span class="">{tmpl_var name='ssl'}</span>
76-
</span>
77-
<span class="wf_oneField">
78-
<label for="php" class="wf_preField">{tmpl_var name='php_txt'}</label>
79-
<select id="php" name="php">{tmpl_var name='php'}</select>
80-
</span>
81-
<span class="wf_oneField">
82-
<label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>
83-
<span class="">{tmpl_var name='active'}</span>
84-
</span>
85-
</fieldset>
86-
87-
<input type="hidden" name="id" value="{tmpl_var name='id'}">
88-
89-
<div class="wf_actions buttons">
90-
<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>
91-
<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>
92-
</div>
93-
</div>
94-
95-
</div>
1+
<h2><tmpl_var name="list_head_txt"></h2>
2+
3+
<div class="panel panel_web_domain">
4+
5+
<div class="pnl_formsarea">
6+
<fieldset id="wf_area_web_domain"><legend>Domain</legend>
7+
<tmpl_if name="is_admin">
8+
<span class="wf_oneField">
9+
<label for="server_id" class="wf_preField">{tmpl_var name='server_id_txt'}</label>
10+
<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>
11+
</span>
12+
<span class="wf_oneField">
13+
<label for="client_group_id" class="wf_preField">{tmpl_var name='client_txt'}</label>
14+
<select id="client_group_id" name="client_group_id">{tmpl_var name='client_group_id'}</select>
15+
</span>
16+
</tmpl_if>
17+
<tmpl_if name="is_reseller">
18+
<span class="wf_oneField">
19+
<label for="client_group_id" class="wf_preField">{tmpl_var name='client_group_id_txt'}</label>
20+
<select id="client_group_id" name="client_group_id">{tmpl_var name='client_group_id'}</select>
21+
</span>
22+
</tmpl_if>
23+
<span class="wf_oneField">
24+
<label for="ip_address" class="wf_preField">{tmpl_var name='ip_address_txt'}</label>
25+
<select id="ip_address" name="ip_address">{tmpl_var name='ip_address'}</select>
26+
</span>
27+
<span class="wf_oneField">
28+
<label for="domain" class="wf_preField">{tmpl_var name='domain_txt'}</label>
29+
<input type="text" id="domain" name="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255">
30+
</span>
31+
<!--
32+
<span class="wf_oneField">
33+
<label for="type" class="wf_preField">{tmpl_var name='type_txt'}</label>
34+
<select id="type" name="type">{tmpl_var name='type'}</select>
35+
</span>
36+
<span class="wf_oneField">
37+
<label for="parent_domain_id" class="wf_preField">{tmpl_var name='parent_domain_id_txt'}</label>
38+
<select id="parent_domain_id" name="parent_domain_id">{tmpl_var name='parent_domain_id'}</select>
39+
</span>
40+
<span class="wf_oneField">
41+
<label for="vhost_type" class="wf_preField">{tmpl_var name='vhost_type_txt'}</label>
42+
<select id="vhost_type" name="vhost_type">{tmpl_var name='vhost_type'}</select>
43+
</span>
44+
-->
45+
<span class="wf_oneField">
46+
<label for="hd_quota" class="wf_preField">{tmpl_var name='hd_quota_txt'}</label>
47+
<input type="text" id="hd_quota" name="hd_quota" value="{tmpl_var name='hd_quota'}" size="7" maxlength="7">
48+
</span>
49+
<span class="wf_oneField">
50+
<label for="traffic_quota" class="wf_preField">{tmpl_var name='traffic_quota_txt'}</label>
51+
<input type="text" id="traffic_quota" name="traffic_quota" value="{tmpl_var name='traffic_quota'}" size="7" maxlength="7">
52+
</span>
53+
<span class="wf_oneField">
54+
<label for="cgi" class="wf_preField">{tmpl_var name='cgi_txt'}</label>
55+
<span class="">{tmpl_var name='cgi'}</span>
56+
</span>
57+
<span class="wf_oneField">
58+
<label for="ssi" class="wf_preField">{tmpl_var name='ssi_txt'}</label>
59+
<span class="">{tmpl_var name='ssi'}</span>
60+
</span>
61+
<span class="wf_oneField">
62+
<label for="suexec" class="wf_preField">{tmpl_var name='suexec_txt'}</label>
63+
<span class="">{tmpl_var name='suexec'}</span>
64+
</span>
65+
<span class="wf_oneField">
66+
<label for="errordocs" class="wf_preField">{tmpl_var name='errordocs_txt'}</label>
67+
<span class="">{tmpl_var name='errordocs'}</span>
68+
</span>
69+
<span class="wf_oneField">
70+
<label for="is_subdomainwww" class="wf_preField">{tmpl_var name='is_subdomainwww_txt'}</label>
71+
<span class="">{tmpl_var name='is_subdomainwww'}</span>
72+
</span>
73+
<span class="wf_oneField">
74+
<label for="ssl" class="wf_preField">{tmpl_var name='ssl_txt'}</label>
75+
<span class="">{tmpl_var name='ssl'}</span>
76+
</span>
77+
<span class="wf_oneField">
78+
<label for="php" class="wf_preField">{tmpl_var name='php_txt'}</label>
79+
<select id="php" name="php">{tmpl_var name='php'}</select>
80+
</span>
81+
<span class="wf_oneField">
82+
<label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>
83+
<span class="">{tmpl_var name='active'}</span>
84+
</span>
85+
</fieldset>
86+
87+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
88+
89+
<div class="wf_actions buttons">
90+
<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>
91+
<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>
92+
</div>
93+
</div>
94+
95+
</div>

‎interface/web/themes/default/templates/main.tpl.htm‎

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,71 @@
1-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
2-
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
3-
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
4-
<head>
5-
<title>ISPConfig 3</title>
6-
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
7-
<!-- (en) Add your meta data here -->
8-
<!-- (de) Fuegen Sie hier ihre Meta-Daten ein -->
9-
<link href="/themes/default/css/central.css" rel="stylesheet" type="text/css"/>
10-
<!--[if lte IE 7]>
11-
<link href="/themes/default/css/patches/central.css" rel="stylesheet" type="text/css" />
12-
<![endif]-->
13-
14-
<script src="/js/yui/yahoo/yahoo-min.js"></script>
15-
<script src="/js/yui/connection/connection-min.js"></script>
16-
<script src="/js/scrigo.js"></script>
17-
<script src="/js/wforms.js"></script>
18-
19-
</head>
20-
<body onLoad="loadInitContent()">
21-
<div id="page_margins">
22-
<div id="page">
23-
<div id="header">
24-
<div id="topsubnav">
25-
<!-- start: skip link navigation -->
26-
<a class="skip" href="#navigation" title="skip link">Skip to the navigation</a><span class="hideme">.</span>
27-
<a class="skip" href="#content" title="skip link">Skip to the content</a><span class="hideme">.</span>
28-
<!-- end: skip link navigation -->
29-
<span><a href="login/logout.php">Logout</a> | <a href="help/index.php">Help</a> | <a href="#">Imprint</a></span>
30-
</div>
31-
<h1 id="ir-HeaderLogo" class="swap"><span>ISPConfig 3</span></h1>
32-
<span>hosting control panel</span>
33-
</div>
34-
<!-- begin: main navigation #nav -->
35-
<div id="nav"> <a id="navigation" name="navigation"></a>
36-
<!-- skiplink anchor: navigation -->
37-
<div id="nav_main">
38-
<div id="topNav">&nbsp;</div>
39-
</div>
40-
</div>
41-
<!-- end: main navigation -->
42-
<!-- begin: main content area #main -->
43-
<div id="main">
44-
<!-- begin: #col1 - first float column -->
45-
<div id="col1">
46-
<div id="col1_content" class="clearfix">
47-
<div id="sideNav">&nbsp;</div>
48-
</div>
49-
</div>
50-
<!-- end: #col1 -->
51-
<!-- begin: #col3 static column -->
52-
<div id="col3">
53-
<div id="col3_content" class="clearfix"> <a id="content" name="content"></a>
54-
<!-- skiplink anchor: Content -->
55-
<form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data"><div id="pageContent"><!-- AJAX CONTENT --></div></form>
56-
</div>
57-
<div id="ie_clearing">&nbsp;</div>
58-
<!-- End: IE Column Clearing -->
59-
</div>
60-
<!-- end: #col3 -->
61-
</div>
62-
<!-- end: #main -->
63-
<!-- begin: #footer -->
64-
<div id="footer">
65-
Powered by <a href="http://www.ispconfig.com/">ISPConfig 3</a></div>
66-
</div>
67-
<!-- end: #footer -->
68-
</div>
69-
</div>
70-
</body>
71-
</html>
1+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
2+
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
3+
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
4+
<head>
5+
<title>ISPConfig 3</title>
6+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
7+
<!-- (en) Add your meta data here -->
8+
<!-- (de) Fuegen Sie hier ihre Meta-Daten ein -->
9+
<link href="themes/default/css/central.css" rel="stylesheet" type="text/css"/>
10+
<!--[if lte IE 7]>
11+
<link href="themes/default/css/patches/central.css" rel="stylesheet" type="text/css" />
12+
<![endif]-->
13+
14+
<script src="js/yui/yahoo/yahoo-min.js"></script>
15+
<script src="js/yui/connection/connection-min.js"></script>
16+
<script src="js/scrigo.js"></script>
17+
<script src="js/wforms.js"></script>
18+
19+
</head>
20+
<body onLoad="loadInitContent()">
21+
<div id="page_margins">
22+
<div id="page">
23+
<div id="header">
24+
<div id="topsubnav">
25+
<!-- start: skip link navigation -->
26+
<a class="skip" href="#navigation" title="skip link">Skip to the navigation</a><span class="hideme">.</span>
27+
<a class="skip" href="#content" title="skip link">Skip to the content</a><span class="hideme">.</span>
28+
<!-- end: skip link navigation -->
29+
<span><a href="login/logout.php">Logout</a> | <a href="help/index.php">Help</a> | <a href="#">Imprint</a></span>
30+
</div>
31+
<h1 id="ir-HeaderLogo" class="swap"><span>ISPConfig 3</span></h1>
32+
<span>hosting control panel</span>
33+
</div>
34+
<!-- begin: main navigation #nav -->
35+
<div id="nav"> <a id="navigation" name="navigation"></a>
36+
<!-- skiplink anchor: navigation -->
37+
<div id="nav_main">
38+
<div id="topNav">&nbsp;</div>
39+
</div>
40+
</div>
41+
<!-- end: main navigation -->
42+
<!-- begin: main content area #main -->
43+
<div id="main">
44+
<!-- begin: #col1 - first float column -->
45+
<div id="col1">
46+
<div id="col1_content" class="clearfix">
47+
<div id="sideNav">&nbsp;</div>
48+
</div>
49+
</div>
50+
<!-- end: #col1 -->
51+
<!-- begin: #col3 static column -->
52+
<div id="col3">
53+
<div id="col3_content" class="clearfix"> <a id="content" name="content"></a>
54+
<!-- skiplink anchor: Content -->
55+
<form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data"><div id="pageContent"><!-- AJAX CONTENT --></div></form>
56+
</div>
57+
<div id="ie_clearing">&nbsp;</div>
58+
<!-- End: IE Column Clearing -->
59+
</div>
60+
<!-- end: #col3 -->
61+
</div>
62+
<!-- end: #main -->
63+
<!-- begin: #footer -->
64+
<div id="footer">
65+
Powered by <a href="http://www.ispconfig.com/">ISPConfig 3</a></div>
66+
</div>
67+
<!-- end: #footer -->
68+
</div>
69+
</div>
70+
</body>
71+
</html>

‎server/conf/vhost.conf.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
ServerAdmin webmaster@<tmpl_var name='domain'>
1414

1515
ErrorLog <tmpl_var name='document_root'>/log/error.log
16-
<tmpl_if name='is_errordocs'>
16+
<tmpl_if name='errordocs'>
1717

1818
ErrorDocument 400 /error/invalidSyntax.html
1919
ErrorDocument 401 /error/authorizationRequired.html

‎server/plugins-available/apache2_plugin.inc.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ function update($event_name,$data) {
212212

213213
// Check if the directories are there and create them if nescessary.
214214
if(!is_dir($data["new"]["document_root"]."/web")) exec("mkdir -p ".$data["new"]["document_root"]."/web");
215-
if(!is_dir($data["new"]["document_root"]."/web/error") and $data["new"]["is_errordocs"]) exec("mkdir -p ".$data["new"]["document_root"]."/web/error");
215+
if(!is_dir($data["new"]["document_root"]."/web/error") and $data["new"]["errordocs"]) exec("mkdir -p ".$data["new"]["document_root"]."/web/error");
216216
//if(!is_dir($data["new"]["document_root"]."/log")) exec("mkdir -p ".$data["new"]["document_root"]."/log");
217217
if(!is_dir($data["new"]["document_root"]."/ssl")) exec("mkdir -p ".$data["new"]["document_root"]."/ssl");
218218
if(!is_dir($data["new"]["document_root"]."/cgi-bin")) exec("mkdir -p ".$data["new"]["document_root"]."/cgi-bin");
@@ -288,7 +288,7 @@ function update($event_name,$data) {
288288

289289
if($this->action == 'insert' && $data["new"]["type"] == 'vhost') {
290290
// Copy the error pages
291-
if($data["new"]["is_errordocs"]){
291+
if($data["new"]["errordocs"]){
292292
$error_page_path = escapeshellcmd($data["new"]["document_root"])."/web/error/";
293293
exec("cp /usr/local/ispconfig/server/conf/error/".substr(escapeshellcmd($conf["language"]),0,2)."/* ".$error_page_path);
294294
exec("chmod -R +r ".$error_page_path);

0 commit comments

Comments
 (0)