From b1c67c93636011fde5b8a43e8d9aff357c1e12a6 Mon Sep 17 00:00:00 2001
From: garvinhicking <garvinhicking>
Date: Thu, 28 Jul 2005 14:54:20 +0000
Subject: [PATCH] New config option "blogMail" that specifies the used From:
 address. Used because MTAs may often reject mailadresse if the original mail
 address from commenting users was used.

---
 docs/NEWS                           |  5 +++++
 include/functions.inc.php           |  7 +++++--
 include/functions_smarty.inc.php    | 22 +++++++++++++++++++++-
 include/tpl/config_local.inc.php    |  7 +++++++
 lang/serendipity_lang_bg.inc.php    |  2 ++
 lang/serendipity_lang_cn.inc.php    |  2 ++
 lang/serendipity_lang_cs.inc.php    |  2 ++
 lang/serendipity_lang_cz.inc.php    |  2 ++
 lang/serendipity_lang_da.inc.php    |  2 ++
 lang/serendipity_lang_de.inc.php    |  2 ++
 lang/serendipity_lang_en.inc.php    |  2 ++
 lang/serendipity_lang_es.inc.php    |  2 ++
 lang/serendipity_lang_fa.inc.php    |  2 ++
 lang/serendipity_lang_fi.inc.php    |  2 ++
 lang/serendipity_lang_fr.inc.php    |  2 ++
 lang/serendipity_lang_hu.inc.php    |  2 ++
 lang/serendipity_lang_is.inc.php    |  2 ++
 lang/serendipity_lang_it.inc.php    |  2 ++
 lang/serendipity_lang_ja.inc.php    |  2 ++
 lang/serendipity_lang_ko.inc.php    |  2 ++
 lang/serendipity_lang_nl.inc.php    |  2 ++
 lang/serendipity_lang_no.inc.php    |  2 ++
 lang/serendipity_lang_pt.inc.php    |  2 ++
 lang/serendipity_lang_pt_PT.inc.php |  2 ++
 lang/serendipity_lang_ro.inc.php    |  2 ++
 lang/serendipity_lang_ru.inc.php    |  2 ++
 lang/serendipity_lang_se.inc.php    |  2 ++
 lang/serendipity_lang_tn.inc.php    |  2 ++
 lang/serendipity_lang_tw.inc.php    |  2 ++
 lang/serendipity_lang_zh.inc.php    |  2 ++
 serendipity.css.php                 |  1 +
 31 files changed, 91 insertions(+), 3 deletions(-)

diff --git a/docs/NEWS b/docs/NEWS
index 9220017..97007e3 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -177,6 +177,11 @@ Version 0.8.3 ()
    * Make categories sidebar plugin show categories' description, not the
      name on mouse over (garvinhicking)
 
+   * Added new config option "blogMail" that specifies the blog's used
+     From: E-Mail address. If not given, falls back to not specifying
+     From: field and using mailserver default ("wwwrun", "nobody", ...)
+     (garvinhicking)
+
    * Fix possible exploit that sends comments to the blog owner and others
      with arbitrary mailheaders and a link to invalid entries. Thanks to
      Sebastian Raible! (garvinhicking)
diff --git a/include/functions.inc.php b/include/functions.inc.php
index 5a250fe..560c50e 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -205,7 +205,7 @@ function serendipity_sendMail($to, $subject, $message, $fromMail, $headers = NUL
         trigger_error(__FUNCTION__ . ': $headers must be either an array or null', E_USER_ERROR);
     }
 
-    if ( is_null($fromName) ) {
+    if ( is_null($fromName) || empty($fromName)) {
         $fromName = $serendipity['blogTitle'];
     }
 
@@ -235,7 +235,10 @@ function serendipity_sendMail($to, $subject, $message, $fromMail, $headers = NUL
 
 
     /* Always add these headers */
-    $headers[] = 'From: "'. $fromName .'" <'. $fromMail .'>';
+    if (!empty($serendipity['blogMail'])) {
+        $headers[] = 'From: "'. $fromName .'" <'. $serendipity['blogMail'] .'>';
+    }
+    $headers[] = 'Reply-To: "'. $fromName .'" <'. $fromMail .'>';
     $headers[] = 'X-Mailer: Serendipity/'. $serendipity['version'];
     $headers[] = 'X-Engine: PHP/'. phpversion();
     $headers[] = 'Message-ID: <'. md5(microtime() . uniqid(time())) .'@'. $_SERVER['HTTP_HOST'] .'>';
diff --git a/include/functions_smarty.inc.php b/include/functions_smarty.inc.php
index 8fc4731..068e685 100644
--- a/include/functions_smarty.inc.php
+++ b/include/functions_smarty.inc.php
@@ -181,13 +181,28 @@ function serendipity_smarty_init() {
         $serendipity['smarty_file'] = 'index.tpl';
     }
 
+    $category      = false;
+    $category_info = array();
+    if (isset($serendipity['GET']['category'])) {
+        $category = (int)$serendipity['GET']['category'];
+        if (isset($GLOBALS['cInfo'])) {
+            $category_info = $GLOBALS['cInfo'];
+        } else {
+            $category_info = serendipity_fetchCategoryInfo($category);
+        }
+    }
+    
+    if (!isset($serendipity['smarty_vars']['head_link_stylesheet'])) {
+        $serendipity['smarty_vars']['head_link_stylesheet'] = serendipity_rewriteURL('serendipity.css');
+    }
+
     $serendipity['smarty']->assign(
         array(
             'head_charset'              => LANG_CHARSET,
             'head_version'              => $serendipity['version'],
             'head_title'                => $serendipity['head_title'],
             'head_subtitle'             => $serendipity['head_subtitle'],
-            'head_link_stylesheet'      => serendipity_rewriteURL('serendipity.css'),
+            'head_link_stylesheet'      => $serendipity['smarty_vars']['head_link_stylesheet'],
 
             'is_xhtml'                  => $serendipity['XHTML11'],
             'use_popups'                => $serendipity['enablePopup'],
@@ -207,6 +222,11 @@ function serendipity_smarty_init() {
             'serendipityIndexFile'      => $serendipity['indexFile'],
             'serendipityVersion'        => $serendipity['version'],
 
+            'lang'                      => $serendipity['lang'],
+            'category'                  => $category,
+            'category_info'             => $category_info,
+            'template'                  => $serendipity['template'],
+
             'dateRange'                 => (!empty($serendipity['range']) ? $serendipity['range'] : array())
         )
     );
diff --git a/include/tpl/config_local.inc.php b/include/tpl/config_local.inc.php
index 889666e..ec8f336 100644
--- a/include/tpl/config_local.inc.php
+++ b/include/tpl/config_local.inc.php
@@ -311,6 +311,13 @@
                                           'permission'  => 'blogConfiguration',
                                           'flags'       => array('simpleInstall')),
 
+                                    array('var'         => 'blogMail',
+                                          'title'       => INSTALL_BLOG_EMAIL,
+                                          'description' => INSTALL_BLOG_EMAIL_DESC,
+                                          'type'        => 'string',
+                                          'permission'  => 'blogConfiguration',
+                                          'default'     => ''),
+
                                     array('var'         => 'lang',
                                           'title'       => INSTALL_LANG,
                                           'description' => INSTALL_LANG_DESC,
diff --git a/lang/serendipity_lang_bg.inc.php b/lang/serendipity_lang_bg.inc.php
index 2a880e2..e9d83bd 100644
--- a/lang/serendipity_lang_bg.inc.php
+++ b/lang/serendipity_lang_bg.inc.php
@@ -746,3 +746,5 @@
 @define('PERMISSION_ADMINIMAGESSYNC', 'adminImagesSync: Sync thumbnails');
 @define('PERMISSION_ADMINCOMMENTS', 'adminComments: Administrate comments');
 @define('PERMISSION_ADMINTEMPLATES', 'adminTemplates: Administrate templates');
+@define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
+@define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
diff --git a/lang/serendipity_lang_cn.inc.php b/lang/serendipity_lang_cn.inc.php
index 14ad476..fcb9293 100644
--- a/lang/serendipity_lang_cn.inc.php
+++ b/lang/serendipity_lang_cn.inc.php
@@ -760,3 +760,5 @@
 @define('PERMISSION_ADMINIMAGESSYNC', 'adminImagesSync: Sync thumbnails');
 @define('PERMISSION_ADMINCOMMENTS', 'adminComments: Administrate comments');
 @define('PERMISSION_ADMINTEMPLATES', 'adminTemplates: Administrate templates');
+@define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
+@define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
diff --git a/lang/serendipity_lang_cs.inc.php b/lang/serendipity_lang_cs.inc.php
index f47cb49..7ecec23 100644
--- a/lang/serendipity_lang_cs.inc.php
+++ b/lang/serendipity_lang_cs.inc.php
@@ -762,3 +762,5 @@
 @define('PERMISSION_ADMINIMAGESSYNC', 'adminImagesSync: Sync thumbnails');
 @define('PERMISSION_ADMINCOMMENTS', 'adminComments: Administrate comments');
 @define('PERMISSION_ADMINTEMPLATES', 'adminTemplates: Administrate templates');
+@define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
+@define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
diff --git a/lang/serendipity_lang_cz.inc.php b/lang/serendipity_lang_cz.inc.php
index 67ab4c7..77cc3a5 100644
--- a/lang/serendipity_lang_cz.inc.php
+++ b/lang/serendipity_lang_cz.inc.php
@@ -762,3 +762,5 @@
 @define('PERMISSION_ADMINIMAGESSYNC', 'adminImagesSync: Sync thumbnails');
 @define('PERMISSION_ADMINCOMMENTS', 'adminComments: Administrate comments');
 @define('PERMISSION_ADMINTEMPLATES', 'adminTemplates: Administrate templates');
+@define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
+@define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
diff --git a/lang/serendipity_lang_da.inc.php b/lang/serendipity_lang_da.inc.php
index 3a01221..6e49bd3 100644
--- a/lang/serendipity_lang_da.inc.php
+++ b/lang/serendipity_lang_da.inc.php
@@ -761,3 +761,5 @@
 @define('PERMISSION_ADMINIMAGESSYNC', 'adminImagesSync: Sync thumbnails');
 @define('PERMISSION_ADMINCOMMENTS', 'adminComments: Administrate comments');
 @define('PERMISSION_ADMINTEMPLATES', 'adminTemplates: Administrate templates');
+@define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
+@define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
diff --git a/lang/serendipity_lang_de.inc.php b/lang/serendipity_lang_de.inc.php
index e59b4a2..e4a286f 100644
--- a/lang/serendipity_lang_de.inc.php
+++ b/lang/serendipity_lang_de.inc.php
@@ -761,3 +761,5 @@
 @define('PERMISSION_ADMINIMAGESSYNC', 'adminImagesSync: Thumbnails synchronisieren');
 @define('PERMISSION_ADMINCOMMENTS', 'adminComments: Kommentare verwalten');
 @define('PERMISSION_ADMINTEMPLATES', 'adminTemplates: Templates verwalten');
+@define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
+@define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
diff --git a/lang/serendipity_lang_en.inc.php b/lang/serendipity_lang_en.inc.php
index 46d7677..89670dc 100644
--- a/lang/serendipity_lang_en.inc.php
+++ b/lang/serendipity_lang_en.inc.php
@@ -759,3 +759,5 @@
 @define('PERMISSION_ADMINIMAGESSYNC', 'adminImagesSync: Sync thumbnails');
 @define('PERMISSION_ADMINCOMMENTS', 'adminComments: Administrate comments');
 @define('PERMISSION_ADMINTEMPLATES', 'adminTemplates: Administrate templates');
+@define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
+@define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
diff --git a/lang/serendipity_lang_es.inc.php b/lang/serendipity_lang_es.inc.php
index 66f585c..57e3bfb 100644
--- a/lang/serendipity_lang_es.inc.php
+++ b/lang/serendipity_lang_es.inc.php
@@ -764,3 +764,5 @@
 @define('PERMISSION_ADMINIMAGESSYNC', 'adminImagesSync: Sync thumbnails');
 @define('PERMISSION_ADMINCOMMENTS', 'adminComments: Administrate comments');
 @define('PERMISSION_ADMINTEMPLATES', 'adminTemplates: Administrate templates');
+@define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
+@define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
diff --git a/lang/serendipity_lang_fa.inc.php b/lang/serendipity_lang_fa.inc.php
index 554de69..ea1bdc8 100644
--- a/lang/serendipity_lang_fa.inc.php
+++ b/lang/serendipity_lang_fa.inc.php
@@ -761,3 +761,5 @@
 @define('PERMISSION_ADMINIMAGESSYNC', 'adminImagesSync: Sync thumbnails');
 @define('PERMISSION_ADMINCOMMENTS', 'adminComments: Administrate comments');
 @define('PERMISSION_ADMINTEMPLATES', 'adminTemplates: Administrate templates');
+@define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
+@define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
diff --git a/lang/serendipity_lang_fi.inc.php b/lang/serendipity_lang_fi.inc.php
index 7fba8bc..9dca7fb 100644
--- a/lang/serendipity_lang_fi.inc.php
+++ b/lang/serendipity_lang_fi.inc.php
@@ -759,3 +759,5 @@
 @define('PERMISSION_ADMINIMAGESSYNC', 'adminImagesSync: Sync thumbnails');
 @define('PERMISSION_ADMINCOMMENTS', 'adminComments: Administrate comments');
 @define('PERMISSION_ADMINTEMPLATES', 'adminTemplates: Administrate templates');
+@define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
+@define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
diff --git a/lang/serendipity_lang_fr.inc.php b/lang/serendipity_lang_fr.inc.php
index 588bb31..7ee511c 100644
--- a/lang/serendipity_lang_fr.inc.php
+++ b/lang/serendipity_lang_fr.inc.php
@@ -766,3 +766,5 @@
 @define('PERMISSION_ADMINIMAGESSYNC', 'adminImagesSync: Sync thumbnails');
 @define('PERMISSION_ADMINCOMMENTS', 'adminComments: Administrate comments');
 @define('PERMISSION_ADMINTEMPLATES', 'adminTemplates: Administrate templates');
+@define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
+@define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
diff --git a/lang/serendipity_lang_hu.inc.php b/lang/serendipity_lang_hu.inc.php
index 4f283f1..20093ca 100644
--- a/lang/serendipity_lang_hu.inc.php
+++ b/lang/serendipity_lang_hu.inc.php
@@ -760,3 +760,5 @@
 @define('PERMISSION_ADMINIMAGESSYNC', 'adminImagesSync: Sync thumbnails');
 @define('PERMISSION_ADMINCOMMENTS', 'adminComments: Administrate comments');
 @define('PERMISSION_ADMINTEMPLATES', 'adminTemplates: Administrate templates');
+@define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
+@define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
diff --git a/lang/serendipity_lang_is.inc.php b/lang/serendipity_lang_is.inc.php
index 91447dc..2656033 100644
--- a/lang/serendipity_lang_is.inc.php
+++ b/lang/serendipity_lang_is.inc.php
@@ -759,3 +759,5 @@
 @define('PERMISSION_ADMINIMAGESSYNC', 'adminImagesSync: Sync thumbnails');
 @define('PERMISSION_ADMINCOMMENTS', 'adminComments: Administrate comments');
 @define('PERMISSION_ADMINTEMPLATES', 'adminTemplates: Administrate templates');
+@define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
+@define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
diff --git a/lang/serendipity_lang_it.inc.php b/lang/serendipity_lang_it.inc.php
index 0b4a0f9..ca3077a 100644
--- a/lang/serendipity_lang_it.inc.php
+++ b/lang/serendipity_lang_it.inc.php
@@ -761,3 +761,5 @@
 @define('PERMISSION_ADMINIMAGESSYNC', 'adminImagesSync: Sync thumbnails');
 @define('PERMISSION_ADMINCOMMENTS', 'adminComments: Administrate comments');
 @define('PERMISSION_ADMINTEMPLATES', 'adminTemplates: Administrate templates');
+@define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
+@define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
diff --git a/lang/serendipity_lang_ja.inc.php b/lang/serendipity_lang_ja.inc.php
index 5133a98..51e7f5a 100644
--- a/lang/serendipity_lang_ja.inc.php
+++ b/lang/serendipity_lang_ja.inc.php
@@ -761,3 +761,5 @@ Serendipity のアップグレードステージを無視しました。正し
 @define('PERMISSION_ADMINIMAGESSYNC', 'adminImagesSync: Sync thumbnails');
 @define('PERMISSION_ADMINCOMMENTS', 'adminComments: Administrate comments');
 @define('PERMISSION_ADMINTEMPLATES', 'adminTemplates: Administrate templates');
+@define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
+@define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
diff --git a/lang/serendipity_lang_ko.inc.php b/lang/serendipity_lang_ko.inc.php
index 10f0a5f..3474255 100644
--- a/lang/serendipity_lang_ko.inc.php
+++ b/lang/serendipity_lang_ko.inc.php
@@ -761,3 +761,5 @@
 @define('PERMISSION_ADMINIMAGESSYNC', 'adminImagesSync: 작은 그림 동기화');
 @define('PERMISSION_ADMINCOMMENTS', 'adminComments: 덧글 관리');
 @define('PERMISSION_ADMINTEMPLATES', 'adminTemplates: 템플릿 관리');
+@define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
+@define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
diff --git a/lang/serendipity_lang_nl.inc.php b/lang/serendipity_lang_nl.inc.php
index a02c62c..fb1329e 100644
--- a/lang/serendipity_lang_nl.inc.php
+++ b/lang/serendipity_lang_nl.inc.php
@@ -763,3 +763,5 @@
 @define('PERMISSION_ADMINIMAGESSYNC', 'adminImagesSync: Sync thumbnails');
 @define('PERMISSION_ADMINCOMMENTS', 'adminComments: Administrate comments');
 @define('PERMISSION_ADMINTEMPLATES', 'adminTemplates: Administrate templates');
+@define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
+@define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
diff --git a/lang/serendipity_lang_no.inc.php b/lang/serendipity_lang_no.inc.php
index ba012ee..70a52fb 100644
--- a/lang/serendipity_lang_no.inc.php
+++ b/lang/serendipity_lang_no.inc.php
@@ -762,3 +762,5 @@
 @define('PERMISSION_ADMINIMAGESSYNC', 'adminImagesSync: Sync thumbnails');
 @define('PERMISSION_ADMINCOMMENTS', 'adminComments: Administrate comments');
 @define('PERMISSION_ADMINTEMPLATES', 'adminTemplates: Administrate templates');
+@define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
+@define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
diff --git a/lang/serendipity_lang_pt.inc.php b/lang/serendipity_lang_pt.inc.php
index 9e22042..121a44a 100644
--- a/lang/serendipity_lang_pt.inc.php
+++ b/lang/serendipity_lang_pt.inc.php
@@ -762,3 +762,5 @@
 @define('PERMISSION_ADMINIMAGESSYNC', 'adminImagesSync: Sync thumbnails');
 @define('PERMISSION_ADMINCOMMENTS', 'adminComments: Administrate comments');
 @define('PERMISSION_ADMINTEMPLATES', 'adminTemplates: Administrate templates');
+@define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
+@define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
diff --git a/lang/serendipity_lang_pt_PT.inc.php b/lang/serendipity_lang_pt_PT.inc.php
index c131eec..55ab361 100644
--- a/lang/serendipity_lang_pt_PT.inc.php
+++ b/lang/serendipity_lang_pt_PT.inc.php
@@ -763,3 +763,5 @@
 @define('PERMISSION_ADMINIMAGESSYNC', 'adminImagesSync: Sync thumbnails');
 @define('PERMISSION_ADMINCOMMENTS', 'adminComments: Administrate comments');
 @define('PERMISSION_ADMINTEMPLATES', 'adminTemplates: Administrate templates');
+@define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
+@define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
diff --git a/lang/serendipity_lang_ro.inc.php b/lang/serendipity_lang_ro.inc.php
index 7b64a65..df59a00 100644
--- a/lang/serendipity_lang_ro.inc.php
+++ b/lang/serendipity_lang_ro.inc.php
@@ -759,3 +759,5 @@
 @define('PERMISSION_ADMINIMAGESSYNC', 'adminImagesSync: Sync thumbnails');
 @define('PERMISSION_ADMINCOMMENTS', 'adminComments: Administrate comments');
 @define('PERMISSION_ADMINTEMPLATES', 'adminTemplates: Administrate templates');
+@define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
+@define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
diff --git a/lang/serendipity_lang_ru.inc.php b/lang/serendipity_lang_ru.inc.php
index 8a6185b..65527e6 100644
--- a/lang/serendipity_lang_ru.inc.php
+++ b/lang/serendipity_lang_ru.inc.php
@@ -763,3 +763,5 @@ $i18n_filename_to   = array('_', 'a', 'A', 'b', 'B', 'v', 'V', 'g', 'G', 'd', 'D
 @define('PERMISSION_ADMINIMAGESSYNC', 'adminImagesSync: Sync thumbnails');
 @define('PERMISSION_ADMINCOMMENTS', 'adminComments: Administrate comments');
 @define('PERMISSION_ADMINTEMPLATES', 'adminTemplates: Administrate templates');
+@define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
+@define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
diff --git a/lang/serendipity_lang_se.inc.php b/lang/serendipity_lang_se.inc.php
index e470d84..cd2a563 100644
--- a/lang/serendipity_lang_se.inc.php
+++ b/lang/serendipity_lang_se.inc.php
@@ -761,3 +761,5 @@
 @define('PERMISSION_ADMINIMAGESSYNC', 'adminImagesSync: Sync thumbnails');
 @define('PERMISSION_ADMINCOMMENTS', 'adminComments: Administrate comments');
 @define('PERMISSION_ADMINTEMPLATES', 'adminTemplates: Administrate templates');
+@define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
+@define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
diff --git a/lang/serendipity_lang_tn.inc.php b/lang/serendipity_lang_tn.inc.php
index 99d6bb5..d2b9c62 100644
--- a/lang/serendipity_lang_tn.inc.php
+++ b/lang/serendipity_lang_tn.inc.php
@@ -762,3 +762,5 @@
 @define('PERMISSION_ADMINIMAGESSYNC', 'adminImagesSync: Sync thumbnails');
 @define('PERMISSION_ADMINCOMMENTS', 'adminComments: Administrate comments');
 @define('PERMISSION_ADMINTEMPLATES', 'adminTemplates: Administrate templates');
+@define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
+@define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
diff --git a/lang/serendipity_lang_tw.inc.php b/lang/serendipity_lang_tw.inc.php
index 4fb9327..bf7f046 100644
--- a/lang/serendipity_lang_tw.inc.php
+++ b/lang/serendipity_lang_tw.inc.php
@@ -762,3 +762,5 @@
 @define('PERMISSION_ADMINIMAGESSYNC', 'adminImagesSync: Sync thumbnails');
 @define('PERMISSION_ADMINCOMMENTS', 'adminComments: Administrate comments');
 @define('PERMISSION_ADMINTEMPLATES', 'adminTemplates: Administrate templates');
+@define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
+@define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
diff --git a/lang/serendipity_lang_zh.inc.php b/lang/serendipity_lang_zh.inc.php
index da5652b..feddecd 100644
--- a/lang/serendipity_lang_zh.inc.php
+++ b/lang/serendipity_lang_zh.inc.php
@@ -760,3 +760,5 @@
 @define('PERMISSION_ADMINIMAGESSYNC', 'adminImagesSync: Sync thumbnails');
 @define('PERMISSION_ADMINCOMMENTS', 'adminComments: Administrate comments');
 @define('PERMISSION_ADMINTEMPLATES', 'adminTemplates: Administrate templates');
+@define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
+@define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
diff --git a/serendipity.css.php b/serendipity.css.php
index 2cf4bce..b75f729 100644
--- a/serendipity.css.php
+++ b/serendipity.css.php
@@ -5,6 +5,7 @@
 /* This is a small hack to allow CSS display during installations and upgrades */
 define('IN_installer', true);
 define('IN_upgrader', true);
+define('IN_CSS', true);
 
 session_cache_limiter('public');
 include_once('serendipity_config.inc.php');
-- 
2.39.5