pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

This commit is contained in:
Luke Pulverenti 2014-06-11 10:42:13 -04:00
parent 77ad0fc336 7302b9a4be
commit f86e8a415a
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Common.Implementations/Security/MBRegistration.cs
View File

@ -52,6 +52,7 @@ namespace MediaBrowser.Common.Implementations.Security
{ {
//check the reg file first to alleviate strain on the MB admin server - must actually check in every 30 days tho //check the reg file first to alleviate strain on the MB admin server - must actually check in every 30 days tho
var reg = new RegRecord { registered = LicenseFile.LastChecked(feature) > DateTime.UtcNow.AddDays(-30) }; var reg = new RegRecord { registered = LicenseFile.LastChecked(feature) > DateTime.UtcNow.AddDays(-30) };
var success = reg.registered;
if (!reg.registered) if (!reg.registered)
{ {
@ -73,6 +74,7 @@ namespace MediaBrowser.Common.Implementations.Security
using (var json = await httpClient.Post(MBValidateUrl, data, CancellationToken.None).ConfigureAwait(false)) using (var json = await httpClient.Post(MBValidateUrl, data, CancellationToken.None).ConfigureAwait(false))
{ {
reg = jsonSerializer.DeserializeFromStream<RegRecord>(json); reg = jsonSerializer.DeserializeFromStream<RegRecord>(json);
success = true;
} }
if (reg.registered) if (reg.registered)
@ -91,7 +93,7 @@ namespace MediaBrowser.Common.Implementations.Security
} }
} }
return new MBRegistrationRecord { IsRegistered = reg.registered, ExpirationDate = reg.expDate, RegChecked = true }; return new MBRegistrationRecord { IsRegistered = reg.registered, ExpirationDate = reg.expDate, RegChecked = true, RegError = !success};
} }
} }
} }

3
MediaBrowser.sln
View File

@ -283,7 +283,4 @@ Global
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
GlobalSection(Performance) = preSolution
HasPerformanceSessions = true
EndGlobalSection
EndGlobal EndGlobal