Skip to content

Commit

Permalink
Merge pull request #18 from Scippy/DNN9-Update
Browse files Browse the repository at this point in the history 
Dnn9 update and some improvments from scippy fork
  • Loading branch information
@Scippy
Scippy authored Oct 1, 2020
2 parents 0bea05a + feef0f0 commit fbd8725
Show file tree
Hide file tree
Showing 83 changed files with 3,643 additions and 1,497 deletions.
10 changes: 10 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,13 @@
/Ventrian.PropertyAgent.v11.suo
*.config
/.vs/Ventrian.PropertyAgent/v14
/.vs/Ventrian.PropertyAgent/v15
/.vs/slnx.sqlite
/.vs/VSWorkspaceState.json
/Libraries/Dotnetnuke942.zip
/Installs/PropertyAgent.01.10.00_DNN742_to_DNN932_Install
/Libraries/DotNetNuke.Abstractions.dll
/Libraries/Dotnetnuke943.zip
/.vs/PropertyAgentSource/v16/.suo
/.vs/Ventrian.PropertyAgent/v16/Server/sqlite3
/.vs/Ventrian.PropertyAgent/v16/.suo
3 changes: 3 additions & 0 deletions App_LocalResources/EditLayoutSettings.ascx.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,9 @@
<data name="Standard.Text" xml:space="preserve">
<value>Standard</value>
</data>
<data name="HTML5.Text" xml:space="preserve">
<value>HTML5</value>
</data>
<data name="Name.Text" xml:space="preserve">
<value>Name</value>
</data>
Expand Down
10 changes: 5 additions & 5 deletions CommentForm.ascx.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ Namespace Ventrian.PropertyAgent
End Sub

Private Sub cmdSubmit_Click(ByVal sender As Object, ByVal e As System.EventArgs) Handles cmdSubmit.Click

Dim hostSettings As Dictionary(Of String, String) = DotNetNuke.Entities.Controllers.HostController.Instance.GetSettingsDictionary()
Try

lblSubmitResults.Text = String.Empty
Expand Down Expand Up @@ -278,7 +278,7 @@ Namespace Ventrian.PropertyAgent
Dim objComment As New CommentInfo()

If (Me.Page.User.Identity.IsAuthenticated) Then
objComment.UserID = UserController.GetCurrentUserInfo.UserID
objComment.UserID = UserController.Instance.GetCurrentUserInfo.UserID
Else
objComment.UserID = Null.NullInteger
End If
Expand Down Expand Up @@ -369,7 +369,7 @@ Namespace Ventrian.PropertyAgent
DotNetNuke.Services.Mail.MailPriority.Normal,
subject,
DotNetNuke.Services.Mail.MailFormat.Text, System.Text.Encoding.UTF8, body,
"", PortalSettings.HostSettings("SMTPServer"), PortalSettings.HostSettings("SMTPAuthentication"), PortalSettings.HostSettings("SMTPUsername"), DotNetNuke.Entities.Host.Host.SMTPPassword)
"", hostSettings("SMTPServer"), hostSettings("SMTPAuthentication"), hostSettings("SMTPUsername"), DotNetNuke.Entities.Host.Host.SMTPPassword)

Catch
End Try
Expand Down Expand Up @@ -404,7 +404,7 @@ Namespace Ventrian.PropertyAgent
DotNetNuke.Services.Mail.MailPriority.Normal,
subject,
DotNetNuke.Services.Mail.MailFormat.Text, System.Text.Encoding.UTF8, body,
"", PortalSettings.HostSettings("SMTPServer"), PortalSettings.HostSettings("SMTPAuthentication"), PortalSettings.HostSettings("SMTPUsername"), PortalSettings.HostSettings("SMTPPassword"))
"", hostSettings("SMTPServer"), hostSettings("SMTPAuthentication"), hostSettings("SMTPUsername"), hostSettings("SMTPPassword"))

Catch
End Try
Expand Down Expand Up @@ -438,7 +438,7 @@ Namespace Ventrian.PropertyAgent
DotNetNuke.Services.Mail.MailPriority.Normal,
subject,
DotNetNuke.Services.Mail.MailFormat.Text, System.Text.Encoding.UTF8, body,
"", PortalSettings.HostSettings("SMTPServer"), PortalSettings.HostSettings("SMTPAuthentication"), PortalSettings.HostSettings("SMTPUsername"), PortalSettings.HostSettings("SMTPPassword"))
"", hostSettings("SMTPServer"), hostSettings("SMTPAuthentication"), hostSettings("SMTPUsername"), hostSettings("SMTPPassword"))

Catch
End Try
Expand Down
92 changes: 45 additions & 47 deletions ContactForm.ascx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,54 +2,52 @@
<%@ Register TagPrefix="dnn" Assembly="DotNetNuke" Namespace="DotNetNuke.UI.WebControls" %>
<%@ Register TagPrefix="dnn" TagName="Label" Src="~/controls/LabelControl.ascx" %>
<%@ Register Assembly="Menulab.FlexCaptcha" Namespace="Menulab" TagPrefix="ml" %>

<asp:PlaceHolder id="phContactForm" runat="server" Visible="True">
<asp:Table id="tblContactForm" runat="server">
<asp:Table id="tblContactForm" runat="server">
<asp:TableRow>
<asp:TableCell>
<table id="tblContactFormDesign" cellSpacing="2" cellPadding="2" summary="ContactForm Design Table"
border="0" width="100%">
<asp:repeater id="rptDetails" Runat="server">
<ItemTemplate>
<tr valign="top">
<td class="SubHead" valign="middle" nowrap>
<label id="label" runat="server">
<asp:linkbutton id="cmdHelp" tabindex="-1" runat="server" CausesValidation="False" enableviewstate="False">
<asp:image id="imgHelp" tabindex="-1" runat="server" imageurl="~/images/help.gif" enableviewstate="False"></asp:image>
</asp:linkbutton>
<asp:label id="lblLabel" runat="server" enableviewstate="False"></asp:label>
</label>
<asp:panel id="pnlHelp" runat="server" cssClass="Help" enableviewstate="False">
<asp:label id="lblHelp" runat="server" enableviewstate="False"></asp:label>
</asp:panel>
</td>
<td align="left" width="100%">
<asp:PlaceHolder ID="phValue" Runat="server" />
</td>
</tr>
</ItemTemplate>
</asp:repeater>
<tr valign="top" id="trCaptcha" runat="Server">
<td class="SubHead">
<dnn:label id="plCaptcha" resourcekey="Captcha" runat="server" controlname="ctlCaptcha" suffix=":"></dnn:label>
</td>
<td align="left">
<ml:FlexCaptcha ID="mlFlexCaptcha" runat="server" />
</td>
</tr>
<tr valign="top">
<td colspan="2" align="center">
<asp:LinkButton id="cmdSubmit" runat="server" CssClass="CommandButton" BorderStyle="None">Submit</asp:LinkButton><br />
<asp:label id="lblRequireFields" runat="server" CssClass="Normal" ResourceKey="RequiredFields"></asp:label>
</td>
</tr>
<tr valign="top">
<td colspan="2" align="center">
<asp:label id="lblSubmitResults" runat="server" CssClass="NormalRed"></asp:label>
</td>
</tr>
</table>

<asp:PlaceHolder id="phContactForm" runat="server" Visible="True">
<div class="row ContactFormBody">
<asp:repeater id="rptDetails" Runat="server">
<ItemTemplate>

<div class="col-sm-4 ContactFormLabel">
<label id="label" runat="server">
<asp:linkbutton id="cmdHelp" tabindex="-1" runat="server" CausesValidation="False" enableviewstate="False">
<asp:image id="imgHelp" tabindex="-1" runat="server" imageurl="~/images/help.gif" enableviewstate="False"></asp:image>
</asp:linkbutton>
<asp:label id="lblLabel" runat="server" enableviewstate="False"></asp:label>
</label>
<asp:panel id="pnlHelp" runat="server" cssClass="Help" enableviewstate="False">
<asp:label id="lblHelp" runat="server" enableviewstate="False"></asp:label>
</asp:panel>
</div>
<div class="col-sm-8 ContactFormTextBox">
<asp:PlaceHolder ID="phValue" Runat="server" />
</div>
</ItemTemplate>
</asp:repeater>

<table class="ContactFormCaptcha">
<tr valign="top" id="trCaptcha" runat="Server">
<td>
<div>
<dnn:label id="plCaptcha" resourcekey="Captcha" runat="server" controlname="ctlCaptcha" suffix=":"></dnn:label>
<ml:FlexCaptcha ID="mlFlexCaptcha" runat="server" />
</div>
</td>
</tr>
</table>
<div class="row ContactFormSubmit">
<asp:LinkButton id="cmdSubmit" runat="server" CssClass="CommandButton" BorderStyle="None">Submit</asp:LinkButton><br />
<asp:label id="lblRequireFields" runat="server" CssClass="Normal" ResourceKey="RequiredFields"></asp:label>
</div>
<div class="row ContactFormResult">
<asp:label id="lblSubmitResults" runat="server" CssClass="NormalRed"></asp:label>
</div>
</div>
</asp:PlaceHolder>

</asp:TableCell>
</asp:TableRow>
</asp:Table>
</asp:PlaceHolder>
</asp:Table>
88 changes: 44 additions & 44 deletions ContactForm.ascx.designer.vb
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit fbd8725

Please sign in to comment.