Skip to content

Commit afeac7c

Browse files
WillStrohlWillStrohl
authored
Merge pull request #240 from DNNCommunity/dev
07.00.04 Release Tasks
2 parents 12c7a5c + fc3b3f5 commit afeac7c

37 files changed

+133
-577
lines changed

‎ActiveForumViewer.ascx.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
1717
// CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
1818
// DEALINGS IN THE SOFTWARE.
19-
//
2019

2120
using System;
2221
using System.Web.UI.WebControls;
@@ -91,4 +90,4 @@ protected override void OnLoad(EventArgs e)
9190
}
9291
#endregion
9392
}
94-
}
93+
}

‎ActiveForums.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,9 @@
216216
<Content Include="config\templates\ModAlert_html.txt" />
217217
<Content Include="config\templates\ToolBar.txt" />
218218
<Content Include="config\templates\_UserProfile.txt" />
219-
<Content Include="controls\admin_properties.ascx" />
219+
<Content Include="controls\admin_properties.ascx">
220+
<SubType>ASPXCodeBehind</SubType>
221+
</Content>
220222
<Content Include="controls\admin_securitygrid.ascx">
221223
<SubType>ASPXCodeBehind</SubType>
222224
</Content>
@@ -638,6 +640,7 @@
638640
<None Include="sql\06.01.06.SqlDataProvider" />
639641
<None Include="sql\06.01.03.SqlDataProvider" />
640642
<None Include="sql\06.03.03.SqlDataProvider" />
643+
<None Include="sql\07.00.04.SqlDataProvider" />
641644
<None Include="sql\06.04.01.SqlDataProvider" />
642645
<None Include="sql\07.00.02.SqlDataProvider" />
643646
<None Include="sql\07.00.00.SqlDataProvider" />

‎ActiveForums.dnn

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<dotnetnuke type="Package" version="5.0">
22
<packages>
3-
<package name="Active Forums" type="Module" version="07.00.03">
3+
<package name="Active Forums" type="Module" version="07.00.04">
44
<friendlyName>Active Forums</friendlyName>
55
<description>Community Forums: The official online forums module for the DNN Community.</description>
66
<iconFile>DesktopModules/ActiveForums/images/af6_icon.jpg</iconFile>
@@ -23,7 +23,8 @@
2323
<foldername>ActiveForums</foldername>
2424
<businessControllerClass>DotNetNuke.Modules.ActiveForums.TopicsController, DotNetNuke.Modules.ActiveForums</businessControllerClass>
2525
<supportedFeatures>
26-
<supportedFeature type="Searchable" />
26+
<supportedFeature type="Searchable" />
27+
<supportedFeature type="Upgradeable" />
2728
</supportedFeatures>
2829
<moduleDefinitions>
2930
<moduleDefinition>
@@ -72,7 +73,7 @@
7273
<attributes>
7374
<businessControllerClass>DotNetNuke.Modules.ActiveForums.TopicsController, DotNetNuke.Modules.ActiveForums</businessControllerClass>
7475
<desktopModuleID>[DESKTOPMODULEID]</desktopModuleID>
75-
<upgradeVersionsList>06.04.00,06.04.01,06.05.00,06.05.01,06.06.00,07.00.00,07.00.01,07.00.02,07.00.03</upgradeVersionsList>
76+
<upgradeVersionsList>06.04.00,06.04.01,06.05.00,06.05.01,06.06.00,07.00.00,07.00.01,07.00.04</upgradeVersionsList>
7677
</attributes>
7778
</eventMessage>
7879
</component>
@@ -83,7 +84,7 @@
8384
<assembly>
8485
<name>DotNetNuke.Modules.ActiveForums.dll</name>
8586
<sourceFileName>bin\DotNetNuke.Modules.ActiveForums.dll</sourceFileName>
86-
<version>07.00.03</version>
87+
<version>07.00.04</version>
8788
</assembly>
8889
</assemblies>
8990
</component>
@@ -328,20 +329,20 @@
328329
<name>06.04.01.SqlDataProvider</name>
329330
<version>06.04.01</version>
330331
</script>
331-
<script type="Install">
332-
<path>sql</path>
333-
<name>07.00.00.SqlDataProvider</name>
334-
<version>07.00.00</version>
335-
</script>
336-
<script type="Install">
337-
<path>sql</path>
338-
<name>07.00.02.SqlDataProvider</name>
339-
<version>07.00.02</version>
340-
</script>
332+
<script type="Install">
333+
<path>sql</path>
334+
<name>07.00.00.SqlDataProvider</name>
335+
<version>07.00.00</version>
336+
</script>
337+
<script type="Install">
338+
<path>sql</path>
339+
<name>07.00.04.SqlDataProvider</name>
340+
<version>07.00.04</version>
341+
</script>
341342
<script type="UnInstall">
342343
<path>sql</path>
343344
<name>Uninstall.SqlDataProvider</name>
344-
<version>07.00.03</version>
345+
<version>07.00.04</version>
345346
</script>
346347
</scripts>
347348
</component>
@@ -377,18 +378,18 @@
377378
</components>
378379
</package>
379380

380-
<package name="Active Forums What's New" type="Module" version="07.00.03">
381+
<package name="Active Forums What's New" type="Module" version="07.00.04">
381382
<friendlyName>Active Forums What's New</friendlyName>
382383
<foldername>ActiveForumsWhatsNew</foldername>
383384
<description>Community Forums: Display the most recent topics or replies from selected forums on any page within your site.</description>
384385
<iconFile>DesktopModules/ActiveForums/images/af6_icon.jpg</iconFile>
385-
<owner>
386-
<name>DotNetNuke Active Forums Module</name>
387-
<organization>DotNetNuke Corporation</organization>
388-
<url>activeforums.codeplex.com</url>
389-
<email>[email protected]</email>
390-
</owner>
391-
<license src="License.txt" />
386+
<owner>
387+
<name>DNN Community</name>
388+
<organization>DNN Community</organization>
389+
<url>dnncommunity.org</url>
390+
<email>[email protected]</email>
391+
</owner>
392+
<license src="License.txt" />
392393
<releaseNotes src="ReleaseNotes.txt" />
393394
<azureCompatible>true</azureCompatible>
394395
<dependencies>
@@ -446,7 +447,7 @@
446447
</components>
447448
</package>
448449

449-
<package name="Active Forums Viewer" type="Module" version="07.00.03">
450+
<package name="Active Forums Viewer" type="Module" version="07.00.04">
450451
<friendlyName>Active Forums Viewer</friendlyName>
451452
<foldername>ActiveForumsViewer</foldername>
452453
<description>Community Forums: Display any forum topic view on any page within your site.</description>

‎ActiveForums_Symbols.dnn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<dotnetnuke type="Package" version="5.0">
22
<packages>
3-
<package name="Active Forums_Symbols" type="Library" version="07.00.03">
3+
<package name="Active Forums_Symbols" type="Library" version="07.00.04">
44
<friendlyName>Active Forums Symbols</friendlyName>
55
<description>Community Forums: The official online forums module for the DNN Community.</description>
66
<iconFile>DesktopModules/ActiveForums/images/af6_icon.jpg</iconFile>
@@ -14,7 +14,7 @@
1414
<releaseNotes src="ReleaseNotes.txt" />
1515
<azureCompatible>True</azureCompatible>
1616
<dependencies>
17-
<dependency type="managedPackage" version="7.0.3">Active Forums</dependency>
17+
<dependency type="managedPackage" version="7.0.4">Active Forums</dependency>
1818
</dependencies>
1919
<components>
2020
<component type="ResourceFile">

‎App_LocalResources/ControlPanel.ascx.resx

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1216,18 +1216,6 @@ Your removal method is currently set to {0}. Your topics will be {1} based upon
12161216
<data name="[RESX:TopicPriority].Text" xml:space="preserve">
12171217
<value>Allow Topic Priority</value>
12181218
</data>
1219-
<data name="[RESX:ActiveSocialIntegration].Text" xml:space="preserve">
1220-
<value>Active Social Integration</value>
1221-
</data>
1222-
<data name="[RESX:RepliesAccessKey].Text" xml:space="preserve">
1223-
<value>Access Key for Replies</value>
1224-
</data>
1225-
<data name="[RESX:TopicsAccessKey].Text" xml:space="preserve">
1226-
<value>Access Key for Topics</value>
1227-
</data>
1228-
<data name="[RESX:ActiveSocialTip].Text" xml:space="preserve">
1229-
<value>Enter the keys you created in the Active Social Control panel under the Access Control section of the Journal.</value>
1230-
</data>
12311219
<data name="[RESX:Community].Text" xml:space="preserve">
12321220
<value>Community</value>
12331221
</data>
@@ -1384,9 +1372,6 @@ Your removal method is currently set to {0}. Your topics will be {1} based upon
13841372
<data name="[RESX:PleaseWait].Text" xml:space="preserve">
13851373
<value>Loading... Please wait.</value>
13861374
</data>
1387-
<data name="[RESX:Tips:ActiveSocial].Text" xml:space="preserve">
1388-
<value>Active Forums will send updates to the Active Social Journal.</value>
1389-
</data>
13901375
<data name="[RESX:Confirm:URLToggle].Text" xml:space="preserve">
13911376
<value>Caution: Installing or Uninstalling the Active Forums URL Handler will require a change to your web.config. \n\nAre you sure you want to make this change right now?</value>
13921377
</data>

‎Classic.ascx.cs

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -321,10 +321,6 @@ private void SetupPage()
321321
{
322322
ClientResourceManager.RegisterStyleSheet(this.Page, "~/DesktopModules/ActiveForums/themes/" + MainSettings.Theme + "/module.css");
323323
ClientResourceManager.RegisterStyleSheet(this.Page, "~/DesktopModules/ActiveForums/themes/" + MainSettings.Theme + "/jquery-ui.min.css");
324-
if (Request.QueryString["asg"] != null)
325-
{
326-
ClientResourceManager.RegisterStyleSheet(this.Page, "~/DesktopModules/ActiveForums/module.css");
327-
}
328324
}
329325

330326
string lang = "en-US";
@@ -407,18 +403,13 @@ protected override void OnPreRender(EventArgs e)
407403
{
408404
ShowToolbar = false;
409405
}
410-
if (Request.QueryString["dnnprintmode"] == null & Request.QueryString["asg"] == null)
406+
if (Request.QueryString["dnnprintmode"] == null)
411407
{
412-
bool show = true;
413-
if (currView == "grid" && Request.Params["asg"] != null)
414-
{
415-
show = false;
416-
}
417408
if (HttpContext.Current.Items["ShowToolbar"] != null)
418409
{
419410
ShowToolbar = bool.Parse(HttpContext.Current.Items["ShowToolbar"].ToString());
420411
}
421-
if (show && ShowToolbar == true)
412+
if (ShowToolbar == true)
422413
{
423414
LiteralControl lit = new LiteralControl();
424415
object sToolbar = DataCache.CacheRetrieve("aftb" + ForumModuleId);

‎CustomControls/HTML/ControlPanel.cs

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -86,26 +86,6 @@ public string BindRolesForSecurityGrid(string rootPath)
8686
{
8787
sb.Append("<option value=\"" + ri.RoleID + "\">" + ri.RoleName + "</option>");
8888
}
89-
90-
#if !SKU_LITE
91-
if (System.IO.File.Exists(rootPath + "bin\\active.modules.social.dll"))
92-
{
93-
Modules.ActiveForums.Social social = new Modules.ActiveForums.Social();
94-
using (IDataReader dr = social.ActiveSocialListGroups(PortalId))
95-
{
96-
while (dr.Read())
97-
{
98-
sb.Append("<optgroup label=\"" + dr["GroupName"].ToString() + "\">");
99-
sb.Append("<option value=\"" + dr["GroupId"].ToString() + ":0\">Group Admin</option>");
100-
sb.Append("<option value=\"" + dr["GroupId"].ToString() + ":1\">Group Member</option>");
101-
sb.Append("</optgroup>");
102-
103-
}
104-
dr.Close();
105-
}
106-
}
107-
#endif
108-
10989
return sb.ToString();
11090
}
11191
}

‎CustomControls/HTML/SecurityGrid.cs

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -104,31 +104,7 @@ public string GetNewGrid()
104104
}
105105
}
106106
}
107-
//Groups
108-
string groups = GetSecureObjectList(Security, 2);
109-
if (! (string.IsNullOrEmpty(groups)))
110-
{
111-
foreach (string g in groups.Split(';'))
112-
{
113-
if (! (string.IsNullOrEmpty(g)))
114-
{
115-
Social uc = new Social();
116-
string gType = g.Split(':')[1];
117-
int groupId = Convert.ToInt32(g.Split(':')[0]);
118-
string groupName = uc.ActiveSocialGetGroup(groupId);
119-
if (! (string.IsNullOrEmpty(groupName)))
120-
{
121-
PermissionInfo pi = new PermissionInfo();
122-
pi.ObjectId = g;
123-
pi.ObjectName = groupName;
124-
pi.Type = ObjectType.GroupId;
125-
pi.ObjectName += "-" + uc.ActiveSocialGetGroupType(Convert.ToInt32(gType), PortalId);
126-
pl.Add(pi);
127-
}
128-
}
129-
}
130-
}
131-
107+
132108
string[,] grid = new string[pl.Count + 1, 28];
133109
i = 0;
134110
foreach (PermissionInfo pi in pl)

‎CustomControls/HTML/TopicViewer.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,6 @@ private string ParseDataRow(IDataRecord row, string tmp)
263263
tmp = tmp.Replace(k, value);
264264
}
265265

266-
//tmp = tmp.Replace("[AVATAR]", "<span style=""background-image:url('/desktopmodules/activesocial/profilepic.ashx?PortalId=" & PortalId.ToString & "&uid=" & row("LastAuthorId").ToString & "&h=26&w=26');""></span>")
267266
return tmp;
268267
}
269268
catch (Exception ex)

‎CustomControls/ServerControls/QuickReply.cs

Lines changed: 5 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
using System.Web;
2828
using System.Web.UI;
2929
using System.Web.UI.WebControls;
30+
using System.Security.Policy;
31+
using System.Xml.Linq;
3032

3133
namespace DotNetNuke.Modules.ActiveForums.Controls
3234
{
@@ -286,19 +288,8 @@ private void SaveQuickReply()
286288
{
287289
string sURL = Utilities.NavigateUrl(PageId, "", new string[] { ParamKeys.ForumId + "=" + ForumId, ParamKeys.ViewType + "=" + Views.Topic, ParamKeys.TopicId + "=" + TopicId, ParamKeys.ContentJumpId + "=" + ReplyId });
288290
Subscriptions.SendSubscriptions(SiteId, InstanceId, PageId, ForumId, TopicId, ReplyId, UserId);
289-
290-
#if !SKU_LITE
291-
try
292-
{
293-
Social oSocial = new Social();
294-
oSocial.AddForumItemToJournal(SiteId, InstanceId, UserId, "forumreply", sURL, Subject, sBody);
295-
}
296-
catch (Exception ex)
297-
{
298-
DotNetNuke.Services.Exceptions.Exceptions.LogException(ex);
299-
}
300-
301-
#endif
291+
Social amas = new Social();
292+
amas.AddReplyToJournal(PortalId, ForumModuleId, ForumId, TopicId, ReplyId, UserId, sURL, Subject, string.Empty, sBody,ForumInfo.Security.Read, SocialGroupId);
302293
}
303294
catch (Exception ex)
304295
{
@@ -308,34 +299,12 @@ private void SaveQuickReply()
308299
string fullURL = Utilities.NavigateUrl(PageId, "", new string[] { ParamKeys.ForumId + "=" + ForumId, ParamKeys.ViewType + "=" + Views.Topic, ParamKeys.TopicId + "=" + TopicId, ParamKeys.ContentJumpId + "=" + ReplyId });
309300
HttpContext.Current.Response.Redirect(fullURL, false);
310301
}
311-
else if (isApproved == false)
302+
else
312303
{
313304
Email.SendEmailToModerators(forumInfo.ModNotifyTemplateId, SiteId, ForumId, ri.TopicId, ReplyId, InstanceId, PageId, string.Empty);
314305
string[] Params = { ParamKeys.ForumId + "=" + ForumId, ParamKeys.ViewType + "=confirmaction", "afmsg=pendingmod", ParamKeys.TopicId + "=" + TopicId };
315306
HttpContext.Current.Response.Redirect(Utilities.NavigateUrl(PageId, "", Params), false);
316307
}
317-
else
318-
{
319-
string fullURL = Utilities.NavigateUrl(PageId, "", new string[] { ParamKeys.ForumId + "=" + ForumId, ParamKeys.ViewType + "=" + Views.Topic, ParamKeys.TopicId + "=" + TopicId, ParamKeys.ContentJumpId + "=" + ReplyId });
320-
321-
#if !SKU_LITE
322-
try
323-
{
324-
Modules.ActiveForums.Social oSocial = new Modules.ActiveForums.Social();
325-
oSocial.AddForumItemToJournal(SiteId, InstanceId, UserId, "forumreply", fullURL, Subject, sBody);
326-
}
327-
catch (Exception ex)
328-
{
329-
DotNetNuke.Services.Exceptions.Exceptions.LogException(ex);
330-
}
331-
332-
#endif
333-
HttpContext.Current.Response.Redirect(fullURL, false);
334-
}
335-
336-
//End If
337-
338-
339308
}
340309
private string ParseTemplate()
341310
{

0 commit comments

Comments
 (0)