Merge pull request #451 from nfrp/x_powered_by

Re-inforced branding of Community Project- X-Powered-By header
ezsystems · Sep 30, 2012 · 4b5b91c · 4b5b91c
2 parents d2c651c + 7383d9e
commit 4b5b91c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/kernel/content/pdf.php b/kernel/content/pdf.php
@@ -221,7 +221,7 @@ function contentPDFPassthrough( $cacheFile )
     header( 'Cache-Control: ' );
     /* Set cache time out to 10 seconds, this should be good enough to work around an IE bug */
     header( "Expires: ". gmdate( 'D, d M Y H:i:s', time() + 10 ) . ' GMT' );
-    header( 'X-Powered-By: eZ Publish' );
+    header( 'X-Powered-By: ' . eZPublishSDK::EDITION );
 
     header( 'Content-Length: '. $file->size() );
     header( 'Content-Type: application/pdf' );

diff --git a/kernel/package/export.php b/kernel/package/export.php
@@ -51,7 +51,7 @@
     header( "Cache-Control: " );
     header( "Content-Length: $contentLength" );
     header( "Content-Type: $mimeType" );
-    header( "X-Powered-By: eZ Publish" );
+    header( "X-Powered-By: " . eZPublishSDK::EDITION );
     header( "Content-disposition: attachment; filename=$originalFileName" );
     header( "Content-Transfer-Encoding: binary" );
     header( "Accept-Ranges: bytes" );

diff --git a/kernel/private/classes/ezpkerneltreemenu.php b/kernel/private/classes/ezpkerneltreemenu.php
@@ -48,7 +48,7 @@ public function __construct( array $settings = array() )
         require_once __DIR__ . '/treemenu_functions.php';
         $this->setUseExceptions( $this->settings['use-exceptions'] );
 
-        header( 'X-Powered-By: eZ Publish (index_treemenu)' );
+        header( 'X-Powered-By: ' . eZPublishSDK::EDITION . ' (index_treemenu)' );
         if ( $this->settings['use-cache-headers'] === true )
         {
             define( 'MAX_AGE', $this->settings['max-age'] );

diff --git a/kernel/private/classes/ezpkernelweb.php b/kernel/private/classes/ezpkernelweb.php
@@ -290,7 +290,7 @@ public function run()
                 'Last-Modified' => gmdate( 'D, d M Y H:i:s' ) . ' GMT',
                 'Cache-Control' => 'no-cache, must-revalidate',
                 'Pragma' => 'no-cache',
-                'X-Powered-By' => 'eZ Publish',
+                'X-Powered-By' => eZPublishSDK::EDITION,
                 'Content-Type' => 'text/html; charset=' . $this->httpCharset,
                 'Served-by' => $_SERVER["SERVER_NAME"],
                 'Content-language' => $this->languageCode

diff --git a/kernel/rss/feed.php b/kernel/rss/feed.php
@@ -74,7 +74,7 @@
             {
                 header( 'HTTP/1.1 304 Not Modified' );
                 header( 'Last-Modified: ' . $lastModified );
-                header( 'X-Powered-By: eZ Publish' );
+                header( 'X-Powered-By: ' . eZPublishSDK::EDITION );
                 eZExecution::cleanExit();
            }
         }
@@ -92,7 +92,7 @@
     header( 'Content-Type: application/rss+xml; charset=' . $httpCharset );
 
 header( 'Content-Length: ' . strlen( $rssContent ) );
-header( 'X-Powered-By: eZ Publish' );
+header( 'X-Powered-By: ' . eZPublishSDK::EDITION );
 
 for ( $i = 0, $obLevel = ob_get_level(); $i < $obLevel; ++$i )
 {