added setting for server's sender email address

diff --git a/mod/admin.php b/mod/admin.php
index b31a2cc2d2bde0773e48da544f14ebbdb568ba2b..dd188b2ec1ae0dc89ef8c45b0c4872b2d54879d8 100644 (file)
--- 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 166b35e7d43d1dddaa5d9da8c11414c88687d94e..24ff751bea86a97ed4bcaf08bd49b5dfb87233f2 100644 (file)
--- 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}}