From 5eb0006588c8899f0b2ce7900f20e14acfeb977e Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 13 Jun 2015 00:14:48 -0400
Subject: add xframe setting

---
 .../HttpServer/ResponseFilter.cs                               | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs')

diff --git a/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs b/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs
index 7490d62d6..f9184f6d1 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs
@@ -12,10 +12,12 @@ namespace MediaBrowser.Server.Implementations.HttpServer
     {
         private static readonly CultureInfo UsCulture = new CultureInfo("en-US");
         private readonly ILogger _logger;
+        private readonly Func<bool> _denyIframeEmbedding;
 
-        public ResponseFilter(ILogger logger)
+        public ResponseFilter(ILogger logger, Func<bool> denyIframeEmbedding)
         {
             _logger = logger;
+            _denyIframeEmbedding = denyIframeEmbedding;
         }
 
         /// <summary>
@@ -28,7 +30,11 @@ namespace MediaBrowser.Server.Implementations.HttpServer
         {
             // Try to prevent compatibility view
             res.AddHeader("X-UA-Compatible", "IE=Edge");
-            res.AddHeader("X-Frame-Options", "DENY");
+
+            if (_denyIframeEmbedding())
+            {
+                res.AddHeader("X-Frame-Options", "DENY");
+            }
 
             var exception = dto as Exception;
 
-- 
cgit v1.2.3


From 0b721f2e056f00fd16fc057405796bdb83297e45 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 25 Jun 2015 17:50:56 -0400
Subject: fix video player time display

---
 MediaBrowser.Api/BaseApiService.cs                               | 3 ++-
 MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs | 2 +-
 MediaBrowser.WebDashboard/Api/PackageCreator.cs                  | 2 --
 3 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs')

diff --git a/MediaBrowser.Api/BaseApiService.cs b/MediaBrowser.Api/BaseApiService.cs
index 70f329946..564cfa93a 100644
--- a/MediaBrowser.Api/BaseApiService.cs
+++ b/MediaBrowser.Api/BaseApiService.cs
@@ -362,7 +362,8 @@ namespace MediaBrowser.Api
             var first = pathInfo.GetArgumentValue<string>(0);
 
             // backwards compatibility
-            if (string.Equals(first, "mediabrowser", StringComparison.OrdinalIgnoreCase))
+            if (string.Equals(first, "mediabrowser", StringComparison.OrdinalIgnoreCase) ||
+                string.Equals(first, "emby", StringComparison.OrdinalIgnoreCase))
             {
                 index++;
             }
diff --git a/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs b/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs
index f9184f6d1..0da34efc6 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs
@@ -33,7 +33,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
 
             if (_denyIframeEmbedding())
             {
-                res.AddHeader("X-Frame-Options", "DENY");
+                res.AddHeader("X-Frame-Options", "SAMEORIGIN");
             }
 
             var exception = dto as Exception;
diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
index f29807890..9764fe612 100644
--- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs
+++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
@@ -657,8 +657,6 @@ namespace MediaBrowser.WebDashboard.Api
                                       "librarymenu.css",
                                       "librarybrowser.css",
                                       "card.css",
-                                      "tileitem.css",
-                                      "metadataeditor.css",
                                       "notifications.css",
                                       "search.css",
                                       "pluginupdates.css",
-- 
cgit v1.2.3