Skip to content

Commit 525cbd5

Browse files
WillStrohlWillStrohl
authored
Merge branch 'dev' into issues/205
2 parents c88b825 + cc64d22 commit 525cbd5

File tree

128 files changed

+1330
-1686
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+1330
-1686
lines changed

‎07.00.03.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
DesktopModules/ActiveForums/sql/sql/*
2+
DesktopModules/ActiveForums/sql/sql

‎ActiveForumViewer.ascx.cs

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +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-
//
20-
//INSTANT C# TODO TASK: C# compiler constants cannot be set to explicit values:
21-
22-
23-
//#if SKU_ENTERPRISE
2419

2520
using System;
2621
using System.Web.UI.WebControls;
@@ -68,19 +63,10 @@ protected override void OnLoad(EventArgs e)
6863
{
6964
ctlForumLoader.DefaultTopicViewTemplateId = Convert.ToInt32(Settings["AFTopicTemplate"]);
7065
}
71-
//Dim objModule As ForumBase = CType(LoadControl("~/desktopmodules/ActiveForums/ActiveForums.ascx"), ForumBase)
72-
//If Not objModule Is Nothing Then
73-
// objModule.ModuleConfiguration = Me.ModuleConfiguration
74-
// objModule.ID = Path.GetFileNameWithoutExtension("~/desktopmodules/ActiveForums/ActiveForums.ascx")
75-
// objModule.AFModID = CType(Settings["AFForumModuleID"], Integer)
76-
// objModule.LoadGroupForumID = CType(Settings["AFForumGroupID"], Integer)
77-
// objModule.LoadView = CType(Settings["AFViewType"], String)
78-
// plhMod.Controls.Add(objModule)
79-
//End If
8066
System.Web.UI.HtmlControls.HtmlGenericControl oLink = new System.Web.UI.HtmlControls.HtmlGenericControl("link");
8167
oLink.Attributes["rel"] = "stylesheet";
8268
oLink.Attributes["type"] = "text/css";
83-
oLink.Attributes["href"] = Page.ResolveUrl("~/DesktopModules/ActiveForums/module.css");
69+
oLink.Attributes["href"] = Page.ResolveUrl(Globals.ModulePath + "module.css");
8470
System.Web.UI.Control oCSS = this.Page.FindControl("CSS");
8571
if (oCSS != null)
8672
{
@@ -105,4 +91,3 @@ protected override void OnLoad(EventArgs e)
10591
#endregion
10692
}
10793
}
108-
//#endif

‎ActiveForumViewerSettings.ascx.cs

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,39 @@
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.
1919
//
20+
using DotNetNuke.Entities.Modules;
21+
using DotNetNuke.Framework;
2022
using System;
2123
using System.Data;
2224
using System.Web.UI.WebControls;
2325

2426
namespace DotNetNuke.Modules.ActiveForums
2527
{
26-
public partial class ActiveForumViewerSettings : Entities.Modules.ModuleSettingsBase
27-
{
28+
public partial class ActiveForumViewerSettings : ModuleSettingsBase
29+
{
30+
protected override void OnLoad(EventArgs e)
31+
{
32+
base.OnLoad(e);
33+
34+
ServicesFramework.Instance.RequestAjaxAntiForgerySupport();
35+
LoadSettings();
2836

29-
public override void LoadSettings()
37+
}
38+
39+
protected override void OnInit(EventArgs e)
40+
{
41+
base.OnInit(e);
42+
43+
drpForumInstance.SelectedIndexChanged += drpForumInstance_SelectedIndexChanged;
44+
}
45+
46+
private void LoadSettings()
3047
{
3148
try
3249
{
3350
if (! Page.IsPostBack)
3451
{
35-
// Load settings from TabModuleSettings: specific to this instance
36-
//Dim setting1 As String = CType(TabModuleSettings["settingname1"], String)
52+
// Load settings from TabModuleSettings: specific to this instance
3753
LoadForums();
3854
// Load settings from ModuleSettings: general for all instances
3955
if (! (Convert.ToString(Settings["AFForumModuleID"]) == null))
@@ -108,13 +124,7 @@ public override void UpdateSettings()
108124
}
109125
public void LoadForums()
110126
{
111-
//Dim dr As IDataReader
112-
//dr = DataProvider.Instance.PortalForums(PortalId)
113-
//Dim i As Integer = 0
114-
//While dr.Read
115-
// drpForumInstance.Items.Insert(i, New Web.UI.WebControls.ListItem(CType(dr("TabName"), String), CType(dr("ModuleID"), String)))
116-
//End While
117-
//dr.Close()
127+
118128
int i = 0;
119129
var mc = new Entities.Modules.ModuleController();
120130
var tc = new Entities.Tabs.TabController();
@@ -190,11 +200,6 @@ public void BindTemplateDropDown(int ForumModuleId, DropDownList drp, Templates.
190200
drp.Items.Insert(0, new ListItem(DefaultText, DefaultValue));
191201
}
192202

193-
protected override void OnInit(EventArgs e)
194-
{
195-
base.OnInit(e);
196-
197-
drpForumInstance.SelectedIndexChanged += drpForumInstance_SelectedIndexChanged;
198-
}
203+
199204
}
200205
}

‎ActiveForums.ascx.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,17 +78,17 @@ protected override void OnLoad(EventArgs e)
7878
// Users can only view thier own settings unless they are admin.
7979
if (userId == UserInfo.UserID || UserInfo.IsInRole(PortalSettings.AdministratorRoleName))
8080
{
81-
var userPrefsCtl = (SettingsBase)(LoadControl("~/desktopmodules/activeforums/controls/profile_mypreferences.ascx"));
81+
var userPrefsCtl = (SettingsBase)(LoadControl(Page.ResolveUrl(Globals.ModulePath + "controls/profile_mypreferences.ascx")));
8282
userPrefsCtl.ModuleConfiguration = ModuleConfiguration;
83-
userPrefsCtl.LocalResourceFile = "~/desktopmodules/activeforums/app_localresources/sharedresources.resx";
83+
userPrefsCtl.LocalResourceFile = Page.ResolveUrl(Globals.SharedResourceFile);
8484
plhAF.Controls.Add(userPrefsCtl);
8585
}
8686

8787
return;
8888
}
8989

9090
// Otherwise, just load the normal forum control
91-
var ctl = (ForumBase)(LoadControl("~/desktopmodules/activeforums/classic.ascx"));
91+
var ctl = (ForumBase)(LoadControl(Page.ResolveUrl(Globals.ModulePath + "classic.ascx")));
9292
ctl.ModuleConfiguration = ModuleConfiguration;
9393
plhAF.Controls.Add(ctl);
9494

‎ActiveForums.csproj

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<DebugSymbols>true</DebugSymbols>
4848
<Optimize>false</Optimize>
4949
<WarningLevel>1</WarningLevel>
50-
<WarningLevel>1</WarningLevel>
50+
<WarningLevel>3</WarningLevel>
5151
<DebugType>full</DebugType>
5252
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
5353
<UseVSHostingProcess>true</UseVSHostingProcess>
@@ -59,7 +59,7 @@
5959
<DefineConstants>TRACE;</DefineConstants>
6060
<DebugSymbols>false</DebugSymbols>
6161
<Optimize>true</Optimize>
62-
<WarningLevel>1</WarningLevel>
62+
<WarningLevel>4</WarningLevel>
6363
<DebugType>none</DebugType>
6464
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
6565
<Prefer32Bit>false</Prefer32Bit>
@@ -166,6 +166,7 @@
166166
</ItemGroup>
167167
<ItemGroup>
168168
<Content Include="06.04.00.txt" />
169+
<Content Include="07.00.03.txt" />
169170
<Content Include="ActiveForums.ascx">
170171
<SubType>ASPXCodeBehind</SubType>
171172
</Content>
@@ -182,7 +183,6 @@
182183
<Content Include="Classic.ascx">
183184
<SubType>ASPXCodeBehind</SubType>
184185
</Content>
185-
<Content Include="config\templates\AddThis.txt" />
186186
<Content Include="config\templates\AdminWatchEmail_text.txt" />
187187
<None Include="ActiveForums_Symbols.dnn">
188188
<SubType>Designer</SubType>
@@ -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>
@@ -267,11 +269,15 @@
267269
<Content Include="handlers\adminhelper.ashx" />
268270
<Content Include="images\add-circle.png" />
269271
<Content Include="images\af-fileicon.png" />
272+
<Content Include="images\arrows_down.png" />
273+
<Content Include="images\arrows_left.png" />
270274
<Content Include="images\arrow_down.png" />
271275
<Content Include="images\arrow_up.png" />
272276
<Content Include="images\check32.png" />
273277
<Content Include="images\checkbox.png" />
274278
<Content Include="images\checkbox_unchecked.png" />
279+
<Content Include="images\close.png" />
280+
<Content Include="images\delete_new.gif" />
275281
<Content Include="images\execute16.png" />
276282
<Content Include="images\delete16.png" />
277283
<Content Include="images\info32.png" />
@@ -282,7 +288,10 @@
282288
<Content Include="images\modal_top_left.png" />
283289
<Content Include="images\modal_top_right.png" />
284290
<Content Include="images\progress.gif" />
291+
<Content Include="images\search.gif" />
285292
<Content Include="images\sort_16.png" />
293+
<Content Include="images\spinner-lg.gif" />
294+
<Content Include="images\spinner.gif" />
286295
<Content Include="images\testrun16.png" />
287296
<Content Include="images\roles_add.png" />
288297
<Content Include="images\save16.png" />
@@ -532,7 +541,9 @@
532541
<Content Include="controls\admin_filters.ascx" />
533542
<Content Include="controls\admin_home.ascx" />
534543
<Content Include="controls\admin_manageforums_home.ascx" />
535-
<Content Include="controls\admin_ranks.ascx" />
544+
<Content Include="controls\admin_ranks.ascx">
545+
<SubType>ASPXCodeBehind</SubType>
546+
</Content>
536547
<Content Include="controls\admin_tags.ascx">
537548
<SubType>ASPXCodeBehind</SubType>
538549
</Content>
@@ -638,9 +649,10 @@
638649
<None Include="sql\06.01.06.SqlDataProvider" />
639650
<None Include="sql\06.01.03.SqlDataProvider" />
640651
<None Include="sql\06.03.03.SqlDataProvider" />
652+
<None Include="sql\07.00.04.SqlDataProvider" />
641653
<None Include="sql\06.04.01.SqlDataProvider" />
654+
<None Include="sql\07.00.02.SqlDataProvider" />
642655
<None Include="sql\07.00.00.SqlDataProvider" />
643-
<None Include="sql\07.00.06.SqlProvider" />
644656
<None Include="sql\07.00.02.SqlDataProvider" />
645657
<None Include="sql\07.00.05.SqlDataProvider" />
646658
<None Include="sql\07.00.06.SqlDataProvider" />
@@ -874,7 +886,6 @@
874886
<Compile Include="CustomControls\HTML\TopicViewer.cs" />
875887
<Compile Include="CustomControls\ServerControls\ActiveTabs.cs" />
876888
<Compile Include="CustomControls\ServerControls\ActiveTabsDesigner.cs" />
877-
<Compile Include="CustomControls\ServerControls\AddThis.cs" />
878889
<Compile Include="CustomControls\ServerControls\CategoryNavigator.cs" />
879890
<Compile Include="CustomControls\ServerControls\ForumContentTree.cs" />
880891
<Compile Include="CustomControls\ServerControls\ForumContentNavigator.cs" />

0 commit comments

Comments
 (0)