From a485653d6b2749334017a2e6624af55259aa3d21 Mon Sep 17 00:00:00 2001 From: Silke Meyer Date: Sat, 31 Jan 2015 08:46:05 +0100 Subject: [PATCH 1/7] Added setting to customize system notifications' sender email address --- include/enotify.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/enotify.php b/include/enotify.php index 99bc0fd324..2c940f614b 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -27,8 +27,12 @@ function notification($params) { $hostname = $a->get_hostname(); if(strpos($hostname,':')) $hostname = substr($hostname,0,strpos($hostname,':')); - - $sender_email = t('noreply') . '@' . $hostname; + + // $sender_email = t('noreply') . '@' . $hostname; + $sender_email = $a->config['sender_email']; + if (empty($sender_email)) { + $sender_email = t('noreply') . '@' . $hostname; + } $user = q("SELECT `nickname` FROM `user` WHERE `uid` = %d", intval($params['uid'])); if ($user) From 89946b86602fe23aa2c5aa2345ea4c7c0044a3fb Mon Sep 17 00:00:00 2001 From: Silke Meyer Date: Sat, 31 Jan 2015 15:23:36 +0100 Subject: [PATCH 2/7] fixed a typo --- mod/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/admin.php b/mod/admin.php index bf74d3ef3c..b31a2cc2d2 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -278,7 +278,7 @@ function admin_page_site_post(&$a){ $q = sprintf("UPDATE %s SET %s;", $table_name, $upds); $r = q($q); if (!$r) { - notice( "Falied updating '$table_name': " . $db->error ); + notice( "Failed updating '$table_name': " . $db->error ); goaway($a->get_baseurl(true) . '/admin/site' ); } } From c90e47556ac4b28ec628167197a105d07573a891 Mon Sep 17 00:00:00 2001 From: Silke Meyer Date: Sat, 31 Jan 2015 15:54:12 +0100 Subject: [PATCH 3/7] added setting for server's sender email address --- mod/admin.php | 3 +++ view/templates/admin_site.tpl | 1 + 2 files changed, 4 insertions(+) diff --git a/mod/admin.php b/mod/admin.php index b31a2cc2d2..dd188b2ec1 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -309,6 +309,7 @@ function admin_page_site_post(&$a){ $sitename = ((x($_POST,'sitename')) ? notags(trim($_POST['sitename'])) : ''); $hostname = ((x($_POST,'hostname')) ? notags(trim($_POST['hostname'])) : ''); + $sender_email = ((x($_POST,'sender_email')) ? notags(trim($_POST['sender_email'])) : ''); $banner = ((x($_POST,'banner')) ? trim($_POST['banner']) : false); $info = ((x($_POST,'info')) ? trim($_POST['info']) : false); $language = ((x($_POST,'language')) ? notags(trim($_POST['language'])) : ''); @@ -415,6 +416,7 @@ function admin_page_site_post(&$a){ set_config('system','maxloadavg',$maxloadavg); set_config('config','sitename',$sitename); set_config('config','hostname',$hostname); + set_config('config','sender_email', $sender_email); set_config('system','suppress_language',$suppress_language); if ($banner==""){ // don't know why, but del_config doesn't work... @@ -605,6 +607,7 @@ function admin_page_site(&$a) { // name, label, value, help string, extra data... '$sitename' => array('sitename', t("Site name"), htmlentities($a->config['sitename'], ENT_QUOTES), 'UTF-8'), '$hostname' => array('hostname', t("Host name"), $a->config['hostname'], ""), + '$sender_email' => array('sender_email', t("Sender Email"), $a->config['sender_email'], ""), '$banner' => array('banner', t("Banner/Logo"), $banner, ""), '$info' => array('info',t('Additional Info'), $info, t('For public servers: you can add additional information here that will be listed at dir.friendica.com/siteinfo.')), '$language' => array('language', t("System language"), get_config('system','language'), "", $lang_choices), diff --git a/view/templates/admin_site.tpl b/view/templates/admin_site.tpl index 166b35e7d4..24ff751bea 100644 --- a/view/templates/admin_site.tpl +++ b/view/templates/admin_site.tpl @@ -46,6 +46,7 @@ {{include file="field_input.tpl" field=$sitename}} {{include file="field_input.tpl" field=$hostname}} + {{include file="field_input.tpl" field=$sender_email}} {{include file="field_textarea.tpl" field=$banner}} {{include file="field_textarea.tpl" field=$info}} {{include file="field_select.tpl" field=$language}} From 8991319d9d4dd9876bf257ee8c3e662fbdbcec24 Mon Sep 17 00:00:00 2001 From: Silke Meyer Date: Sat, 31 Jan 2015 16:09:59 +0100 Subject: [PATCH 4/7] Added a description to the help field --- mod/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/admin.php b/mod/admin.php index dd188b2ec1..ecc675dbb7 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -607,7 +607,7 @@ function admin_page_site(&$a) { // name, label, value, help string, extra data... '$sitename' => array('sitename', t("Site name"), htmlentities($a->config['sitename'], ENT_QUOTES), 'UTF-8'), '$hostname' => array('hostname', t("Host name"), $a->config['hostname'], ""), - '$sender_email' => array('sender_email', t("Sender Email"), $a->config['sender_email'], ""), + '$sender_email' => array('sender_email', t("Sender Email"), $a->config['sender_email'], "The email address your server shall use to send notification emails from."), '$banner' => array('banner', t("Banner/Logo"), $banner, ""), '$info' => array('info',t('Additional Info'), $info, t('For public servers: you can add additional information here that will be listed at dir.friendica.com/siteinfo.')), '$language' => array('language', t("System language"), get_config('system','language'), "", $lang_choices), From bb2413ddaf7673e5912538801132d5dd57cf9c51 Mon Sep 17 00:00:00 2001 From: Silke Meyer Date: Sat, 31 Jan 2015 18:41:05 +0100 Subject: [PATCH 5/7] deleted my comment of the original line --- include/enotify.php | 1 - 1 file changed, 1 deletion(-) diff --git a/include/enotify.php b/include/enotify.php index 2c940f614b..7d86219059 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -28,7 +28,6 @@ function notification($params) { if(strpos($hostname,':')) $hostname = substr($hostname,0,strpos($hostname,':')); - // $sender_email = t('noreply') . '@' . $hostname; $sender_email = $a->config['sender_email']; if (empty($sender_email)) { $sender_email = t('noreply') . '@' . $hostname; From 61a227dbaa518595068ca7144978b79a00811e2d Mon Sep 17 00:00:00 2001 From: Silke Meyer Date: Sat, 31 Jan 2015 18:44:30 +0100 Subject: [PATCH 6/7] Changed the "From" field for system emails from product to sitename. --- include/enotify.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/enotify.php b/include/enotify.php index 7d86219059..4327e75b83 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -23,7 +23,7 @@ function notification($params) { $site_admin = sprintf( t('%s Administrator'), $sitename); $nickname = ""; - $sender_name = $product; + $sender_name = $sitename; $hostname = $a->get_hostname(); if(strpos($hostname,':')) $hostname = substr($hostname,0,strpos($hostname,':')); From 57a80c3867cd040e2f8c641c720962e7e63843b0 Mon Sep 17 00:00:00 2001 From: Silke Meyer Date: Sun, 1 Feb 2015 16:25:49 +0100 Subject: [PATCH 7/7] Let the browser check if it's a valid email address --- mod/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/admin.php b/mod/admin.php index ecc675dbb7..e75ec45399 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -607,7 +607,7 @@ function admin_page_site(&$a) { // name, label, value, help string, extra data... '$sitename' => array('sitename', t("Site name"), htmlentities($a->config['sitename'], ENT_QUOTES), 'UTF-8'), '$hostname' => array('hostname', t("Host name"), $a->config['hostname'], ""), - '$sender_email' => array('sender_email', t("Sender Email"), $a->config['sender_email'], "The email address your server shall use to send notification emails from."), + '$sender_email' => array('sender_email', t("Sender Email"), $a->config['sender_email'], "The email address your server shall use to send notification emails from.", "", "", "email"), '$banner' => array('banner', t("Banner/Logo"), $banner, ""), '$info' => array('info',t('Additional Info'), $info, t('For public servers: you can add additional information here that will be listed at dir.friendica.com/siteinfo.')), '$language' => array('language', t("System language"), get_config('system','language'), "", $lang_choices),