diff -u -r /usr/local/ispconfig_installed/interface/web/sites/form/web_domain.tform.php /usr/local/ispconfig/interface/web/sites/form/web_domain.tform.php
--- /usr/local/ispconfig_installed/interface/web/sites/form/web_domain.tform.php 2013-01-31 08:02:59.900963045 +0100
+++ /usr/local/ispconfig/interface/web/sites/form/web_domain.tform.php 2013-01-31 11:00:53.006887735 +0100
@@ -706,6 +706,11 @@
'width' => '30',
'maxlength' => '255'
),
+ 'mailfrom' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ ),
+
##################################
# ENDE Datatable fields
##################################
diff -u -r /usr/local/ispconfig_installed/interface/web/sites/lib/lang/de_web_domain.lng /usr/local/ispconfig/interface/web/sites/lib/lang/de_web_domain.lng
--- /usr/local/ispconfig_installed/interface/web/sites/lib/lang/de_web_domain.lng 2013-01-31 08:02:59.546963049 +0100
+++ /usr/local/ispconfig/interface/web/sites/lib/lang/de_web_domain.lng 2013-01-31 09:41:58.522921517 +0100
@@ -1,4 +1,5 @@
{tmpl_var name='proxy_directives_txt'}
{tmpl_var name="available_proxy_directive_snippets_txt"}
{tmpl_var name="proxy_directive_snippets_txt"}
+
+
+
+
+
-
+
diff -u -r /usr/local/ispconfig_installed/server/conf/php-fcgi-starter.master /usr/local/ispconfig/server/conf/php-fcgi-starter.master
--- /usr/local/ispconfig_installed/server/conf/php-fcgi-starter.master 2013-01-31 08:03:05.321963009 +0100
+++ /usr/local/ispconfig/server/conf/php-fcgi-starter.master 2013-01-31 09:41:58.539921288 +0100
@@ -13,4 +13,5 @@
-d open_basedir="" \
-d upload_tmp_dir=/tmp \
-d session.save_path=/tmp \
+-d sendmail_path="/usr/sbin/sendmail -t -i -f " \
$1
\ No newline at end of file
diff -u -r /usr/local/ispconfig_installed/server/conf/php_fpm_pool.conf.master /usr/local/ispconfig/server/conf/php_fpm_pool.conf.master
--- /usr/local/ispconfig_installed/server/conf/php_fpm_pool.conf.master 2013-01-31 08:03:05.211963009 +0100
+++ /usr/local/ispconfig/server/conf/php_fpm_pool.conf.master 2013-01-31 09:41:58.539921288 +0100
@@ -34,6 +34,12 @@
php_admin_value[upload_tmp_dir] = /tmp
+# adding customized mailfrom by mare
+
+php_admin_value[sendmail_path] = "/usr/sbin/sendmail -t -i -f "
+
+# adding customized mailfrom by mare
+
\ No newline at end of file
diff -u -r /usr/local/ispconfig_installed/server/plugins-available/apache2_plugin.inc.php /usr/local/ispconfig/server/plugins-available/apache2_plugin.inc.php
--- /usr/local/ispconfig_installed/server/plugins-available/apache2_plugin.inc.php 2013-01-31 08:03:05.369963008 +0100
+++ /usr/local/ispconfig/server/plugins-available/apache2_plugin.inc.php 2013-01-31 09:41:58.541921314 +0100
@@ -1223,7 +1223,8 @@
$php_open_basedir = ($data['new']['php_open_basedir'] == '')?$data['new']['document_root']:$data['new']['php_open_basedir'];
$fcgi_tpl->setVar('open_basedir', escapeshellcmd($php_open_basedir));
-
+ // Customize MailFrom by mare
+ $fcgi_tpl->setVar('mailfrom',$data['new']['mailfrom']) ;
$fcgi_starter_script = escapeshellcmd($fastcgi_starter_path.$fastcgi_config['fastcgi_starter_script'].($data['new']['type'] == 'vhostsubdomain' ? '_web' . $data['new']['domain_id'] : ''));
$app->system->file_put_contents($fcgi_starter_script,$fcgi_tpl->grab());
unset($fcgi_tpl);