gitlabFork/ISPConfig3.git - Solinfo Gitblit

parent: 3707cf6e | patch | commit | show whitespace

temporary renamed is_errordocs field back to errordocs

tbrehm

2008-11-13 12ea25ffbffb4c82a4a534afa64ef585e53c1a57

temporary renamed is_errordocs field back to errordocs

7 files modified

	install/sql/ispconfig3.sql	2 ●●●●● patch \| view \| raw \| blame \| history
	interface/web/sites/form/web_domain.tform.php	2 ●●●●● patch \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/en_web_domain.lng	2 ●●●●● patch \| view \| raw \| blame \| history
	interface/web/sites/templates/web_domain_edit.htm	4 ●●●●● patch \| view \| raw \| blame \| history
	interface/web/themes/default/templates/main.tpl.htm	12 ●●●●● patch \| view \| raw \| blame \| history
	server/conf/vhost.conf.master	2 ●●●●● patch \| view \| raw \| blame \| history
	server/plugins-available/apache2_plugin.inc.php	4 ●●●●● patch \| view \| raw \| blame \| history

 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,

 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',

 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';

 interface/web/sites/templates/web_domain_edit.htm

@@ -63,8 +63,8 @@
        <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>

        <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>                    


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

@@ -6,15 +6,15 @@
<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"/>

<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" />

<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>

<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()">


 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

 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);

			@@ -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,

			@@ -168,7 +168,7 @@
			'default' => 'n',
			'value' => array(0 => 'n',1 => 'y')
			),
			'is_errordocs' => array (
			'errordocs' => array (
			'datatype' => 'INTEGER',
			'formtype' => 'CHECKBOX',
			'default' => '1',

			@@ -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';

			@@ -63,8 +63,8 @@
			<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>
			<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>

			@@ -6,15 +6,15 @@
			<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"/>
			<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" />
			<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>
			<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()">

			@@ -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

			@@ -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);