Merge tag 'v00.12.00' into develop

ventrian · Nov 4, 2020 · 2dc19c6 · 2dc19c6
2 parents df2d605 + 58c7284
commit 2dc19c6
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 15 deletions.
diff --git a/Components/EmailTemplateController.vb b/Components/EmailTemplateController.vb
@@ -13,6 +13,7 @@ Imports Dotnetnuke.Entities.Portals
 Imports Dotnetnuke.Entities.Users
 Imports DotNetNuke.Framework
 Imports DotNetNuke.Security.Roles
+Imports DotNetNuke.Services.Exceptions
 
 Namespace Ventrian.NewsArticles
 
@@ -289,7 +290,8 @@ Namespace Ventrian.NewsArticles
             ' SendNotification(settings.Email, sendTo, Null.NullString, subject, template)
             Try
                 DotNetNuke.Services.Mail.Mail.SendMail(settings.Email, sendTo, "", subject, template, "", "", "", "", "", "")
-            Catch
+            Catch exc As Exception
+                LogException(exc)
             End Try
 
         End Sub

diff --git a/Components/Layout/LayoutController.vb b/Components/Layout/LayoutController.vb
@@ -2809,6 +2809,15 @@ Namespace Ventrian.NewsArticles
                                                 objLiteral.EnableViewState = False
                                                 objPlaceHolder.Add(objLiteral)
 
+                                            Case "image"
+                                                Dim objLiteral As New Literal
+                                                If profilePropertyValue = String.Empty Then
+                                                    objLiteral.Text = String.Empty
+                                                Else
+                                                    objLiteral.Text = UrlUtils.EncryptParameter(UrlUtils.GetParameterValue($"fileid={profilePropertyValue}"), PortalSettings.GUID.ToString())
+                                                End If
+                                                objPlaceHolder.Add(objLiteral)
+
                                             Case Else
                                                 Dim objLiteral As New Literal
                                                 If profilePropertyValue = String.Empty Then

diff --git a/Installs/NewsArticles.00.12.00.zip b/Installs/NewsArticles.00.12.00.zip
diff --git a/LatestArticlesOptions.ascx b/LatestArticlesOptions.ascx
@@ -249,21 +249,21 @@
 		            <dnn:label id="plHtmlHeader" runat="server" resourcekey="HtmlHeader" suffix=":" controlname="txtHtmlHeader"></dnn:label></TD>
 	            <TD align="left" width="325">
 		            <asp:textbox id="txtHtmlHeader" cssclass="NormalTextBox" runat="server" Rows="2" TextMode="MultiLine"
-			            maxlength="50" width="300"></asp:textbox></TD>
+			            width="300"></asp:textbox></TD>
             </TR>
 	        <TR vAlign="top">
 		        <TD class="SubHead" width="150">
 			        <dnn:label id="plHtmlBody" runat="server" resourcekey="HtmlBody" suffix=":" controlname="txtHtmlBody"></dnn:label></TD>
 		        <TD align="left" width="325">
 			        <asp:textbox id="txtHtmlBody" cssclass="NormalTextBox" runat="server" Rows="6" TextMode="MultiLine"
-				        maxlength="50" width="300"></asp:textbox></TD>
+				        width="300"></asp:textbox></TD>
 	        </TR>
 	        <TR vAlign="top">
 		        <TD class="SubHead" width="150">
 			        <dnn:label id="plHtmlFooter" runat="server" resourcekey="HtmlFooter" suffix=":" controlname="txtHtmlFooter"></dnn:label></TD>
 		        <TD align="left" width="325">
 			        <asp:textbox id="txtHtmlFooter" cssclass="NormalTextBox" runat="server" Rows="2" TextMode="MultiLine"
-				        maxlength="50" width="300"></asp:textbox></TD>
+				        width="300"></asp:textbox></TD>
 	        </TR>
 	        <tr runat="server" id="trItemsPerRow">
 		        <td class="SubHead" width="150"><dnn:label id="plItemsPerRow" runat="server" controlname="txtItemsPerRow" suffix=":"></dnn:label></td>
@@ -279,7 +279,7 @@
 			        <dnn:label id="plHtmlNoArticles" runat="server" resourcekey="HtmlNoArticles" suffix=":" controlname="txtHtmlNoArticles"></dnn:label></td>
 		        <td align="left" width="325">
 			        <asp:textbox id="txtHtmlNoArticles" cssclass="NormalTextBox" runat="server" Rows="6" TextMode="MultiLine"
-				        maxlength="50" width="300"></asp:textbox></td>
+				        width="300"></asp:textbox></td>
 	        </tr>
 	        <tr valign="top">
 	            <td colspan="2">

diff --git a/Libraries/Microsoft.ApplicationBlocks.Data.dll b/Libraries/Microsoft.ApplicationBlocks.Data.dll
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
@@ -30,5 +30,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.0.8.02")> 
-<Assembly: AssemblyFileVersion("1.0.8.02")> 
+<Assembly: AssemblyVersion("1.12.00.00")> 
+<Assembly: AssemblyFileVersion("1.12.00.00")> 
diff --git a/NewsArticles.dnn b/NewsArticles.dnn
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="6.0">
   <packages>
-    <package name="DnnForge - NewsArticles" type="Module" version="00.11.03">
+    <package name="DnnForge - NewsArticles" type="Module" version="00.12.00">
       <friendlyName>News Articles</friendlyName>
       <description>
         <![CDATA[
@@ -864,7 +864,7 @@
         </component>
       </components>
     </package>
-    <package name="DnnForge - LatestArticles" type="Module" version="00.11.03">
+    <package name="DnnForge - LatestArticles" type="Module" version="00.12.00">
       <friendlyName>News Articles Latest</friendlyName>
       <description>Allows you to display a list of the latest articles.</description>
       <iconFile />
@@ -925,7 +925,7 @@
         </component>
       </components>
     </package>
-    <package name="DnnForge - LatestComments" type="Module" version="00.11.03">
+    <package name="DnnForge - LatestComments" type="Module" version="00.12.00">
       <friendlyName>News Articles Comments</friendlyName>
       <description>Allows you to display a list of the latest comments.</description>
       <iconFile />
@@ -986,7 +986,7 @@
         </component>
       </components>
     </package>
-    <package name="DnnForge - NewsArchives" type="Module" version="00.11.03">
+    <package name="DnnForge - NewsArchives" type="Module" version="00.12.00">
       <friendlyName>News Articles Archives</friendlyName>
       <description>Allows you to display a list of articles by month.</description>
       <iconFile />
@@ -1047,7 +1047,7 @@
         </component>
       </components>
     </package>
-    <package name="DnnForge - NewsSearch" type="Module" version="00.11.03">
+    <package name="DnnForge - NewsSearch" type="Module" version="00.12.00">
       <friendlyName>News Articles Search</friendlyName>
       <description>Allows you to display a list of articles by month.</description>
       <iconFile />

diff --git a/Providers/DataProvider/SqlDataProvider/Ventrian.NewsArticles.SqlDataProvider.vbproj b/Providers/DataProvider/SqlDataProvider/Ventrian.NewsArticles.SqlDataProvider.vbproj
@@ -97,9 +97,8 @@
       <HintPath>..\..\..\Libraries\DotNetNuke.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Microsoft.ApplicationBlocks.Data, Version=2.0.0.0, Culture=neutral">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\Microsoft.ApplicationBlocks.Data.dll</HintPath>
+    <Reference Include="Microsoft.ApplicationBlocks.Data">
+      <HintPath>..\..\..\Libraries\Microsoft.ApplicationBlocks.Data.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System">

diff --git a/ucSubmitNews.ascx.vb b/ucSubmitNews.ascx.vb
@@ -1452,8 +1452,12 @@ Namespace Ventrian.NewsArticles
             valTitle.ValidationGroup = vgId
             valBody.ValidationGroup = vgId
             valCategory.ValidationGroup = vgId
+            valExpiryDate.ValidationGroup = vgId
             valPublishDateRequired.ValidationGroup = vgId
+            valMessageBox.ValidationGroup = vgId
             cmdSaveArticle.ValidationGroup = vgId
+            cmdPublishArticle.ValidationGroup = vgId
+            cmdAddEditPages.ValidationGroup = vgId
         End Sub