From 976523afa92420de1b690e3a7e35e003e1899ff9 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 26 Oct 2013 18:01:21 -0400
Subject: added new params for missing/unaired

---
 MediaBrowser.Model/Configuration/UserConfiguration.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'MediaBrowser.Model/Configuration/UserConfiguration.cs')

diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index d88474d61..43561cd74 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -56,8 +56,9 @@ namespace MediaBrowser.Model.Configuration
 
         public bool IsDisabled { get; set; }
 
-        public bool DisplayVirtualEpisodes { get; set; }
-        
+        public bool DisplayMissingEpisodes { get; set; }
+        public bool DisplayUnairedEpisodes { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="UserConfiguration" /> class.
         /// </summary>
@@ -65,7 +66,6 @@ namespace MediaBrowser.Model.Configuration
         {
             IsAdministrator = true;
             BlockNotRated = false;
-            DisplayVirtualEpisodes = true;
         }
     }
 }
-- 
cgit v1.2.3


From 2f99b2e1e60f7a36c7f9c420c07fb608bb231fbf Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 30 Oct 2013 11:55:55 -0400
Subject: fixes #566 - Add permission configuration for remote control

---
 MediaBrowser.Api/SessionsService.cs                   | 15 ++++++++++++++-
 MediaBrowser.Model/Configuration/UserConfiguration.cs |  2 ++
 2 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'MediaBrowser.Model/Configuration/UserConfiguration.cs')

diff --git a/MediaBrowser.Api/SessionsService.cs b/MediaBrowser.Api/SessionsService.cs
index 5888d9fba..a3f7e3037 100644
--- a/MediaBrowser.Api/SessionsService.cs
+++ b/MediaBrowser.Api/SessionsService.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Controller.Dto;
+using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Session;
 using ServiceStack.ServiceHost;
@@ -182,16 +183,18 @@ namespace MediaBrowser.Api
         private readonly ISessionManager _sessionManager;
 
         private readonly IDtoService _dtoService;
+        private readonly IUserManager _userManager;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SessionsService" /> class.
         /// </summary>
         /// <param name="sessionManager">The session manager.</param>
         /// <param name="dtoService">The dto service.</param>
-        public SessionsService(ISessionManager sessionManager, IDtoService dtoService)
+        public SessionsService(ISessionManager sessionManager, IDtoService dtoService, IUserManager userManager)
         {
             _sessionManager = sessionManager;
             _dtoService = dtoService;
+            _userManager = userManager;
         }
 
         /// <summary>
@@ -208,6 +211,16 @@ namespace MediaBrowser.Api
                 result = result.Where(i => i.SupportsRemoteControl == request.SupportsRemoteControl.Value);
             }
 
+            if (request.ControllableByUserId.HasValue)
+            {
+                var user = _userManager.GetUserById(request.ControllableByUserId.Value);
+
+                if (!user.Configuration.EnableRemoteControlOfOtherUsers)
+                {
+                    result = result.Where(i => i.User == null || i.User.Id == request.ControllableByUserId.Value);
+                }
+            }
+
             return ToOptimizedResult(result.Select(_dtoService.GetSessionInfoDto).ToList());
         }
 
diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index 43561cd74..b736474e0 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -58,6 +58,7 @@ namespace MediaBrowser.Model.Configuration
 
         public bool DisplayMissingEpisodes { get; set; }
         public bool DisplayUnairedEpisodes { get; set; }
+        public bool EnableRemoteControlOfOtherUsers { get; set; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="UserConfiguration" /> class.
@@ -65,6 +66,7 @@ namespace MediaBrowser.Model.Configuration
         public UserConfiguration()
         {
             IsAdministrator = true;
+            EnableRemoteControlOfOtherUsers = true;
             BlockNotRated = false;
         }
     }
-- 
cgit v1.2.3