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.

diff --git a/docs/NEWS b/docs/NEWS
index 922001776dc28498652c16ac1cd55b6387b1ec0f..97007e36307eab7830a792a81c7c1e11818336ac 100644 (file)
--- 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 5a250fe15f49e822483a28fb765edc41db2f9d6d..560c50e342c7c203cbb80b4520ae81fab758ea70 100644 (file)
--- 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 8fc4731498a177675eed76a25e2fb6d1c3b36eeb..068e685c6682e2eb89b73847353cf0da38481728 100644 (file)
--- 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 889666e35ae8eadbb2d7bd6d699a75ba49d464f5..ec8f33692fee41fafc7a7e88c00c7b0bb8107b10 100644 (file)
--- 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 2a880e2e22c306c448bac85ac5ee00a37280a8b5..e9d83bdb4d5eca39c364de5adda53ac3d806abba 100644 (file)
--- 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 14ad4766adba93dd9fe1b7fcd3baca0e6b8b37fb..fcb92939b96759a7bce703109174df5a76a99340 100644 (file)
--- 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 f47cb49135ad208fe13a0ca82e281aba348c4b14..7ecec23a77b4ae28501ede7cd562a914f9208cb1 100644 (file)
--- 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 67ab4c736e71a62791361ac16e488bd51ff50a1b..77cc3a5b7e9c839be1c25dca04a38dabe568d189 100644 (file)
--- 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 3a012217e90112d44bfaf154f2f4b161a2c5f40b..6e49bd31b03ec56d48ec6c32ad3e974582d4e899 100644 (file)
--- 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 e59b4a20a87afc0af192624155fa5f82e8714f9c..e4a286fd7d37390a4a4748e964022cd342be4d9c 100644 (file)
--- 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 46d7677b498d55b0338f410c2e1f93ec93f31702..89670dcca46bf4922b2ca29a4f85c26610cf8aa6 100644 (file)
--- 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 66f585c35d0cd23293ec9b5af13862b2ec125f23..57e3bfb6c29a74b8ce5c7ae917296a9911aae4f4 100644 (file)
--- 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 554de69d4513b3b62f0bd94eac992fc71cb22c17..ea1bdc813a6bd8fae04cb8993838005a6fa7b70c 100644 (file)
--- 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 7fba8bc5d5737ac5a1a42e023afb7fed14d5bc94..9dca7fb16cd005fae590d23039b9a2a0747b4ec4 100644 (file)
--- 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 588bb31c5069cd5fdce16e257612383be5223fcd..7ee511c73f2a260f4778e387aa5bf33a409e7f4b 100644 (file)
--- 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 4f283f1b0080564812706a1b06d5068f77b8604d..20093cab022174ccd2efaa6c5bebf320192de93e 100644 (file)
--- 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 91447dc9d98e397446d39cc72b56d18877516141..2656033bc5b6f34feb01f68e1a4ca39310699371 100644 (file)
--- 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 0b4a0f90da02a31d2892e094617df3dbc98d565f..ca3077a46acbe28486af92428dcda00d86ecaaf3 100644 (file)
--- 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 5133a986f7362bf0a102c87c54a8ba43e48e161c..51e7f5a7df5cfc566837e1e5dfc8d59945a1cf5f 100644 (file)
--- 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 10f0a5f92b4f944f9b2c6d62227ae60a16f89714..34742551deb0971e2205d2335c73067e4afd88d2 100644 (file)
--- 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 a02c62c3fe56e790dfcc5c0dc0e933e455ce3a39..fb1329e861a1a08f7abf718891bea92a51ca4dda 100644 (file)
--- 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 ba012ee02f3d77d0ad54b876f8527f8bc19555d2..70a52fb72ecfe7fb0f42948b9b8b6f6e5c5dd1a1 100644 (file)
--- 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 9e22042fa9d8247e8ddf33f77f07e1d617d00aaf..121a44a287f8e434cf647a8f8a4a20b55f9dea13 100644 (file)
--- 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 c131eec777b2c03460166a8dc3f568d11e4831f8..55ab36141c7e868cc8df1af287a45f37a6ba72eb 100644 (file)
--- 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 7b64a65be0e41b6289be25a9840efc414d3964c9..df59a005e856d7cdf58a5dd2af4337540c153882 100644 (file)
--- 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 8a6185be93e7ac213e84998288c1ed67c24263fd..65527e684d0f4ab96d9d0296ec3ab08d65a8e955 100644 (file)
--- 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 e470d84d6f220a49eeff35d5866762cabf2e2735..cd2a56312792054f542a6d8bb6b3a077de3defcb 100644 (file)
--- 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 99d6bb570c9dbafaa05fa3b135ea398a96f7bbea..d2b9c620aca279662d0f5bdee15c54a2471de7a3 100644 (file)
--- 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 4fb93276fd9b627a6a9bc8b2c5b89d4dedf5a252..bf7f046003da6d2d9b55f848e85fde9350ab8ff8 100644 (file)
--- 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 da5652beac8dc7080f5f5c510691a0b77a8db308..feddecdc35f70de5961d5d1d1977ab58cf0abb4a 100644 (file)
--- 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 2cf4bcec03ac206161dfb43554f19617418339f0..b75f729c4cbd93185cd83592facfee429d165432 100644 (file)
--- 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');