Skip to content

Commit 1eb8f05

Browse files
w8tchaw8tcha
committed
cleanup old files
1 parent 8c2e6a9 commit 1eb8f05

9 files changed

Lines changed: 121 additions & 73 deletions

File tree

‎yaf_dnn/BuildScripts/ModulePackage.targets‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,24 +58,21 @@
5858
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\sceditor\plugins\dragdrop.js" />
5959
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\sceditor\plugins\undo.js" />
6060
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\sceditor\mentions.js" />
61-
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\sceditor\sceditor.min.js" />
6261
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\bootbox.js" />
6362
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\bootstrap.js" />
6463
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\bootstrap-bundle.js" />
6564
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\bootstrap.bundle.min.js" />
6665
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\bootstrap-notify.js" />
6766
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\InstallWizard.js" />
6867
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\InstallWizard.comb.js" />
69-
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\fileUploader.js" />
7068
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\forumExtensions.js" />
7169
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\forumExtensions.min.js" />
72-
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\forumExtensionsDnn.js" />
7370
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\forumAdminExtensions.js" />
7471
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\forumAdminExtensions.min.js" />
75-
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\forumAdminExtensionsDnn.js" />
7672
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\prism.js" />
7773
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\dark-editable.js" />
7874
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Gruntfile.js" />
75+
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\webpack.config.js" />
7976
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\bootstrap.bundle.js" />
8077
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Content\bootstrap\**\*.css" />
8178
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Content\css\**\*.css" />
@@ -112,6 +109,7 @@
112109
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Content\Themes\cyborg\bootstrap-forum.css" />
113110
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Content\Themes\cosmo\bootstrap-forum.css" />
114111
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Content\Themes\cerulean\bootstrap-forum.css" />
112+
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Content\Themes\brite\bootstrap-forum.css" />
115113
</ItemGroup>
116114

117115
<ItemGroup>
@@ -155,19 +153,15 @@
155153
Exclude="@(DefaultExclude);$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\obj\**\*.*" />
156154
<yafdnn-resInclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\**\*.aspx"
157155
Exclude="@(DefaultExclude)" />
158-
<yafdnn-resInclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\**\*.ttf"
159-
Exclude="@(DefaultExclude)" />
160156
<yafdnn-resInclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\**\*.eot"
161157
Exclude="@(DefaultExclude)" />
162158
<yafdnn-resInclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\**\*.svg"
163159
Exclude="@(DefaultExclude)" />
164-
<yafdnn-resInclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\**\*.woff"
165-
Exclude="@(DefaultExclude)" />
166160
<yafdnn-resInclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\**\*.woff2"
167161
Exclude="@(DefaultExclude)" />
168162

169163
<yafdnn-resInclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\**\*.json"
170-
Exclude="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Content\themes\**\*.*;$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\node_modules\**\*.json;$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\**\package.json;$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\**\package-lock.json" />
164+
Exclude="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Content\themes\**\*.*;$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\node_modules\**\*.json;$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\**\package.json;$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\**\package-lock.json;$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\**\tsconfig.json" />
171165
</ItemGroup>
172166

173167
<ItemGroup>

‎yaf_dnn/Components/Integration/SendMail.cs‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@
2222
* under the License.
2323
*/
2424

25+
using DotNetNuke.Abstractions.Application;
26+
2527
namespace YAF.DotNetNuke.Components.Integration;
2628

2729
using System.Collections.Generic;
2830
using System.Net.Mail;
2931

3032
using global::DotNetNuke.Collections;
31-
using global::DotNetNuke.Entities.Host;
3233
using global::DotNetNuke.Services.Mail;
3334

3435
using MailPriority = global::DotNetNuke.Services.Mail.MailPriority;
@@ -37,7 +38,7 @@ namespace YAF.DotNetNuke.Components.Integration;
3738
/// Functions to send email via SMTP
3839
/// </summary>
3940
[ExportService(ServiceLifetimeScope.Singleton)]
40-
public class SendMail : IMailService, IHaveServiceLocator
41+
public class SendMail : PortalModuleBase, IMailService, IHaveServiceLocator
4142
{
4243
/// <summary>
4344
/// Gets the service locator.
@@ -78,6 +79,9 @@ public void Send(MailMessage mailMessage)
7879
fromAddress = mailMessage.From.Address;
7980
}
8081

82+
var mailSettings = this.DependencyProvider.GetRequiredService<IMailSettings>();
83+
84+
8185
Mail.SendMail(
8286
fromAddress,
8387
mailMessage.To.ToString(),
@@ -89,10 +93,10 @@ public void Send(MailMessage mailMessage)
8993
mailMessage.BodyEncoding,
9094
body,
9195
string.Empty,
92-
Host.SMTPServer,
93-
Host.SMTPAuthentication,
94-
Host.SMTPUsername,
95-
Host.SMTPPassword);
96+
mailSettings.GetServer(BoardContext.Current.BoardSettings.DNNPortalId),
97+
mailSettings.GetAuthentication(BoardContext.Current.BoardSettings.DNNPortalId),
98+
mailSettings.GetUsername(BoardContext.Current.BoardSettings.DNNPortalId),
99+
mailSettings.GetPassword(BoardContext.Current.BoardSettings.DNNPortalId));
96100
}
97101

98102
/// <summary>

‎yaf_dnn/Installation/03.22.006130.txt‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎yaf_dnn/Installation/03.29.006137.txt‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
DesktopModules\YetAnotherForumDotNet\Content\error.svg
2+
DesktopModules\YetAnotherForumDotNet\Content\play-pause.svg
3+
DesktopModules\YetAnotherForumDotNet\Content\spacer.gif
4+
DesktopModules\YetAnotherForumDotNet\Content\webfonts\*.woff
5+
DesktopModules\YetAnotherForumDotNet\Content\webfonts\*.ttf
6+
DesktopModules\YetAnotherForumDotNet\Content\webfonts\*.eof
7+
DesktopModules\YetAnotherForumDotNet\Content\codemirror.min.css
8+
DesktopModules\YetAnotherForumDotNet\Content\jquery.fileupload.comb.css
9+
DesktopModules\YetAnotherForumDotNet\Content\jquery.fileupload.comb.min.css
10+
DesktopModules\YetAnotherForumDotNet\Controls\EmailDigest.ascx
11+
DesktopModules\YetAnotherForumDotNet\Controls\MyTopicsList.ascx
12+
DesktopModules\YetAnotherForumDotNet\Controls\ForumActiveDiscussion.ascx
13+
DesktopModules\YetAnotherForumDotNet\Controls\ForumCategoryList.ascx
14+
DesktopModules\YetAnotherForumDotNet\Controls\ForumStatistics.ascx
15+
DesktopModules\YetAnotherForumDotNet\Controls\PostAttachments.ascx
16+
DesktopModules\YetAnotherForumDotNet\Controls\ReportedPosts.ascx
17+
DesktopModules\YetAnotherForumDotNet\Dialogs\DialogBox.ascx
18+
DesktopModules\YetAnotherForumDotNet\Dialogs\ExtensionsEdit.ascx
19+
DesktopModules\YetAnotherForumDotNet\Dialogs\ExtensionsImport.ascx
20+
DesktopModules\YetAnotherForumDotNet\Dialogs\ImageGallery.ascx
21+
DesktopModules\YetAnotherForumDotNet\Dialogs\NntpForumEdit.ascx
22+
DesktopModules\YetAnotherForumDotNet\Dialogs\NntpServerEdit.ascx
23+
DesktopModules\YetAnotherForumDotNet\Images\image-not-found.svg
24+
DesktopModules\YetAnotherForumDotNet\Images\noavatar.svg
25+
DesktopModules\YetAnotherForumDotNet\install\custom\
26+
DesktopModules\YetAnotherForumDotNet\install\mssql\install\
27+
DesktopModules\YetAnotherForumDotNet\install\mssql\install\
28+
DesktopModules\YetAnotherForumDotNet\install\mssql\upgrade\providers\
29+
DesktopModules\YetAnotherForumDotNet\install\mssql\upgrade\*.sql
30+
DesktopModules\YetAnotherForumDotNet\install\FileExtensions.xml
31+
DesktopModules\YetAnotherForumDotNet\Pages\Admin\bannedemail.ascx
32+
DesktopModules\YetAnotherForumDotNet\Pages\Admin\bannedip.ascx
33+
DesktopModules\YetAnotherForumDotNet\Pages\Admin\bannedname.ascx
34+
DesktopModules\YetAnotherForumDotNet\Pages\Admin\bbcode.ascx
35+
DesktopModules\YetAnotherForumDotNet\Pages\Admin\boardsettings.ascx
36+
DesktopModules\YetAnotherForumDotNet\Pages\Admin\extensions.ascx
37+
DesktopModules\YetAnotherForumDotNet\Pages\Admin\reguser.ascx
38+
DesktopModules\YetAnotherForumDotNet\Pages\Admin\NntpForums.ascx
39+
DesktopModules\YetAnotherForumDotNet\Pages\Admin\NntpRetrieve.ascx
40+
DesktopModules\YetAnotherForumDotNet\Pages\Admin\NntpServers.ascx
41+
DesktopModules\YetAnotherForumDotNet\Pages\Profile\Avatar.ascx
42+
DesktopModules\YetAnotherForumDotNet\Pages\Account.ascx
43+
DesktopModules\YetAnotherForumDotNet\Pages\Approve.ascx
44+
DesktopModules\YetAnotherForumDotNet\Pages\Attachments.ascx
45+
DesktopModules\YetAnotherForumDotNet\Pages\Avatar.ascx
46+
DesktopModules\YetAnotherForumDotNet\Pages\Blockoptions.ascx
47+
DesktopModules\YetAnotherForumDotNet\Pages\ChangePassword.ascx
48+
DesktopModules\YetAnotherForumDotNet\Pages\DeleteAccount.ascx
49+
DesktopModules\YetAnotherForumDotNet\Pages\EditAvatar.ascx
50+
DesktopModules\YetAnotherForumDotNet\Pages\EditProfile.ascx
51+
DesktopModules\YetAnotherForumDotNet\Pages\EditSettings.ascx
52+
DesktopModules\YetAnotherForumDotNet\Pages\EditSignature.ascx
53+
DesktopModules\YetAnotherForumDotNet\Pages\Error.ascx
54+
DesktopModules\YetAnotherForumDotNet\Pages\Forum.ascx
55+
DesktopModules\YetAnotherForumDotNet\Pages\Login.ascx
56+
DesktopModules\YetAnotherForumDotNet\Pages\Logout.ascx
57+
DesktopModules\YetAnotherForumDotNet\Pages\Moderating.ascx
58+
DesktopModules\YetAnotherForumDotNet\Pages\ModForumUser.ascx
59+
DesktopModules\YetAnotherForumDotNet\Pages\PM.ascx
60+
DesktopModules\YetAnotherForumDotNet\Pages\Profile.ascx
61+
DesktopModules\YetAnotherForumDotNet\Pages\RecoverPassword.ascx
62+
DesktopModules\YetAnotherForumDotNet\Pages\Register.ascx
63+
DesktopModules\YetAnotherForumDotNet\Pages\RssTopic.ascx
64+
DesktopModules\YetAnotherForumDotNet\Pages\Rules.ascx
65+
DesktopModules\YetAnotherForumDotNet\Pages\Subscriptions.ascx
66+
DesktopModules\YetAnotherForumDotNet\Pages\Xmpp.ascx
67+
DesktopModules\YetAnotherForumDotNet\Resources\ProviderExceptions.xml
68+
DesktopModules\YetAnotherForumDotNet\languages\*.xml
69+
DesktopModules\YetAnotherForumDotNet\Scripts\jquery-3.6.1.js
70+
DesktopModules\YetAnotherForumDotNet\Scripts\jquery-3.6.1.min.js
71+
DesktopModules\YetAnotherForumDotNet\Scripts\jquery.netStack.js
72+
DesktopModules\YetAnotherForumDotNet\Scripts\bootstrap.min.js
73+
DesktopModules\YetAnotherForumDotNet\Scripts\jquery.fileupload.comb.min.js
74+
DesktopModules\YetAnotherForumDotNet\Scripts\sceditor\sceditor.comb.min.js
75+
DesktopModules\YetAnotherForumDotNet\Scripts\ckeditor\

‎yaf_dnn/Installation/ReadMe.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ <h4>
5959
<ol>
6060
<li>Microsoft .NET Framework 4.8.1</li>
6161
<li>Microsoft SQL Server 2012 or above.</li>
62-
<li>DNN Platform (DotNetNuke) 09.13.08 or above.</li>
62+
<li>DNN Platform (DotNetNuke) 10.01.00 or above.</li>
6363
</ol>
6464
</div>
6565
</div>

‎yaf_dnn/Installation/YAF.DotNetNuke.Module.dnn‎

Lines changed: 10 additions & 11 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="YetAnotherForumDotNet" type="Module" version="03.28.006136">
3+
<package name="YetAnotherForumDotNet" type="Module" version="03.29.006137">
44
<friendlyName>YAF.NET Forums</friendlyName>
55
<description>
66
&lt;strong&gt;YetAnotherForum.NET&lt;/strong&gt; as DNN Module. Yet Another Forum.NET (YAF) is an open source ASP.NET forum system.&lt;br /&gt;
@@ -16,7 +16,7 @@
1616
<license src="License.html" />
1717
<releaseNotes src="ReadMe.html" />
1818
<dependencies>
19-
<dependency type="CoreVersion">10.00.01</dependency>
19+
<dependency type="CoreVersion">10.01.00</dependency>
2020
</dependencies>
2121
<components>
2222
<component type="Module">
@@ -78,7 +78,7 @@
7878
03.22.006130,
7979
03.23.006131,
8080
03.24.006132,
81-
03.25.006133,03.26.006134,03.27.006135,03.28.006136
81+
03.25.006133,03.26.006134,03.27.006135,03.28.006136,03.29.006137
8282
</upgradeVersionsList>
8383
</attributes>
8484
</eventMessage>
@@ -334,6 +334,7 @@
334334
</files>
335335
</component>
336336
<component type="Cleanup" version="03.14.006108" fileName="03.14.006108.txt" />
337+
<component type="Cleanup" version="03.29.006137" fileName="03.29.006137.txt" />
337338
<component type="Cleanup" version="03.23.006131">
338339
<files>
339340
<file>
@@ -368,8 +369,6 @@
368369
</staticContent>
369370
</node>
370371
<node path="/configuration/system.webServer/staticContent" action="update" key="fileExtension" collision="ignore">
371-
<remove fileExtension=".woff" />
372-
<mimeMap fileExtension=".woff" mimeType="application/x-font-woff" />
373372
<remove fileExtension=".woff2" />
374373
<mimeMap fileExtension=".woff2" mimeType="font/woff2" />
375374
</node>
@@ -524,7 +523,7 @@
524523
</component>
525524
</components>
526525
</package>
527-
<package name="YAF.WhatsNew" type="Module" version="03.28.006136">
526+
<package name="YAF.WhatsNew" type="Module" version="03.29.006137">
528527
<friendlyName>YAF.NET Forums What's New</friendlyName>
529528
<description>
530529
&lt;p&gt;This Module displays the Latest Posts from a &lt;strong&gt;YetAnotherForum.NET&lt;/strong&gt; Module. Based on the Current Users Authorization Level. You can define Which Forum should be used, and how many Posts should be displayed.
@@ -541,7 +540,7 @@
541540
<license src="License.html" />
542541
<releaseNotes />
543542
<dependencies>
544-
<dependency type="CoreVersion">10.00.01</dependency>
543+
<dependency type="CoreVersion">10.01.00</dependency>
545544
</dependencies>
546545
<components>
547546
<component type="Module">
@@ -589,7 +588,7 @@
589588
03.00.006100,03.13.006107,03.15.006109,03.15.006110,03.15.006111,03.16.006112,03.16.006118,03.17.006119,03.18.006120,
590589
03.19.006121,03.19.006122,03.19.006123,03.19.006124,03.19.006125,03.19.006126,03.19.006127,
591590
03.20.006128,03.21.006129,03.22.006130,03.23.006131,03.24.006132,
592-
03.25.006133,03.26.006134,03.27.006135,03.28.006136
591+
03.25.006133,03.26.006134,03.27.006135,03.28.006136,03.29.006137
593592
</upgradeVersionsList>
594593
</attributes>
595594
</eventMessage>
@@ -629,8 +628,8 @@
629628
</component>
630629
</components>
631630
</package>
632-
<package name="bootstrap-bundle" type="JavaScript_Library" version="05.33.106136">
633-
<friendlyName>Bootstrap v5.3.3 JavaScript Bundle (width Popper.js)</friendlyName>
631+
<package name="bootstrap-bundle" type="JavaScript_Library" version="05.37.106137">
632+
<friendlyName>Bootstrap v5.3.7 JavaScript Bundle (width Popper.js)</friendlyName>
634633
<description>
635634
<![CDATA[<p>Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by <a href="http://twitter.com/mdo">Mark Otto</a> and <a href="http://twitter.com/fat">Jacob Thornton</a>.</p>
636635
<p>To get started, check out <a href="http://getbootstrap.com">http://getbootstrap.com</a>!</p>]]>
@@ -647,7 +646,7 @@
647646
<javaScriptLibrary>
648647
<libraryName>bootstrap-bundle</libraryName>
649648
<fileName>bootstrap.bundle.min.js</fileName>
650-
<CDNPath>https://maxcdn.bootstrapcdn.com/bootstrap/5.3.3/js/bootstrap.bundle.min.js</CDNPath>
649+
<CDNPath>https://maxcdn.bootstrapcdn.com/bootstrap/5.3.7/js/bootstrap.bundle.min.js</CDNPath>
651650
<objectName>bootstrap.Alert.VERSION</objectName>
652651
</javaScriptLibrary>
653652
</component>

0 commit comments

Comments
 (0)