diff --git a/DNN Platform/Library/Entities/Host/Host.cs b/DNN Platform/Library/Entities/Host/Host.cs
index 8950a1c43a2..95622c87b8d 100644
--- a/DNN Platform/Library/Entities/Host/Host.cs
+++ b/DNN Platform/Library/Entities/Host/Host.cs
@@ -433,7 +433,7 @@ public static bool ParticipateInImprovementProg
{
get
{
- return HostController.Instance.GetBoolean("DNNImprovementProgram", true);
+ return HostController.Instance.GetBoolean("DnnImprovementProgram", true);
}
}
diff --git a/DNN Platform/Library/Services/ImprovementsProgram/BeaconService.cs b/DNN Platform/Library/Services/ImprovementsProgram/BeaconService.cs
index dba27338374..59cdd797dd3 100644
--- a/DNN Platform/Library/Services/ImprovementsProgram/BeaconService.cs
+++ b/DNN Platform/Library/Services/ImprovementsProgram/BeaconService.cs
@@ -41,7 +41,7 @@ public string GetBeaconEndpoint()
return _beaconEndpoint;
}
- public bool IsBeaconEnabled(UserInfo user)
+ public bool IsBeaconEnabledForControlBar(UserInfo user)
{
//check for Update Service Opt-in
//check if a host or admin
@@ -74,8 +74,8 @@ public string GetBeaconQuery(UserInfo user, string filePath = null)
// h: Host GUID - hashed
// p: Portal ID
// a: Portal Alias
- // r: Role(s) - bitmask - Host = 1, Admin = 2, ContentManager=4, ContentEditor=8, CommunityManager=16
- // u: UserSession - hashed
+ // r: Role(s) - bitmask - see RolesEnum
+ // u: User ID - hashed
// f: filename/path (optional; unused here)
var portalSettings = PortalController.Instance.GetCurrentPortalSettings();
@@ -92,7 +92,7 @@ public string GetBeaconQuery(UserInfo user, string filePath = null)
if (!string.IsNullOrEmpty(filePath))
qparams["f"] = HttpUtility.UrlEncode(filePath);
- return "/log?" + string.Join("&", qparams.Select(kpv => kpv.Key + "=" + kpv.Value));
+ return "?" + string.Join("&", qparams.Select(kpv => kpv.Key + "=" + kpv.Value));
}
private string GetHash(string data)
diff --git a/DNN Platform/Library/Services/ImprovementsProgram/IBeaconService.cs b/DNN Platform/Library/Services/ImprovementsProgram/IBeaconService.cs
index 869247f924d..10af34f8a38 100644
--- a/DNN Platform/Library/Services/ImprovementsProgram/IBeaconService.cs
+++ b/DNN Platform/Library/Services/ImprovementsProgram/IBeaconService.cs
@@ -6,6 +6,6 @@ public interface IBeaconService
{
string GetBeaconEndpoint();
string GetBeaconQuery(UserInfo user, string filePath = null);
- bool IsBeaconEnabled(UserInfo user);
+ bool IsBeaconEnabledForControlBar(UserInfo user);
}
}
\ No newline at end of file
diff --git a/DNN Platform/Website/Install/InstallWizard.aspx b/DNN Platform/Website/Install/InstallWizard.aspx
index 2c66115bf91..3e4f5f244c0 100644
--- a/DNN Platform/Website/Install/InstallWizard.aspx
+++ b/DNN Platform/Website/Install/InstallWizard.aspx
@@ -219,6 +219,16 @@
+
@@ -666,7 +676,8 @@
databaseSecurity: "",
databaseUsername: "",
databasePassword: "",
- databaseRunAsOwner: null
+ databaseRunAsOwner: null,
+ dnnImprovementProgram: true
};
$('#<%= lblAccountInfoError.ClientID %>').css('display', 'none');
var databaseType = $('#<%= databaseSetupType.ClientID %> input:checked').val();
@@ -680,6 +691,7 @@
installWizard.installInfo.databaseUsername = $('#<%= txtDatabaseUsername.ClientID %>')[0].value;
installWizard.installInfo.databasePassword = $('#<%= txtDatabasePassword.ClientID %>')[0].value;
installWizard.installInfo.databaseRunAsOwner = $('#<%= databaseRunAs.ClientID %>')[0].value;
+ installWizard.installInfo.dnnImprovementProgram = $('#<%= chkImprovementProgram.ClientID %>')[0].value;
}
PageMethods.ValidateInput(installWizard.installInfo, function(result) {
diff --git a/DNN Platform/Website/Install/InstallWizard.aspx.cs b/DNN Platform/Website/Install/InstallWizard.aspx.cs
index 3db532e526d..c9fed2522eb 100644
--- a/DNN Platform/Website/Install/InstallWizard.aspx.cs
+++ b/DNN Platform/Website/Install/InstallWizard.aspx.cs
@@ -612,7 +612,16 @@ private static void UpdateInstallConfig(Dictionary installInfo)
FirstName = "SuperUser",
LastName = "Account"
},
- InstallCulture = installInfo["language"]
+ InstallCulture = installInfo["language"],
+ Settings = new List
+ {
+ new HostSettingConfig
+ {
+ Name = "DnnImprovementProgram",
+ Value = installInfo["DnnImprovementProgram"],
+ IsSecure = false
+ }
+ }
};
// Website Portal Config
diff --git a/DNN_Platform.sln b/DNN_Platform.sln
index ee0ab9147c5..91c5c4636c8 100644
--- a/DNN_Platform.sln
+++ b/DNN_Platform.sln
@@ -1,7 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25123.0
-VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Support Projects", "Support Projects", "{1DFA65CE-5978-49F9-83BA-CFBD0C7A1814}"
EndProject
@@ -308,6 +307,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Install", "Install", "{2230
DNN Platform\Website\Install\InstallWizard.aspx = DNN Platform\Website\Install\InstallWizard.aspx
DNN Platform\Website\Install\InstallWizard.aspx.cs = DNN Platform\Website\Install\InstallWizard.aspx.cs
DNN Platform\Website\Install\InstallWizard.aspx.designer.cs = DNN Platform\Website\Install\InstallWizard.aspx.designer.cs
+ Website\Install\UpgradeWizard.aspx = Website\Install\UpgradeWizard.aspx
+ Website\Install\UpgradeWizard.aspx.cs = Website\Install\UpgradeWizard.aspx.cs
+ Website\Install\UpgradeWizard.aspx.designer.cs = Website\Install\UpgradeWizard.aspx.designer.cs
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Cleanup", "Cleanup", "{3ABA7D78-1F99-45C6-BBFB-B53BA0C1DD2E}"
diff --git a/Website/DesktopModules/Admin/HostSettings/App_LocalResources/HostSettings.ascx.resx b/Website/DesktopModules/Admin/HostSettings/App_LocalResources/HostSettings.ascx.resx
index 8b174e5cdb5..1c7ffa36db7 100644
--- a/Website/DesktopModules/Admin/HostSettings/App_LocalResources/HostSettings.ascx.resx
+++ b/Website/DesktopModules/Admin/HostSettings/App_LocalResources/HostSettings.ascx.resx
@@ -1157,7 +1157,7 @@ Both Compacting and Re-Indexing are done by Site Search Crawler scheduled job.
Debug Mode:
- Check this box to participate in the DNN Improvement Program. <a href="http://www.dnnsoftware.com/dnn-improvement-program" target="_blank">See More</a>.
+ Check this box to participate in the DNN Improvement Program. <a href="http://www.dnnsoftware.com/dnn-improvement-program" target="_blank">Learn More</a>.
Participate in DNN Improvement Program:
diff --git a/Website/DesktopModules/Admin/HostSettings/HostSettings.ascx.cs b/Website/DesktopModules/Admin/HostSettings/HostSettings.ascx.cs
index 2cdb7ad63d1..0116eb11504 100644
--- a/Website/DesktopModules/Admin/HostSettings/HostSettings.ascx.cs
+++ b/Website/DesktopModules/Admin/HostSettings/HostSettings.ascx.cs
@@ -864,7 +864,7 @@ protected void UpdateSettings(object sender, EventArgs e)
HostController.Instance.Update("HelpURL", txtHelpURL.Text, false);
HostController.Instance.Update("EnableContentLocalization", chkEnableContentLocalization.Checked ? "Y" : "N", false);
HostController.Instance.Update("DebugMode", chkDebugMode.Checked ? "True" : "False", false);
- HostController.Instance.Update("DNNImprovementProgram", chkImprovementProgram.Checked ? "True" : "False", false);
+ HostController.Instance.Update("DnnImprovementProgram", chkImprovementProgram.Checked ? "True" : "False", false);
HostController.Instance.Update("ShowCriticalErrors", chkCriticalErrors.Checked ? "Y" : "N", true);
HostController.Instance.Update("MessageSchedulerBatchSize", txtBatch.Text, false);
HostController.Instance.Update("UpgradeForceSSL", chkUpgradeForceSSL.Checked ? "Y" : "N", false);
diff --git a/Website/Install/App_LocalResources/Installwizard.aspx.resx b/Website/Install/App_LocalResources/Installwizard.aspx.resx
index e3c4f9aab1d..e51dc5a3d86 100644
--- a/Website/Install/App_LocalResources/Installwizard.aspx.resx
+++ b/Website/Install/App_LocalResources/Installwizard.aspx.resx
@@ -177,6 +177,18 @@
User Defined
+
+ Product Improvement Program
+
+
+ The product improvement program allows us to better understand how we can
+improve DNN for you. The data will help us analyze usage and what is important
+for people using the product. All of the data is anonymous and for internal use only.<br />
+Learn more about the <a href="http://www.dnnsoftware.com/dnn-improvement-program" target="_blank">Product Improvement Program</a>.
+
+
+ Send anonymous usage information to DNN
+
Checking File and Folder Permissions
diff --git a/Website/Install/DotNetNuke.install.config.resources b/Website/Install/DotNetNuke.install.config.resources
index db0ddcaeaa8..1818f593fe4 100644
--- a/Website/Install/DotNetNuke.install.config.resources
+++ b/Website/Install/DotNetNuke.install.config.resources
@@ -4,7 +4,7 @@
- 08.00.01
+ 08.00.04
en-US
SuperUser
@@ -33,6 +33,7 @@
N
Y
+ Y
Y
N
Y
diff --git a/Website/admin/ControlPanel/ControlBar.ascx.cs b/Website/admin/ControlPanel/ControlBar.ascx.cs
index 9e042f4d332..2df5f08f224 100644
--- a/Website/admin/ControlPanel/ControlBar.ascx.cs
+++ b/Website/admin/ControlPanel/ControlBar.ascx.cs
@@ -1114,7 +1114,7 @@ protected bool IsBeaconEnabled
get
{
var user = UserController.Instance.GetCurrentUserInfo();
- return BeaconService.Instance.IsBeaconEnabled(user);
+ return BeaconService.Instance.IsBeaconEnabledForControlBar(user);
}
}