No commit message

No commit message

install/sql/ispconfig3.sql

@@ -1000,6 +1000,7 @@ CREATE TABLE `web_domain` (
   `cgi` char(1) NOT NULL default 'y',
   `ssi` char(1) NOT NULL default 'y',
   `suexec` char(1) NOT NULL default 'y',
+  `errordocs` char(1) NOT NULL default 'y',
   `php` varchar(255) NOT NULL default 'y',
   `redirect_type` varchar(255) default NULL,
   `redirect_path` varchar(255) default NULL,

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

@@ -168,6 +168,12 @@ $form["tabs"]['domain'] = array (
 			'default'	=> 'n',
 			'value'		=> array(0 => 'n',1 => 'y')
 		),
+		'errordocs' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'CHECKBOX',
+			'default'	=> 'y',
+			'value'		=> array(0 => 'n',1 => 'y')
+		),
 		'ssl' => array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'CHECKBOX',

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

@@ -26,6 +26,7 @@ $wb["hd_quota_txt"] = 'Harddisk Quota';
 $wb["traffic_quota_txt"] = 'Traffic Quota';
 $wb["cgi_txt"] = 'CGI';
 $wb["ssi_txt"] = 'SSI';
+$wb["errordocs_txt"] = 'Own Error-Documents';
 $wb["ssl_txt"] = 'SSL';
 $wb["suexec_txt"] = 'SuEXEC';
 $wb["php_txt"] = 'PHP';

interface/web/sites/templates/web_domain_edit.htm

@@ -97,6 +97,10 @@
 		</select>
 	</td>
   </tr>
+  <tr>
+    <td class="frmText11">{tmpl_var name='errordocs_txt'}:</td>
+    <td class="frmText11">{tmpl_var name='errordocs'}</td>
+  </tr>
   <tr>
     <td class="frmText11">{tmpl_var name='active_txt'}:</td>
     <td class="frmText11">{tmpl_var name='active'}</td>

server/conf/vhost.conf.master

@@ -13,8 +13,8 @@
   ServerAdmin webmaster@<tmpl_var name='domain'>
 
   ErrorLog <tmpl_var name='document_root'>/log/error.log
-
 <tmpl_if name='errordocs' op='==' value='y'>
+
 	ErrorDocument 400 /error/invalidSyntax.html
 	ErrorDocument 401 /error/authorizationRequired.html
 	ErrorDocument 403 /error/forbidden.html
@@ -22,8 +22,8 @@
 	ErrorDocument 405 /error/methodNotAllowed.html
 	ErrorDocument 500 /error/internalServerError.html
 	ErrorDocument 503 /error/overloaded.html
+</tmpl_if>
 
-</tmpl_if>	
   <Directory {tmpl_var name='web_document_root_www'}>
       Options None
       AllowOverride Indexes AuthConfig Limit FileInfo
@@ -78,20 +78,23 @@
 
   RewriteEngine on
 <tmpl_loop name="redirects">
-
   RewriteCond %{HTTP_HOST}   ^<tmpl_var name='rewrite_domain'> [NC]
   RewriteRule   ^/(.*)$ <tmpl_var name='rewrite_target'>$1  [<tmpl_var name='rewrite_type'>]
 </tmpl_loop>
 </tmpl_if>
+<tmpl_if name='php' op='!=' value=''>
 
+  php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -fwebmaster@<tmpl_var name='domain'>"	
+  #php_admin_value open_basedir <tmpl_var name='web_document_root'>:/usr/share/php5
+  php_admin_value upload_tmp_dir <tmpl_var name='web_document_root'>/tmp
+  php_admin_value session.save_path <tmpl_var name='web_document_root'>/tmp
+</tmpl_if>
 <tmpl_var name='apache_directives'>
-
 </VirtualHost>
 
 
 
 <tmpl_if name='ssl_enabled'>
-
 <IfModule mod_ssl.c>
 ###########################################################
 # SSL Vhost
@@ -106,7 +109,7 @@
   ServerAdmin webmaster@<tmpl_var name='domain'>
   
   ErrorLog <tmpl_var name='document_root'>/log/error.log
-	
+
 <tmpl_if name='errordocs' op='==' value='y'>
 	ErrorDocument 400 /error/invalidSyntax.html
 	ErrorDocument 401 /error/authorizationRequired.html
@@ -164,6 +167,13 @@
   RewriteRule   ^/(.*)$ <tmpl_var name='rewrite_target'>$1  [<tmpl_var name='rewrite_type'>]
 </tmpl_loop>
 </tmpl_if>
+<tmpl_if name='php' op='!=' value=''>
+
+  php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -fwebmaster@<tmpl_var name='domain'>"	
+  #php_admin_value open_basedir <tmpl_var name='web_document_root'>:/usr/share/php5
+  php_admin_value upload_tmp_dir <tmpl_var name='web_document_root'>/tmp
+  php_admin_value session.save_path <tmpl_var name='web_document_root'>/tmp
+</tmpl_if>
 
 </VirtualHost>
 </IfModule>