From bdaa439965f839ac754a9849140592c07ea99610 Mon Sep 17 00:00:00 2001 From: mmcadams Date: Fri, 17 Aug 2012 10:52:13 -0700 Subject: [PATCH] Added SmarterStats 7+ functionality --- WebsitePanel/Database/update_db.sql | 9 +++++++++ .../SmarterStats5.cs | 17 ++++++++++++----- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql index e9636137..f30da34d 100644 --- a/WebsitePanel/Database/update_db.sql +++ b/WebsitePanel/Database/update_db.sql @@ -4772,3 +4772,12 @@ RETURN GO + +IF EXISTS (SELECT * FROM [dbo].[Providers] WHERE [DisplayName] = 'SmarterStats 5.x-6.x') +BEGIN + UPDATE [dbo].[Providers] + SET [DisplayName] = 'SmarterStats 5.x +' + WHERE [DisplayName] = 'SmarterStats 5.x-6.x' +END +GO + diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Statistics.SmarterStats/SmarterStats5.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Statistics.SmarterStats/SmarterStats5.cs index 99ed9eba..1c885360 100644 --- a/WebsitePanel/Sources/WebsitePanel.Providers.Statistics.SmarterStats/SmarterStats5.cs +++ b/WebsitePanel/Sources/WebsitePanel.Providers.Statistics.SmarterStats/SmarterStats5.cs @@ -102,11 +102,18 @@ namespace WebsitePanel.Providers.Statistics // if (String.IsNullOrEmpty(productVersion)) return false; - // Match SmarterStats either 5.x or 6.x version - if (productVersion.StartsWith("5.") - || productVersion.StartsWith("6.")) - return true; - // + + // Match SmarterStats 5.x or newer versions + int version = 0; + string[] split = productVersion.Split(new[] { '.' }); + + if (int.TryParse(split[0], out version)) + { + if(version >= 5) + return true; + } + // + return false; } }