diff --git a/Components/EmailTemplateController.vb b/Components/EmailTemplateController.vb index 86023bf..fd41829 100755 --- 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 index 5466716..26164c1 100755 --- 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 new file mode 100644 index 0000000..e770257 Binary files /dev/null and b/Installs/NewsArticles.00.12.00.zip differ diff --git a/LatestArticlesOptions.ascx b/LatestArticlesOptions.ascx index 7cc6f65..de26251 100755 --- a/LatestArticlesOptions.ascx +++ b/LatestArticlesOptions.ascx @@ -249,21 +249,21 @@ + width="300"> + width="300"> + width="300"> @@ -279,7 +279,7 @@ + width="300"> diff --git a/Libraries/Microsoft.ApplicationBlocks.Data.dll b/Libraries/Microsoft.ApplicationBlocks.Data.dll new file mode 100644 index 0000000..8158be3 Binary files /dev/null and b/Libraries/Microsoft.ApplicationBlocks.Data.dll differ diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 52ca28f..8d6c280 100755 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -30,5 +30,5 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - - + + diff --git a/NewsArticles.dnn b/NewsArticles.dnn index 4c2af18..1722e90 100755 --- a/NewsArticles.dnn +++ b/NewsArticles.dnn @@ -1,6 +1,6 @@ - + News Articles - + News Articles Latest Allows you to display a list of the latest articles. @@ -925,7 +925,7 @@ - + News Articles Comments Allows you to display a list of the latest comments. @@ -986,7 +986,7 @@ - + News Articles Archives Allows you to display a list of articles by month. @@ -1047,7 +1047,7 @@ - + News Articles Search Allows you to display a list of articles by month. diff --git a/Providers/DataProvider/SqlDataProvider/Ventrian.NewsArticles.SqlDataProvider.vbproj b/Providers/DataProvider/SqlDataProvider/Ventrian.NewsArticles.SqlDataProvider.vbproj index 4b1912e..c6f3839 100755 --- a/Providers/DataProvider/SqlDataProvider/Ventrian.NewsArticles.SqlDataProvider.vbproj +++ b/Providers/DataProvider/SqlDataProvider/Ventrian.NewsArticles.SqlDataProvider.vbproj @@ -97,9 +97,8 @@ ..\..\..\Libraries\DotNetNuke.dll False - - False - ..\..\..\..\..\bin\Microsoft.ApplicationBlocks.Data.dll + + ..\..\..\Libraries\Microsoft.ApplicationBlocks.Data.dll False diff --git a/ucSubmitNews.ascx.vb b/ucSubmitNews.ascx.vb index 3037091..48f9f88 100755 --- 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