From 080eeb29ec2206e7f75c0e02293804940a045b40 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Sun, 21 Mar 2010 20:21:29 +0000 Subject: [PATCH] add reply-to address and sender-name configuration to panel, fixes #76 --- actions/admin/settings/100.panel.php | 18 ++++++++++++++++++ install/froxlor.sql | 4 +++- install/updates/froxlor/0.9/update_0.9.inc.php | 12 ++++++++++++ lib/init.php | 6 +++++- lng/english.lng.php | 6 ++++++ lng/german.lng.php | 6 ++++++ 6 files changed, 50 insertions(+), 2 deletions(-) diff --git a/actions/admin/settings/100.panel.php b/actions/admin/settings/100.panel.php index 511af5b4..5082a18e 100644 --- a/actions/admin/settings/100.panel.php +++ b/actions/admin/settings/100.panel.php @@ -77,6 +77,24 @@ return array( 'default' => '', 'save_method' => 'storeSettingField', ), + 'panel_adminmail_defname' => array( + 'label' => $lng['serversettings']['adminmail_defname'], + 'settinggroup' => 'panel', + 'varname' => 'adminmail_defname', + 'type' => 'string', + 'default' => 'Froxlor Administrator', + 'save_method' => 'storeSettingField', + ), + 'panel_adminmail_return' => array( + 'label' => $lng['serversettings']['adminmail_return'], + 'settinggroup' => 'panel', + 'varname' => 'adminmail_return', + 'type' => 'string', + 'string_type' => 'mail', + 'string_emptyallowed' => true, + 'default' => '', + 'save_method' => 'storeSettingField', + ), 'panel_decimal_places' => array( 'label' => $lng['serversettings']['decimal_places'], 'settinggroup' => 'panel', diff --git a/install/froxlor.sql b/install/froxlor.sql index 71a48f56..9087d8ab 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -451,7 +451,7 @@ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) V INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (18, 'system', 'vmail_homedir', '/var/customers/mail/'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (19, 'system', 'bindconf_directory', '/etc/bind/'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (20, 'system', 'bindreload_command', '/etc/init.d/bind9 reload'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.3-svn1'); +INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.3-svn2'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (23, 'system', 'hostname', 'SERVERNAME'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (24, 'login', 'maxloginattempts', '3'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (25, 'login', 'deactivatetime', '900'); @@ -552,6 +552,8 @@ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) V INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (121, 'system', 'debug_cron', '0'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (122, 'panel', 'password_min_length', '0'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (123, 'system', 'store_index_file_subs', '1'); +INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (124, 'panel', 'adminmail_defname', 'Froxlor Administrator'); +INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (125, 'panel', 'adminmail_return', ''); # -------------------------------------------------------- diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php index 0bc3f984..bafa37d9 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -326,4 +326,16 @@ if(isFroxlorVersion('0.9.3')) updateToVersion('0.9.3-svn1'); } +if(isFroxlorVersion('0.9.3-svn1')) +{ + showUpdateStep("Updating from 0.9.3-svn1 to 0.9.3-svn2", false); + + showUpdateStep("Updating tables"); + $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'adminmail_defname', 'Froxlor Administrator');"); + $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'adminmail_return', '');"); + lastStepStatus(0); + + updateToVersion('0.9.3-svn2'); +} + ?> diff --git a/lib/init.php b/lib/init.php index 53849b61..63afb0c7 100644 --- a/lib/init.php +++ b/lib/init.php @@ -416,6 +416,10 @@ if($page == '') */ $mail = new PHPMailer(); -$mail->SetFrom($settings['panel']['adminmail'], 'Froxlor Administrator'); +// set return-to address and custom sender-name, see #76 +$mail->SetFrom($settings['panel']['adminmail'], $settings['panel']['adminmail_defname']); +if ($settings['panel']['adminmail_return'] != '') { + $mail->AddReplyTo($settings['panel']['adminmail_return'], $settings['panel']['adminmail_defname']); +} ?> diff --git a/lng/english.lng.php b/lng/english.lng.php index aa78a11f..85eda215 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -1313,4 +1313,10 @@ $lng['error']['notrequiredpasswordlength'] = 'The given password is too short. P $lng['serversettings']['system_store_index_file_subs']['title'] = 'Store default index file also to new subfolders'; $lng['serversettings']['system_store_index_file_subs']['description'] = 'If enabled, the default index-file is being stored to every subdomain-path newly created (not if the folder already exists!)'; +// ADDED IN FROXLOR 0.9.3-svn2 + +$lng['serversettings']['adminmail_return']['title'] = 'Answert-To address'; +$lng['serversettings']['adminmail_return']['description'] = 'Define an e-mail address as answer-to-address for mails sent by the panel.'; +$lng['serversettings']['adminmail_defname'] = 'Panel e-mail sender name'; + ?> diff --git a/lng/german.lng.php b/lng/german.lng.php index a7e40ed9..e9a0c181 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -1293,4 +1293,10 @@ $lng['error']['notrequiredpasswordlength'] = 'Das Passwort ist zu kurz. Bitte ge $lng['serversettings']['system_store_index_file_subs']['title'] = 'Erstelle Index-Datei auch in neuen Unterordnern'; $lng['serversettings']['system_store_index_file_subs']['description'] = 'Wenn aktiviert, wird für jede Subdomain mit neuem Unterordner die Standard-Index Datei angelegt.'; +// ADDED IN FROXLOR 0.9.3-svn2 + +$lng['serversettings']['adminmail_return']['title'] = 'Antwort-Adresse'; +$lng['serversettings']['adminmail_return']['description'] = 'Standard-Antwort-Adresse für E-Mails aus dem Panel.'; +$lng['serversettings']['adminmail_defname'] = 'Panel Absender Name'; + ?>