Add new variable to make serendipity be deaf, mute and blind. Have fun, absynth :)

diff --git a/include/functions_config.inc.php b/include/functions_config.inc.php
index 71afca94cacfe4bc022c40812163adadaeabdad2..d58c860fcf436c6c31bbb597e10549a9f3574212 100644 (file)
--- a/include/functions_config.inc.php
+++ b/include/functions_config.inc.php
@@ -804,16 +804,16 @@ function serendipity_getSessionLanguage() {
     }
 
     if (isset($serendipity['COOKIE']['serendipityLanguage'])) {
-        serendipity_header('X-Serendipity-InterfaceLangSource: Cookie');
+        if ($serendipity['expose_s9y']) serendipity_header('X-Serendipity-InterfaceLangSource: Cookie');
         $lang = $serendipity['COOKIE']['serendipityLanguage'];
     } elseif (!empty($serendipity['languages'][$serendipity['GET']['lang_selected']])) {
-        serendipity_header('X-Serendipity-InterfaceLangSource: GET');
+        if ($serendipity['expose_s9y']) serendipity_header('X-Serendipity-InterfaceLangSource: GET');
         $lang = $serendipity['GET']['lang_selected'];
     } elseif (serendipity_db_bool($serendipity['lang_content_negotiation'])) {
-        serendipity_header('X-Serendipity-InterfaceLangSource: Content-Negotiation');
+        if ($serendipity['expose_s9y']) serendipity_header('X-Serendipity-InterfaceLangSource: Content-Negotiation');
         $lang = serendipity_detectLang();
     } elseif ($_SESSION['serendipityAuthedUser']) {
-        serendipity_header('X-Serendipity-InterfaceLangSource: Database');
+        if ($serendipity['expose_s9y']) serendipity_header('X-Serendipity-InterfaceLangSource: Database');
         $lang = $serendipity['lang'];
     }
 
@@ -821,7 +821,7 @@ function serendipity_getSessionLanguage() {
         $lang = $serendipity['lang'];
     }
 
-    serendipity_header('X-Serendipity-InterfaceLang: ' . $lang);
+    if ($serendipity['expose_s9y']) serendipity_header('X-Serendipity-InterfaceLang: ' . $lang);
 
     if ($lang != $serendipity['lang']) {
         $serendipity['content_lang'] = $lang;

diff --git a/index.php b/index.php
index 24a684227b9814c5c19d6a88571e08f57e354637..a96437e6c020845664550fb7ec3221a585077f60 100644 (file)
--- a/index.php
+++ b/index.php
@@ -17,7 +17,10 @@ if ($global_debug) {
 // We need to set this to return a 200 since we use .htaccess ErrorDocument
 // rules to handle archives.
 header('HTTP/1.0 200');
-header('X-Blog: Serendipity'); // Used for installer detection
+
+if ($serendipity['expose_s9y']) {
+    header('X-Blog: Serendipity'); // Used for installer detection
+}
 
 // Session are needed to also remember an autologin user on the frontend
 ob_start();
@@ -30,7 +33,7 @@ if ($serendipity['CacheControl']) {
         header('Cache-Control: private, pre-check=0, post-check=0, max-age=0');
     }
     header('Expires: 0');
-    header('Pragma: no-cache'); 
+    header('Pragma: no-cache');
 }
 $track_referer = true;
 $uri = $_SERVER['REQUEST_URI'];
@@ -505,7 +508,7 @@ if (preg_match(PAT_ARCHIVES, $uri, $matches) || isset($serendipity['GET']['range
             if ($date < 1) {
                 continue;
             }
-            
+
             if ($m[1] == 'f' || $m[1] == 'from') {
                 $serendipity['GET']['commentStartTime'] = $date;
                 $timedesc['start'] = serendipity_strftime(DATE_FORMAT_SHORT, $date);

diff --git a/serendipity_config.inc.php b/serendipity_config.inc.php
index ce412304907b1814a0c3d1a147121dc53d236459..6295c989f8842ad6125c50e00e7c1d668cbbc894 100644 (file)
--- a/serendipity_config.inc.php
+++ b/serendipity_config.inc.php
@@ -91,6 +91,10 @@ if (!isset($serendipity['CacheControl'])) {
     $serendipity['CacheControl'] = false;
 }
 
+if (!isset($serendipity['expose_s9y'])) {
+    $serendipity['expose_s9y'] = true;
+}
+
 // Should IFRAMEs be used for previewing entries and sending trackbacks?
 $serendipity['use_iframe'] = true;