Skip to content

Commit bf47884

Browse files
valadasvaladas
authored
Merge pull request #29 from DNNCommunity/develop
Released v5.1.0
2 parents 592d67b + 2db306c commit bf47884

24 files changed

Lines changed: 2060 additions & 1862 deletions

‎BuildScripts/ModulePackage.targets‎

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,11 @@
7272
</CreateItem>
7373

7474
<Copy SourceFiles="$(MSBuildDnnBinPath)\$(AssemblyName).dll" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
75+
<Copy SourceFiles="$(MSBuildDnnBinPath)\HtmlSanitizer.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
76+
<Copy SourceFiles="$(MSBuildDnnBinPath)\AngleSharp.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
77+
<Copy SourceFiles="$(MSBuildDnnBinPath)\AngleSharp.Css.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
78+
<Copy SourceFiles="$(MSBuildDnnBinPath)\System.Collections.Immutable.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
79+
<Copy SourceFiles="$(MSBuildDnnBinPath)\System.Text.Encoding.CodePages.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
7580
<Copy SourceFiles="@(SqlDataProviderFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package\%(RecursiveDir)" />
7681
<Copy SourceFiles="@(PackageManifestFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
7782
<Copy SourceFiles="@(PackageTxtFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
@@ -95,31 +100,7 @@
95100
<!-- Copy the Install package to the Packages folder -->
96101
<Copy SourceFiles="$(MSBuildProjectDirectory)\$(PackageName)_$(Version)_Install.$(Extension)" DestinationFolder="install/" />
97102

98-
<RemoveDir Directories ="$(MSBuildProjectDirectory)\Package" />
99-
<RemoveDir Directories ="$(MSBuildProjectDirectory)\ResourcesZip" />
100-
101-
<Copy SourceFiles="$(MSBuildDnnBinPath)\$(AssemblyName).dll" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
102-
<Copy SourceFiles="@(SqlDataProviderFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package\%(RecursiveDir)" />
103-
<Copy SourceFiles="@(PackageManifestFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
104-
<Copy SourceFiles="@(PackageTxtFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
105-
106-
<!-- create the SOURCE RESOURCES.ZIP file -->
107-
<Copy SourceFiles="@(SourceInclude)" DestinationFolder="$(MSBuildProjectDirectory)\ResourcesZip\%(RecursiveDir)" />
108-
109-
<CreateItem Include="$(MSBuildProjectDirectory)\ResourcesZip\**\*.*">
110-
<Output TaskParameter="Include" ItemName="SourceContent" />
111-
</CreateItem>
112-
113-
<Zip Files="@(SourceContent)" WorkingDirectory="$(MSBuildProjectDirectory)\ResourcesZip" ZipFileName="Resources.$(Extension)" />
114-
<Copy SourceFiles="$(MSBuildProjectDirectory)\Resources.$(Extension)" DestinationFolder="package/" />
115-
116-
<CreateItem Include="$(MSBuildProjectDirectory)\Package\**\*.*">
117-
<Output TaskParameter="Include" ItemName="OutputSource" />
118-
</CreateItem>
119-
120-
<Zip Files="@(OutputSource)" WorkingDirectory="$(MSBuildProjectDirectory)\Package" ZipFileName="$(PackageName)_$(Version)_Source.$(Extension)" />
121-
<Copy SourceFiles="$(MSBuildProjectDirectory)\$(PackageName)_$(Version)_Source.$(Extension)" DestinationFolder="install/" />
122-
103+
123104
<Delete Files="$(MSBuildProjectDirectory)\$(PackageName)_$(Version)_Install.$(Extension)" />
124105
<Delete Files="$(MSBuildProjectDirectory)\$(PackageName)_$(Version)_Source.$(Extension)" />
125106

‎BusinessObjects/Models/Topic.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ public string UpdatedByUsername
283283
get
284284
{
285285
UserInfo user = UserController.GetUserById(
286-
PortalController.GetCurrentPortalSettings().PortalId,
286+
PortalController.Instance.GetCurrentSettings().PortalId,
287287
this.UpdatedByUserID);
288288
if (user != null)
289289
{

‎BusinessObjects/Models/TopicHistory.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ public string UpdatedByUsername
209209
get
210210
{
211211
UserInfo user = UserController.GetUserById(
212-
PortalController.GetCurrentPortalSettings().PortalId,
212+
PortalController.Instance.GetCurrentSettings().PortalId,
213213
this.UpdatedByUserID);
214214
if (user != null)
215215
{

‎BusinessObjects/TopicBO.cs‎

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#endregion Copyright
2525

2626
using DotNetNuke.Entities.Users;
27+
using DotNetNuke.Security.Roles;
2728
using DotNetNuke.Wiki.BusinessObjects.Models;
2829
using DotNetNuke.Wiki.Utilities;
2930
using System.Collections.Generic;
@@ -179,14 +180,16 @@ public List<string> GetNotificationEmails(Topic topic)
179180
// Compile our view users, only if enabled
180181
if (fetchViewUsers)
181182
{
182-
foreach (string role in objModule.AuthorizedViewRoles.Trim(new char[] { ';' }).Split(new char[] { ';' }))
183+
var viewRoleNames = objModule.ModulePermissions
184+
.Where(p => p.PermissionKey == "VIEW" && p.AllowAccess)
185+
.Select(p => p.RoleName);
186+
foreach (var role in viewRoleNames)
183187
{
184188
if (role.ToLower().Equals("all users"))
185189
{
186190
// Trap against fake roles
187-
var arrUsers =
188-
DotNetNuke.Entities.Users.UserController.GetUsers(DotNetNuke.Entities.Portals.PortalController.GetCurrentPortalSettings().PortalId).OfType<UserInfo>();
189-
foreach (DotNetNuke.Entities.Users.UserInfo objUser in arrUsers)
191+
var arrUsers = UserController.GetUsers(DotNetNuke.Entities.Portals.PortalController.Instance.GetCurrentSettings().PortalId).OfType<UserInfo>();
192+
foreach (var objUser in arrUsers)
190193
{
191194
if (!lstUsers.Contains(objUser.Email))
192195
{
@@ -197,12 +200,13 @@ public List<string> GetNotificationEmails(Topic topic)
197200
else
198201
{
199202
// This role should be legit
200-
foreach (DotNetNuke.Entities.Users.UserRoleInfo objUserRole in
201-
objRoles.GetUserRolesByRoleName(objModule.PortalID, role))
203+
var roleInfo = objRoles.GetRoleByName(objModule.PortalID, role);
204+
var usersInRole = RoleController.Instance.GetUsersByRole(objModule.PortalID, roleInfo.RoleName);
205+
foreach (var user in usersInRole)
202206
{
203-
if (!lstUsers.Contains(objUserRole.Email))
207+
if (!lstUsers.Contains(user.Email))
204208
{
205-
lstUsers.Add(objUserRole.Email);
209+
lstUsers.Add(user.Email);
206210
}
207211
}
208212
}
@@ -215,20 +219,24 @@ public List<string> GetNotificationEmails(Topic topic)
215219
if (fetchUsingDNNRoles)
216220
{
217221
// Fetch using dnn edit roles
218-
foreach (string role in objModule.AuthorizedEditRoles.Trim(new char[] { ';' }).Split(new char[] { ';' }))
222+
var editRoles = objModule.ModulePermissions
223+
.Where(p => p.PermissionKey == "EDIT" && p.AllowAccess)
224+
.Select(p => p.RoleName);
225+
foreach (string role in editRoles)
219226
{
220227
if (role.ToLower().Equals("all users"))
221228
{
222229
// Trap against fake roles
223230
}
224231
else
225232
{
233+
var usersInRole = RoleController.Instance.GetUsersByRole(objModule.PortalID, role);
226234
// This role should be legit
227-
foreach (DotNetNuke.Entities.Users.UserRoleInfo objUserRole in objRoles.GetUserRolesByRoleName(objModule.PortalID, role))
235+
foreach (var user in usersInRole)
228236
{
229-
if (!lstUsers.Contains(objUserRole.Email))
237+
if (!lstUsers.Contains(user.Email))
230238
{
231-
lstUsers.Add(objUserRole.Email);
239+
lstUsers.Add(user.Email);
232240
}
233241
}
234242
}
@@ -239,11 +247,12 @@ public List<string> GetNotificationEmails(Topic topic)
239247
// Fetch using custom wiki edit roles
240248
foreach (string role in wikiSettings.ContentEditorRoles.Trim(new char[] { ';' }).Split(new char[] { ';' }))
241249
{
242-
foreach (DotNetNuke.Entities.Users.UserRoleInfo objUserRole in objRoles.GetUserRolesByRoleName(objModule.PortalID, role))
250+
var usersInRole = RoleController.Instance.GetUsersByRole(objModule.PortalID, role);
251+
foreach (var user in usersInRole)
243252
{
244-
if (!lstUsers.Contains(objUserRole.Email))
253+
if (!lstUsers.Contains(user.Email))
245254
{
246-
lstUsers.Add(objUserRole.Email);
255+
lstUsers.Add(user.Email);
247256
}
248257
}
249258
}

‎BusinessObjects/UnitOfWork.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public UnitOfWork()
8282

8383
if (HttpContext.Current != null && HttpContext.Current.User.Identity.IsAuthenticated)
8484
{
85-
this.mCurrentUser = UserController.GetCurrentUserInfo();
85+
this.mCurrentUser = UserController.Instance.GetCurrentUserInfo();
8686
}
8787
}
8888

0 commit comments

Comments
 (0)