From c90e47556ac4b28ec628167197a105d07573a891 Mon Sep 17 00:00:00 2001 From: Silke Meyer Date: Sat, 31 Jan 2015 15:54:12 +0100 Subject: [PATCH] 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}}