diff --git a/Base/NewsArticleModuleBase.vb b/Base/NewsArticleModuleBase.vb index 396a54c..476e493 100755 --- a/Base/NewsArticleModuleBase.vb +++ b/Base/NewsArticleModuleBase.vb @@ -16,6 +16,7 @@ Imports DotNetNuke.Common Imports DotNetNuke.Common.Utilities Imports DotNetNuke.Entities.Modules Imports DotNetNuke.Security +Imports DotNetNuke.Security.Permissions Imports DotNetNuke.Services.Localization Namespace Ventrian.NewsArticles.Base @@ -354,7 +355,7 @@ Namespace Ventrian.NewsArticles.Base ' Admin of Module ' - If (PortalSecurity.HasEditPermissions(objModule.ModulePermissions)) Then + If (ModulePermissionController.HasModuleAccess(SecurityAccessLevel.Edit, "EDIT" , objModule)) Then Return True diff --git a/Components/ArticleSettings.vb b/Components/ArticleSettings.vb index adf4728..9ecf85f 100755 --- a/Components/ArticleSettings.vb +++ b/Components/ArticleSettings.vb @@ -10,6 +10,7 @@ Imports DotNetNuke.Entities.Modules Imports DotNetNuke.Entities.Portals Imports DotNetNuke.Entities.Users Imports DotNetNuke.Security +Imports DotNetNuke.Security.Permissions Imports Ventrian.NewsArticles.Components.Types Namespace Ventrian.NewsArticles @@ -52,7 +53,7 @@ Namespace Ventrian.NewsArticles If Not roles Is Nothing Then Dim context As HttpContext = HttpContext.Current - Dim objUserInfo As UserInfo = UserController.GetCurrentUserInfo + Dim objUserInfo As UserInfo = UserController.Instance.GetCurrentUserInfo Dim role As String For Each role In roles.Split(New Char() {";"c}) @@ -116,7 +117,7 @@ Namespace Ventrian.NewsArticles Public ReadOnly Property AuthorSelect() As AuthorSelectType Get If (Settings.Contains(ArticleConstants.AUTHOR_SELECT_TYPE)) Then - Return CType(System.Enum.Parse(GetType(AuthorSelectType), Settings(ArticleConstants.AUTHOR_SELECT_TYPE).ToString()), AuthorSelectType) + Return CType([Enum].Parse(GetType(AuthorSelectType), Settings(ArticleConstants.AUTHOR_SELECT_TYPE).ToString()), AuthorSelectType) Else Return AuthorSelectType.ByDropdown End If @@ -267,7 +268,7 @@ Namespace Ventrian.NewsArticles Get If (Settings.Contains(ArticleConstants.CATEGORY_SORT_SETTING)) Then Try - Return CType(System.Enum.Parse(GetType(CategorySortType), Settings(ArticleConstants.CATEGORY_SORT_SETTING).ToString()), CategorySortType) + Return CType([Enum].Parse(GetType(CategorySortType), Settings(ArticleConstants.CATEGORY_SORT_SETTING).ToString()), CategorySortType) Catch Return ArticleConstants.CATEGORY_SORT_SETTING_DEFAULT End Try @@ -615,7 +616,7 @@ Namespace Ventrian.NewsArticles Public ReadOnly Property ImageThumbnailType() As ThumbnailType Get If (Settings.Contains(ArticleConstants.IMAGE_THUMBNAIL_SETTING)) Then - Return CType(System.Enum.Parse(GetType(ThumbnailType), Settings(ArticleConstants.IMAGE_THUMBNAIL_SETTING).ToString()), ThumbnailType) + Return CType([Enum].Parse(GetType(ThumbnailType), Settings(ArticleConstants.IMAGE_THUMBNAIL_SETTING).ToString()), ThumbnailType) Else Return ArticleConstants.DEFAULT_IMAGE_THUMBNAIL End If @@ -635,7 +636,7 @@ Namespace Ventrian.NewsArticles Public ReadOnly Property MatchCategories() As MatchOperatorType Get If (Settings.Contains(ArticleConstants.MATCH_OPERATOR_SETTING)) Then - Return CType(System.Enum.Parse(GetType(MatchOperatorType), Settings(ArticleConstants.MATCH_OPERATOR_SETTING).ToString()), MatchOperatorType) + Return CType([Enum].Parse(GetType(MatchOperatorType), Settings(ArticleConstants.MATCH_OPERATOR_SETTING).ToString()), MatchOperatorType) Else Return MatchOperatorType.MatchAny End If @@ -701,7 +702,7 @@ Namespace Ventrian.NewsArticles Public ReadOnly Property MenuPosition() As MenuPositionType Get If (Settings.Contains(ArticleConstants.MENU_POSITION_TYPE)) Then - Return CType(System.Enum.Parse(GetType(MenuPositionType), Settings(ArticleConstants.MENU_POSITION_TYPE).ToString()), MenuPositionType) + Return CType([Enum].Parse(GetType(MenuPositionType), Settings(ArticleConstants.MENU_POSITION_TYPE).ToString()), MenuPositionType) Else Return MenuPositionType.Top End If @@ -861,7 +862,7 @@ Namespace Ventrian.NewsArticles Public ReadOnly Property SyndicationLinkType() As SyndicationLinkType Get If (Settings.Contains(ArticleConstants.SYNDICATION_LINK_TYPE)) Then - Return CType(System.Enum.Parse(GetType(SyndicationLinkType), Settings(ArticleConstants.SYNDICATION_LINK_TYPE).ToString()), SyndicationLinkType) + Return CType([Enum].Parse(GetType(SyndicationLinkType), Settings(ArticleConstants.SYNDICATION_LINK_TYPE).ToString()), SyndicationLinkType) Else Return SyndicationLinkType.Article End If @@ -871,7 +872,7 @@ Namespace Ventrian.NewsArticles Public ReadOnly Property SyndicationEnclosureType() As SyndicationEnclosureType Get If (Settings.Contains(ArticleConstants.SYNDICATION_ENCLOSURE_TYPE)) Then - Return CType(System.Enum.Parse(GetType(SyndicationEnclosureType), Settings(ArticleConstants.SYNDICATION_ENCLOSURE_TYPE).ToString()), SyndicationEnclosureType) + Return CType([Enum].Parse(GetType(SyndicationEnclosureType), Settings(ArticleConstants.SYNDICATION_ENCLOSURE_TYPE).ToString()), SyndicationEnclosureType) Else Return SyndicationEnclosureType.Attachment End If @@ -952,7 +953,7 @@ Namespace Ventrian.NewsArticles Get If (Settings.Contains(ArticleConstants.SEO_URL_MODE_SETTING)) Then Try - Return CType(System.Enum.Parse(GetType(UrlModeType), Settings(ArticleConstants.SEO_URL_MODE_SETTING).ToString()), UrlModeType) + Return CType([Enum].Parse(GetType(UrlModeType), Settings(ArticleConstants.SEO_URL_MODE_SETTING).ToString()), UrlModeType) Catch Return UrlModeType.Shorterned End Try @@ -996,7 +997,7 @@ Namespace Ventrian.NewsArticles Get If (_settings.Contains(ArticleConstants.IMAGE_WATERMARK_IMAGE_POSITION_SETTING)) Then Try - Return CType(System.Enum.Parse(GetType(WatermarkPosition), _settings(ArticleConstants.IMAGE_WATERMARK_IMAGE_POSITION_SETTING).ToString()), WatermarkPosition) + Return CType([Enum].Parse(GetType(WatermarkPosition), _settings(ArticleConstants.IMAGE_WATERMARK_IMAGE_POSITION_SETTING).ToString()), WatermarkPosition) Catch Return ArticleConstants.IMAGE_WATERMARK_IMAGE_POSITION_SETTING_DEFAULT End Try @@ -1087,7 +1088,7 @@ Namespace Ventrian.NewsArticles Public ReadOnly Property IsRateable() As Boolean Get - If (System.Web.HttpContext.Current.Request.IsAuthenticated) Then + If (HttpContext.Current.Request.IsAuthenticated) Then Return EnableRatingsAuthenticated Else Return EnableRatingsAnonymous @@ -1128,7 +1129,7 @@ Namespace Ventrian.NewsArticles Public ReadOnly Property DisplayMode() As DisplayType Get If (Settings.Contains(ArticleConstants.DISPLAY_MODE)) Then - Return CType(System.Enum.Parse(GetType(DisplayType), Settings(ArticleConstants.DISPLAY_MODE).ToString()), DisplayType) + Return CType([Enum].Parse(GetType(DisplayType), Settings(ArticleConstants.DISPLAY_MODE).ToString()), DisplayType) Else Return DisplayType.FullName End If @@ -1138,7 +1139,7 @@ Namespace Ventrian.NewsArticles Public ReadOnly Property RelatedMode() As RelatedType Get If (Settings.Contains(ArticleConstants.RELATED_MODE)) Then - Return CType(System.Enum.Parse(GetType(RelatedType), Settings(ArticleConstants.RELATED_MODE).ToString()), RelatedType) + Return CType([Enum].Parse(GetType(RelatedType), Settings(ArticleConstants.RELATED_MODE).ToString()), RelatedType) Else Return RelatedType.MatchCategoriesAnyTagsAny End If @@ -1174,7 +1175,7 @@ Namespace Ventrian.NewsArticles Public ReadOnly Property TitleReplacement() As TitleReplacementType Get If (Settings.Contains(ArticleConstants.TITLE_REPLACEMENT_TYPE)) Then - Return CType(System.Enum.Parse(GetType(TitleReplacementType), Settings(ArticleConstants.TITLE_REPLACEMENT_TYPE).ToString()), TitleReplacementType) + Return CType([Enum].Parse(GetType(TitleReplacementType), Settings(ArticleConstants.TITLE_REPLACEMENT_TYPE).ToString()), TitleReplacementType) Else Return TitleReplacementType.Dash End If @@ -1204,7 +1205,7 @@ Namespace Ventrian.NewsArticles Public ReadOnly Property TextEditorSummaryMode() As TextEditorModeType Get If (Settings.Contains(ArticleConstants.TEXT_EDITOR_SUMMARY_MODE)) Then - Return CType(System.Enum.Parse(GetType(TextEditorModeType), Settings(ArticleConstants.TEXT_EDITOR_SUMMARY_MODE).ToString()), TextEditorModeType) + Return CType([Enum].Parse(GetType(TextEditorModeType), Settings(ArticleConstants.TEXT_EDITOR_SUMMARY_MODE).ToString()), TextEditorModeType) Else Return TextEditorModeType.Rich End If @@ -1267,17 +1268,14 @@ Namespace Ventrian.NewsArticles If (IsNumeric(Settings(ArticleConstants.SERVER_TIMEZONE).ToString())) Then Return Convert.ToInt32(Settings(ArticleConstants.SERVER_TIMEZONE).ToString()) Else - Return _portalSettings.TimeZoneOffset + Return _portalSettings.TimeZone.GetUtcOffset(DateTime.Now).TotalHours End If Else - Return _portalSettings.TimeZoneOffset + Return _portalSettings.TimeZone.GetUtcOffset(DateTime.Now).TotalHours End If End Get End Property - - - Public ReadOnly Property TemplatePath() As String Get Return _portalSettings.HomeDirectoryMapPath & "DnnForge - NewsArticles/Templates/" & Template & "/" @@ -1324,7 +1322,7 @@ Namespace Ventrian.NewsArticles Public ReadOnly Property IsCategoriesEnabled() As Boolean Get - If (System.Web.HttpContext.Current.Request.IsAuthenticated = False) Then + If (HttpContext.Current.Request.IsAuthenticated = False) Then Return False End If @@ -1338,7 +1336,7 @@ Namespace Ventrian.NewsArticles Public ReadOnly Property IsExcerptEnabled() As Boolean Get - If (System.Web.HttpContext.Current.Request.IsAuthenticated = False) Then + If (HttpContext.Current.Request.IsAuthenticated = False) Then Return False End If @@ -1352,7 +1350,7 @@ Namespace Ventrian.NewsArticles Public ReadOnly Property IsImagesEnabled() As Boolean Get - If (System.Web.HttpContext.Current.Request.IsAuthenticated = False) Then + If (HttpContext.Current.Request.IsAuthenticated = False) Then Return False End If @@ -1366,7 +1364,7 @@ Namespace Ventrian.NewsArticles Public ReadOnly Property IsFilesEnabled() As Boolean Get - If (System.Web.HttpContext.Current.Request.IsAuthenticated = False) Then + If (HttpContext.Current.Request.IsAuthenticated = False) Then Return False End If @@ -1380,7 +1378,7 @@ Namespace Ventrian.NewsArticles Public ReadOnly Property IsLinkEnabled() As Boolean Get - If (System.Web.HttpContext.Current.Request.IsAuthenticated = False) Then + If (HttpContext.Current.Request.IsAuthenticated = False) Then Return False End If @@ -1394,7 +1392,7 @@ Namespace Ventrian.NewsArticles Public ReadOnly Property IsFeaturedEnabled() As Boolean Get - If (System.Web.HttpContext.Current.Request.IsAuthenticated = False) Then + If (HttpContext.Current.Request.IsAuthenticated = False) Then Return False End If @@ -1408,7 +1406,7 @@ Namespace Ventrian.NewsArticles Public ReadOnly Property IsSecureEnabled() As Boolean Get - If (System.Web.HttpContext.Current.Request.IsAuthenticated = False) Then + If (HttpContext.Current.Request.IsAuthenticated = False) Then Return False End If @@ -1422,7 +1420,7 @@ Namespace Ventrian.NewsArticles Public ReadOnly Property IsPublishEnabled() As Boolean Get - If (System.Web.HttpContext.Current.Request.IsAuthenticated = False) Then + If (HttpContext.Current.Request.IsAuthenticated = False) Then Return False End If @@ -1436,7 +1434,7 @@ Namespace Ventrian.NewsArticles Public ReadOnly Property IsExpiryEnabled() As Boolean Get - If (System.Web.HttpContext.Current.Request.IsAuthenticated = False) Then + If (HttpContext.Current.Request.IsAuthenticated = False) Then Return False End If @@ -1450,7 +1448,7 @@ Namespace Ventrian.NewsArticles Public ReadOnly Property IsMetaEnabled() As Boolean Get - If (System.Web.HttpContext.Current.Request.IsAuthenticated = False) Then + If (HttpContext.Current.Request.IsAuthenticated = False) Then Return False End If @@ -1467,7 +1465,7 @@ Namespace Ventrian.NewsArticles Public ReadOnly Property IsCustomEnabled() As Boolean Get - If (System.Web.HttpContext.Current.Request.IsAuthenticated = False) Then + If (HttpContext.Current.Request.IsAuthenticated = False) Then Return False End If @@ -1484,7 +1482,7 @@ Namespace Ventrian.NewsArticles Public ReadOnly Property IsAutoApprover() As Boolean Get - If (System.Web.HttpContext.Current.Request.IsAuthenticated = False) Then + If (HttpContext.Current.Request.IsAuthenticated = False) Then Return False End If @@ -1502,7 +1500,7 @@ Namespace Ventrian.NewsArticles Public ReadOnly Property IsAutoApproverComment() As Boolean Get - If (System.Web.HttpContext.Current.Request.IsAuthenticated = False) Then + If (HttpContext.Current.Request.IsAuthenticated = False) Then Return False End If @@ -1520,7 +1518,7 @@ Namespace Ventrian.NewsArticles Public ReadOnly Property IsAutoFeatured() As Boolean Get - If (System.Web.HttpContext.Current.Request.IsAuthenticated = False) Then + If (HttpContext.Current.Request.IsAuthenticated = False) Then Return False End If @@ -1528,7 +1526,7 @@ Namespace Ventrian.NewsArticles For Each role As String In Settings(ArticleConstants.PERMISSION_AUTO_FEATURE_SETTING).ToString().Split(New Char() {";"c}) If (role <> "") Then - If (UserController.GetCurrentUserInfo.IsInRole(role)) Then + If (UserController.Instance.GetCurrentUserInfo.IsInRole(role)) Then Return True End If End If @@ -1542,7 +1540,7 @@ Namespace Ventrian.NewsArticles Public ReadOnly Property IsAutoSecured() As Boolean Get - If (System.Web.HttpContext.Current.Request.IsAuthenticated = False) Then + If (HttpContext.Current.Request.IsAuthenticated = False) Then Return False End If @@ -1550,7 +1548,7 @@ Namespace Ventrian.NewsArticles For Each role As String In Settings(ArticleConstants.PERMISSION_AUTO_SECURE_SETTING).ToString().Split(New Char() {";"c}) If (role <> "") Then - If (UserController.GetCurrentUserInfo.IsInRole(role)) Then + If (UserController.Instance.GetCurrentUserInfo.IsInRole(role)) Then Return True End If End If @@ -1564,7 +1562,7 @@ Namespace Ventrian.NewsArticles Public ReadOnly Property IsSubmitter() As Boolean Get - If (System.Web.HttpContext.Current.Request.IsAuthenticated = False) Then + If (HttpContext.Current.Request.IsAuthenticated = False) Then Return False End If @@ -1582,14 +1580,14 @@ Namespace Ventrian.NewsArticles Public ReadOnly Property IsAdmin() As Boolean Get - If (System.Web.HttpContext.Current.Request.IsAuthenticated = False) Then + If (HttpContext.Current.Request.IsAuthenticated = False) Then Return False End If - Dim blnHasModuleEditPermissions As Boolean = PortalSecurity.IsInRoles(_moduleConfiguration.AuthorizedEditRoles) + Dim blnHasModuleEditPermissions As Boolean = ModulePermissionController.CanAdminModule(_moduleConfiguration) If (blnHasModuleEditPermissions = False) Then - blnHasModuleEditPermissions = PortalSecurity.IsInRoles(_portalSettings.ActiveTab.AdministratorRoles) + blnHasModuleEditPermissions = ModulePermissionController.CanEditModuleContent(_moduleConfiguration) End If If (blnHasModuleEditPermissions = False) Then diff --git a/Components/Common.vb b/Components/Common.vb index 312a178..e1233cd 100755 --- a/Components/Common.vb +++ b/Components/Common.vb @@ -189,7 +189,7 @@ Namespace Ventrian.NewsArticles If Host.UseFriendlyUrls Then Dim strURL As String = ApplicationURL(objTab.TabID) - Dim settings As PortalSettings = PortalController.GetCurrentPortalSettings + Dim settings As PortalSettings = PortalController.Instance.GetCurrentPortalSettings If (articleSettings.LaunchLinks) Then strURL = strURL & "&ctl=ArticleView" @@ -331,7 +331,7 @@ Namespace Ventrian.NewsArticles If HostController.Instance.GetString("UseFriendlyUrls") = "Y" Then Dim strURL As String = ApplicationURL(objTab.TabID) - Dim settings As PortalSettings = PortalController.GetCurrentPortalSettings + Dim settings As PortalSettings = PortalController.Instance.GetCurrentPortalSettings If (articleSettings.LaunchLinks) Then strURL = strURL & "&ctl=ArticleView" @@ -487,14 +487,13 @@ Namespace Ventrian.NewsArticles Dim objModulesFound As New List(Of ModuleInfo) - Dim objDesktopModuleController As New DesktopModuleController - Dim objDesktopModuleInfo As DesktopModuleInfo = objDesktopModuleController.GetDesktopModuleByModuleName("DnnForge - NewsArticles") + Dim objDesktopModuleInfo As DesktopModuleInfo = DesktopModuleController.GetDesktopModuleByModuleName("DnnForge - NewsArticles", portalID) If Not (objDesktopModuleInfo Is Nothing) Then Dim objTabController As New TabController() - Dim objTabs As ArrayList = objTabController.GetTabs(portalID) - For Each objTab As DotNetNuke.Entities.Tabs.TabInfo In objTabs + Dim objTabs As TabCollection = objTabController.GetTabsByPortal(portalID) + For Each objTab As DotNetNuke.Entities.Tabs.TabInfo In objTabs.Values If Not (objTab Is Nothing) Then If (objTab.IsDeleted = False) Then Dim objModules As New ModuleController @@ -530,10 +529,10 @@ Namespace Ventrian.NewsArticles Public Shared Function GetAuthorLink(ByVal tabID As Integer, ByVal moduleID As Integer, ByVal authorID As Integer, ByVal username As String, ByVal launchLinks As Boolean, ByVal articleSettings As ArticleSettings) As String - Dim objTab As TabInfo = PortalController.GetCurrentPortalSettings.ActiveTab - If (tabID <> PortalController.GetCurrentPortalSettings.ActiveTab.TabID) Then + Dim objTab As TabInfo = PortalController.Instance.GetCurrentPortalSettings.ActiveTab + If (tabID <> PortalController.Instance.GetCurrentPortalSettings.ActiveTab.TabID) Then Dim objTabController As New TabController - objTab = objTabController.GetTab(tabID, PortalController.GetCurrentPortalSettings.PortalId, False) + objTab = objTabController.GetTab(tabID, PortalController.Instance.GetCurrentPortalSettings.PortalId, False) End If Return GetAuthorLink(tabID, moduleID, authorID, username, launchLinks, objTab, articleSettings) @@ -554,7 +553,7 @@ Namespace Ventrian.NewsArticles strURL = strURL & "&authorID=" & authorID.ToString() ' TODO: Remove at a later date when minimum version raised. - If Localization.GetEnabledLocales.Count > 1 AndAlso LocalizationUtil.UseLanguageInUrl Then + If LocaleController.Instance.GetLocales(PortalSettings.Current.PortalId).Count > 1 AndAlso LocalizationUtil.UseLanguageInUrl Then strURL += "&language=" & Thread.CurrentThread.CurrentCulture.Name End If @@ -574,7 +573,7 @@ Namespace Ventrian.NewsArticles End If End If - Return FriendlyUrl(targetTab, strURL, Common.FormatTitle("", articleSettings), PortalController.GetCurrentPortalSettings) + Return FriendlyUrl(targetTab, strURL, Common.FormatTitle("", articleSettings), PortalController.Instance.GetCurrentPortalSettings) Else @@ -586,10 +585,10 @@ Namespace Ventrian.NewsArticles Public Shared Function GetCategoryLink(ByVal tabID As Integer, ByVal moduleID As Integer, ByVal categoryID As String, ByVal title As String, ByVal launchLinks As Boolean, ByVal articleSettings As ArticleSettings) As String - Dim objTab As TabInfo = PortalController.GetCurrentPortalSettings.ActiveTab - If (tabID <> PortalController.GetCurrentPortalSettings.ActiveTab.TabID) Then + Dim objTab As TabInfo = PortalController.Instance.GetCurrentPortalSettings.ActiveTab + If (tabID <> PortalController.Instance.GetCurrentPortalSettings.ActiveTab.TabID) Then Dim objTabController As New TabController - objTab = objTabController.GetTab(tabID, PortalController.GetCurrentPortalSettings.PortalId, False) + objTab = objTabController.GetTab(tabID, PortalController.Instance.GetCurrentPortalSettings.PortalId, False) End If Return GetCategoryLink(tabID, moduleID, categoryID, title, launchLinks, objTab, articleSettings) @@ -597,10 +596,10 @@ Namespace Ventrian.NewsArticles Public Shared Function GetCategoryLink(ByVal tabID As Integer, ByVal moduleID As Integer, ByVal categoryID As String, ByVal title As String, ByVal launchLinks As Boolean, ByVal targetTab As TabInfo, ByVal articleSettings As ArticleSettings) As String - If DotNetNuke.Entities.Host.HostSettings.GetHostSetting("UseFriendlyUrls") = "Y" Then - + If Host.UseFriendlyUrls Then + Dim strURL As String = ApplicationURL(tabID) - Dim settings As PortalSettings = PortalController.GetCurrentPortalSettings + Dim settings As PortalSettings = PortalController.Instance.GetCurrentPortalSettings If (launchLinks) Then strURL = strURL & "&ctl=CategoryView" @@ -611,7 +610,7 @@ Namespace Ventrian.NewsArticles strURL = strURL & "&categoryId=" & categoryID ' TODO: Remove at a later date when minimum version raised. - If Localization.GetEnabledLocales.Count > 1 AndAlso LocalizationUtil.UseLanguageInUrl Then + If LocaleController.Instance.GetLocales(settings.PortalId).Count > 1 AndAlso LocalizationUtil.UseLanguageInUrl Then strURL += "&language=" & Thread.CurrentThread.CurrentCulture.Name End If diff --git a/Components/EmailTemplateController.vb b/Components/EmailTemplateController.vb index 5afe075..c809311 100755 --- a/Components/EmailTemplateController.vb +++ b/Components/EmailTemplateController.vb @@ -31,7 +31,7 @@ Namespace Ventrian.NewsArticles formatted = formatted.Replace("[EMAIL]", objArticle.AuthorEmail) formatted = formatted.Replace("[DISPLAYNAME]", objArticle.AuthorDisplayName) - Dim settings As PortalSettings = PortalController.GetCurrentPortalSettings() + Dim settings As PortalSettings = PortalController.Instance.GetCurrentPortalSettings() formatted = formatted.Replace("[PORTALNAME]", settings.PortalName) formatted = formatted.Replace("[CREATEDATE]", objArticle.CreatedDate.ToString("d") & " " & objArticle.CreatedDate.ToString("t")) @@ -67,7 +67,7 @@ Namespace Ventrian.NewsArticles formatted = formatted.Replace("[DISPLAYNAME]", objComment.AuthorDisplayName) End If - Dim settings As PortalSettings = PortalController.GetCurrentPortalSettings() + Dim settings As PortalSettings = PortalController.Instance.GetCurrentPortalSettings() formatted = formatted.Replace("[PORTALNAME]", settings.PortalName) formatted = formatted.Replace("[POSTDATE]", DateTime.Now.ToShortDateString & " " & DateTime.Now.ToShortTimeString) @@ -99,8 +99,8 @@ Namespace Ventrian.NewsArticles Dim objRole As RoleInfo = objRoleController.GetRoleByName(settings.PortalId, role) If Not (objRole Is Nothing) Then - Dim objUsers As ArrayList = objRoleController.GetUserRolesByRoleName(settings.PortalId, objRole.RoleName) - For Each objUser As UserRoleInfo In objUsers + Dim lstUsers As List(Of UserInfo) = RoleController.Instance.GetUsersByRole(settings.PortalId, objRole.RoleName) + For Each objUser As UserInfo In lstUsers If (userList.Contains(objUser.UserID) = False) Then Dim objUserController As UserController = New UserController Dim objSelectedUser As UserInfo = objUserController.GetUser(settings.PortalId, objUser.UserID) @@ -250,7 +250,7 @@ Namespace Ventrian.NewsArticles Public Sub SendFormattedEmail(ByVal moduleID As Integer, ByVal link As String, ByVal objArticle As ArticleInfo, ByVal type As EmailTemplateType, ByVal sendTo As String, ByVal articleSettings As ArticleSettings) - Dim settings As PortalSettings = PortalController.GetCurrentPortalSettings() + Dim settings As PortalSettings = PortalController.Instance.GetCurrentPortalSettings() Dim subject As String = "" Dim template As String = "" @@ -296,7 +296,7 @@ Namespace Ventrian.NewsArticles Public Sub SendFormattedEmail(ByVal moduleID As Integer, ByVal link As String, ByVal objArticle As ArticleInfo, ByVal objComment As CommentInfo, ByVal type As EmailTemplateType, ByVal articleSettings As ArticleSettings) - Dim settings As PortalSettings = PortalController.GetCurrentPortalSettings() + Dim settings As PortalSettings = PortalController.Instance.GetCurrentPortalSettings() Dim sendTo As String = "" @@ -308,7 +308,7 @@ Namespace Ventrian.NewsArticles Dim objUser As UserInfo = objUserController.GetUser(settings.PortalId, objArticle.AuthorID) If Not (objUser Is Nothing) Then - sendTo = objUser.Membership.Email + sendTo = objUser.Email SendFormattedEmail(moduleID, link, objArticle, objComment, EmailTemplateType.CommentNotification, articleSettings, sendTo) End If @@ -321,7 +321,7 @@ Namespace Ventrian.NewsArticles Dim objUser As UserInfo = objUserController.GetUser(settings.PortalId, objComment.UserID) If Not (objUser Is Nothing) Then - sendTo = objUser.Membership.Email + sendTo = objUser.Email SendFormattedEmail(moduleID, link, objArticle, objComment, EmailTemplateType.CommentApproved, articleSettings, sendTo) End If Else @@ -336,7 +336,7 @@ Namespace Ventrian.NewsArticles Dim objUser As UserInfo = objUserController.GetUser(settings.PortalId, objArticle.AuthorID) If Not (objUser Is Nothing) Then - sendTo = objUser.Membership.Email + sendTo = objUser.Email SendFormattedEmail(moduleID, link, objArticle, objComment, EmailTemplateType.CommentRequiringApproval, articleSettings, sendTo) End If @@ -351,7 +351,7 @@ Namespace Ventrian.NewsArticles Public Sub SendFormattedEmail(ByVal moduleID As Integer, ByVal link As String, ByVal objArticle As ArticleInfo, ByVal objComment As CommentInfo, ByVal type As EmailTemplateType, ByVal articleSettings As ArticleSettings, ByVal email As String) - Dim settings As PortalSettings = PortalController.GetCurrentPortalSettings() + Dim settings As PortalSettings = PortalController.Instance.GetCurrentPortalSettings() Dim subject As String = "" Dim template As String = "" diff --git a/Components/Layout/LatestLayoutController.vb b/Components/Layout/LatestLayoutController.vb index 590dbd0..8474bfa 100755 --- a/Components/Layout/LatestLayoutController.vb +++ b/Components/Layout/LatestLayoutController.vb @@ -1,6 +1,7 @@ Imports System.IO Imports DotNetNuke.Common.Utilities +Imports DotNetNuke.Services.Cache Namespace Ventrian.NewsArticles @@ -129,7 +130,7 @@ Namespace Ventrian.NewsArticles objLayout.Template = File.ReadAllText(filePath) objLayout.Tokens = objLayout.Template.Split(delimiter) - DataCache.SetCache(cacheKey, objLayout, New CacheDependency(filePath)) + DataCache.SetCache(cacheKey, objLayout, New DNNCacheDependency(filePath)) End If diff --git a/Components/Layout/LayoutController.vb b/Components/Layout/LayoutController.vb index 504f4f5..5466716 100755 --- a/Components/Layout/LayoutController.vb +++ b/Components/Layout/LayoutController.vb @@ -26,6 +26,7 @@ Imports Ventrian.NewsArticles.Base Imports DotNetNuke.Web.Client.ClientResourceManagement Imports DotNetNuke.Web.Client Imports DotNetNuke.Services.Cache +Imports DotNetNuke.Services.FileSystem Namespace Ventrian.NewsArticles @@ -134,7 +135,7 @@ Namespace Ventrian.NewsArticles Private ReadOnly Property UserId() As Integer Get - Return UserController.GetCurrentUserInfo().UserID + Return UserController.Instance.GetCurrentUserInfo().UserID End Get End Property @@ -321,8 +322,7 @@ Namespace Ventrian.NewsArticles Return imageUrl Else If (imageUrl.ToLower().StartsWith("fileid=")) Then - Dim objFileController As DotNetNuke.Services.FileSystem.FileController = New DotNetNuke.Services.FileSystem.FileController - Dim objFile As DotNetNuke.Services.FileSystem.FileInfo = objFileController.GetFileById(Convert.ToInt32(UrlUtils.GetParameterValue(imageUrl)), PortalSettings.PortalId) + Dim objFile As DotNetNuke.Services.FileSystem.FileInfo = FileManager.Instance.GetFile(Convert.ToInt32(UrlUtils.GetParameterValue(imageUrl))) If Not (objFile Is Nothing) Then If (objFile.StorageLocation = 1) Then ' Secure Url @@ -1773,7 +1773,7 @@ Namespace Ventrian.NewsArticles Dim isAuthor As Boolean = False If (Request.IsAuthenticated) Then - Dim objUser As UserInfo = UserController.GetCurrentUserInfo() + Dim objUser As UserInfo = UserController.Instance.GetCurrentUserInfo() If (objUser IsNot Nothing) Then If (objUser.UserID = objArticle.AuthorID) Then isAuthor = True @@ -2799,7 +2799,7 @@ Namespace Ventrian.NewsArticles Dim objLiteral As New Literal objLiteral.Text = profilePropertyValue Dim objListController As New ListController - Dim objListEntryInfoCollection As ListEntryInfoCollection = objListController.GetListEntryInfoCollection(profilePropertyName) + Dim objListEntryInfoCollection As IEnumerable(Of ListEntryInfo) = objListController.GetListEntryInfoItems(profilePropertyName) For Each objListEntryInfo As ListEntryInfo In objListEntryInfoCollection If objListEntryInfo.Value = profilePropertyValue Then objLiteral.Text = objListEntryInfo.Text @@ -4357,7 +4357,7 @@ Namespace Ventrian.NewsArticles Dim objLiteral As New Literal objLiteral.Text = profilePropertyValue Dim objListController As New ListController - Dim objListEntryInfoCollection As ListEntryInfoCollection = objListController.GetListEntryInfoCollection(profilePropertyName) + Dim objListEntryInfoCollection As IEnumerable(Of ListEntryInfo) = objListController.GetListEntryInfoItems(profilePropertyName) For Each objListEntryInfo As ListEntryInfo In objListEntryInfoCollection If objListEntryInfo.Value = profilePropertyValue Then objLiteral.Text = objListEntryInfo.Text diff --git a/Components/Layout/TokenProcessor.vb b/Components/Layout/TokenProcessor.vb index e3afbb1..f651b76 100755 --- a/Components/Layout/TokenProcessor.vb +++ b/Components/Layout/TokenProcessor.vb @@ -314,7 +314,7 @@ Namespace Ventrian.NewsArticles If (moduleContext.ArticleSettings.AuthorUsernameParam <> "") Then If (HttpContext.Current.Request(moduleContext.ArticleSettings.AuthorUsernameParam) <> "") Then Try - Dim objUser As Entities.Users.UserInfo = Entities.Users.UserController.GetUserByName(PortalController.GetCurrentPortalSettings().PortalId, HttpContext.Current.Request.QueryString(moduleContext.ArticleSettings.AuthorUsernameParam)) + Dim objUser As Entities.Users.UserInfo = Entities.Users.UserController.GetUserByName(PortalController.Instance.GetCurrentPortalSettings().PortalId, HttpContext.Current.Request.QueryString(moduleContext.ArticleSettings.AuthorUsernameParam)) If (objUser IsNot Nothing) Then authorIDParam = "&AuthorID=" & objUser.UserID.ToString() End If diff --git a/Components/TemplateController.vb b/Components/TemplateController.vb index 965d82a..9adccab 100755 --- a/Components/TemplateController.vb +++ b/Components/TemplateController.vb @@ -11,6 +11,7 @@ Imports System.Xml Imports DotNetNuke.Common.Utilities Imports DotNetNuke.Entities.Portals +Imports DotNetNuke.Services.Cache Namespace Ventrian.NewsArticles @@ -64,8 +65,8 @@ Namespace Ventrian.NewsArticles objTemplate.Tokens = objTemplate.Template.Split(delimiter) - DataCache.SetCache(cacheKey, objTemplate, New CacheDependency(path)) - DataCache.SetCache(cacheKeyXml, objTemplate, New CacheDependency(pathXml)) + DataCache.SetCache(cacheKey, objTemplate, New DNNCacheDependency(path)) + DataCache.SetCache(cacheKeyXml, objTemplate, New DNNCacheDependency(pathXml)) End If Return objTemplate diff --git a/Components/UserTime.vb b/Components/UserTime.vb index f03ba72..64eb344 100755 --- a/Components/UserTime.vb +++ b/Components/UserTime.vb @@ -23,16 +23,12 @@ Namespace Ventrian.NewsArticles Public Function ConvertToUserTime(ByVal dt As DateTime, ByVal ClientTimeZone As Double) As DateTime - Dim _portalSettings As PortalSettings = PortalController.GetCurrentPortalSettings - Return dt.AddMinutes(ClientTimeZone) End Function Public Function ConvertToServerTime(ByVal dt As DateTime, ByVal ClientTimeZone As Double) As DateTime - Dim _portalSettings As PortalSettings = PortalController.GetCurrentPortalSettings - Return dt.AddMinutes(ClientTimeZone * -1) @@ -42,8 +38,8 @@ Namespace Ventrian.NewsArticles Get - Dim objUserInfo As UserInfo = UserController.GetCurrentUserInfo - Return FromClientToServerFactor(objUserInfo.Profile.TimeZone, serverTimeZoneOffet) + Dim objUserInfo As UserInfo = UserController.Instance.GetCurrentUserInfo + Return FromClientToServerFactor(objUserInfo.Profile.PreferredTimeZone.GetUtcOffset(DateTime.Now).TotalHours, serverTimeZoneOffet) End Get @@ -53,8 +49,8 @@ Namespace Ventrian.NewsArticles Get - Dim _portalSettings As PortalSettings = PortalController.GetCurrentPortalSettings - Return FromClientToServerFactor(_portalSettings.TimeZoneOffset, serverTimeZoneOffet) + Dim _portalSettings As PortalSettings = PortalController.Instance.GetCurrentPortalSettings + Return FromClientToServerFactor(_portalSettings.TimeZone.GetUtcOffset(DateTime.Now).TotalHours, serverTimeZoneOffet) End Get @@ -65,9 +61,9 @@ Namespace Ventrian.NewsArticles Get - Dim objUser As UserInfo = UserController.GetCurrentUserInfo() - Dim _portalSettings As PortalSettings = PortalController.GetCurrentPortalSettings - Return FromServerToClientFactor(objUser.Profile.TimeZone, _portalSettings.TimeZoneOffset) + Dim objUser As UserInfo = UserController.Instance.GetCurrentUserInfo() + Dim _portalSettings As PortalSettings = PortalController.Instance.GetCurrentPortalSettings + Return FromServerToClientFactor(objUser.Profile.PreferredTimeZone.GetUtcOffset(DateTime.Now).TotalHours, _portalSettings.TimeZone.GetUtcOffset(DateTime.Now).TotalHours) End Get diff --git a/Components/Utility/LocalizationUtil.vb b/Components/Utility/LocalizationUtil.vb index 5f47a1e..bb42592 100755 --- a/Components/Utility/LocalizationUtil.vb +++ b/Components/Utility/LocalizationUtil.vb @@ -6,10 +6,13 @@ Imports System.IO Imports System.Xml +Imports DotNetNuke.Application Imports DotNetNuke.Common Imports DotNetNuke.Common.Utilities +Imports DotNetNuke.Entities.Host Imports DotNetNuke.Entities.Portals +Imports DotNetNuke.Services.Cache Imports DotNetNuke.Services.Localization Namespace Ventrian.NewsArticles.Components.Utility @@ -24,51 +27,48 @@ Namespace Ventrian.NewsArticles.Components.Utility #Region " Public Methods " - Private Shared Function GetHostSettingAsBoolean(ByVal key As String, ByVal defaultValue As Boolean) As Boolean - Dim retValue As Boolean = defaultValue - Try - Dim setting As String = DotNetNuke.Entities.Host.HostSettings.GetHostSetting(key) - If String.IsNullOrEmpty(setting) = False Then - retValue = (setting.ToUpperInvariant().StartsWith("Y") OrElse setting.ToUpperInvariant = "TRUE") - End If - Catch ex As Exception - 'we just want to trap the error as we may not be installed so there will be no Settings - End Try - Return retValue - End Function - - Private Shared Function GetPortalSettingAsBoolean(ByVal portalID As Integer, ByVal key As String, ByVal defaultValue As Boolean) As Boolean - Dim retValue As Boolean = defaultValue - Try - Dim setting As String = DotNetNuke.Entities.Portals.PortalSettings.GetSiteSetting(portalID, key) - If String.IsNullOrEmpty(setting) = False Then - retValue = (setting.ToUpperInvariant().StartsWith("Y") OrElse setting.ToUpperInvariant = "TRUE") - End If - Catch ex As Exception - 'we just want to trap the error as we may not be installed so there will be no Settings - End Try - Return retValue - End Function + 'Private Shared Function GetHostSettingAsBoolean(ByVal key As String, ByVal defaultValue As Boolean) As Boolean + ' Dim retValue As Boolean = defaultValue + ' Try + ' Dim setting As String = DotNetNuke.Entities.Host.HostSettings.GetHostSetting(key) + ' If String.IsNullOrEmpty(setting) = False Then + ' retValue = (setting.ToUpperInvariant().StartsWith("Y") OrElse setting.ToUpperInvariant = "TRUE") + ' End If + ' Catch ex As Exception + ' 'we just want to trap the error as we may not be installed so there will be no Settings + ' End Try + ' Return retValue + 'End Function + + 'Private Shared Function GetPortalSettingAsBoolean(ByVal portalID As Integer, ByVal key As String, ByVal defaultValue As Boolean) As Boolean + ' Dim retValue As Boolean = defaultValue + ' Try + ' Dim setting As String = DotNetNuke.Entities.Portals.PortalSettings.GetSiteSetting(portalID, key) + ' If String.IsNullOrEmpty(setting) = False Then + ' retValue = (setting.ToUpperInvariant().StartsWith("Y") OrElse setting.ToUpperInvariant = "TRUE") + ' End If + ' Catch ex As Exception + ' 'we just want to trap the error as we may not be installed so there will be no Settings + ' End Try + ' Return retValue + 'End Function Public Shared Function UseLanguageInUrl() As Boolean - Dim hostSetting As String = DotNetNuke.Entities.Host.HostSettings.GetHostSetting("EnableUrlLanguage") - If (hostSetting <> "") Then - Return GetHostSettingAsBoolean("EnableUrlLanguage", True) + If (Host.EnableUrlLanguage) Then + Return Host.EnableUrlLanguage End If - Dim objSettings As PortalSettings = PortalController.GetCurrentPortalSettings() - Dim portalSetting As String = DotNetNuke.Entities.Portals.PortalSettings.GetSiteSetting(objSettings.PortalId, "EnableUrlLanguage") - If (portalSetting <> "") Then - Return GetPortalSettingAsBoolean(objSettings.PortalId, "EnableUrlLanguage", True) + If (PortalSettings.Current.EnableUrlLanguage) Then + Return PortalSettings.Current.EnableUrlLanguage End If If (File.Exists(HttpContext.Current.Server.MapPath(Localization.ApplicationResourceDirectory + "/Locales.xml")) = False) Then - Return GetHostSettingAsBoolean("EnableUrlLanguage", True) + Return Host.EnableUrlLanguage End If Dim cacheKey As String = "" - Dim objPortalSettings As PortalSettings = PortalController.GetCurrentPortalSettings() + Dim objPortalSettings As PortalSettings = PortalController.Instance.GetCurrentPortalSettings() Dim useLanguage As Boolean = False ' check default host setting @@ -82,7 +82,7 @@ Namespace Ventrian.NewsArticles.Components.Utility _strUseLanguageInUrlDefault = languageInUrl.Attributes("enabled").InnerText Else Try - Dim version As Integer = Convert.ToInt32(PortalController.GetCurrentPortalSettings().Version.Replace(".", "")) + Dim version As Integer = Convert.ToInt32(DotNetNukeContext.Current.Application.Version.ToString().Replace(".", "")) If (version >= 490) Then _strUseLanguageInUrlDefault = "true" Else @@ -114,8 +114,8 @@ Namespace Ventrian.NewsArticles.Components.Utility If bXmlLoaded AndAlso Not xmlLocales.SelectSingleNode("//locales/languageInUrl") Is Nothing Then useLanguage = Boolean.Parse(xmlLocales.SelectSingleNode("//locales/languageInUrl").Attributes("enabled").InnerText) End If - If Globals.PerformanceSetting <> Globals.PerformanceSettings.NoCaching Then - Dim dp As New CacheDependency(FilePath) + If Host.PerformanceSetting <> Globals.PerformanceSettings.NoCaching Then + Dim dp As New DNNCacheDependency(FilePath) DataCache.SetCache(cacheKey, useLanguage, dp) End If Else diff --git a/Controls/UploadImages.ascx.vb b/Controls/UploadImages.ascx.vb index 0ac582a..a47b21f 100755 --- a/Controls/UploadImages.ascx.vb +++ b/Controls/UploadImages.ascx.vb @@ -10,6 +10,8 @@ Imports Ventrian.NewsArticles.Base Imports System.Drawing Imports System.Drawing.Drawing2D Imports System.Drawing.Imaging +Imports DotNetNuke.Security.Permissions +Imports DotNetNuke.Services.FileSystem Namespace Ventrian.NewsArticles.Controls @@ -27,8 +29,8 @@ Namespace Ventrian.NewsArticles.Controls #Region " Private Properties " - Private ReadOnly Property ArticleModuleBase() As NewsArticleModuleBase - Get + Private Overloads ReadOnly Property ArticleModuleBase() As NewsArticleModuleBase + Get Return CType(Parent.Parent.Parent.Parent.Parent, NewsArticleModuleBase) End Get End Property @@ -91,18 +93,19 @@ Namespace Ventrian.NewsArticles.Controls drpUploadImageFolder.Items.Clear() - Dim folders As ArrayList = FileSystemUtils.GetFolders(ArticleModuleBase.PortalId) + Dim folders As IEnumerable(Of FolderInfo) = FolderManager.Instance.GetFolders(ArticleModuleBase.PortalId) For Each folder As DotNetNuke.Services.FileSystem.FolderInfo In folders If Not folder.IsProtected Then + Dim folderPermissions as FolderPermissionCollection = FolderPermissionController.GetFolderPermissionsCollectionByFolder(ArticleModuleBase.PortalId,folder.FolderPath) Dim FolderItem As New ListItem() If folder.FolderPath = Null.NullString Then FolderItem.Text = ArticleModuleBase.GetSharedResource("Root") - ReadRoles = FileSystemUtils.GetRoles("", ArticleModuleBase.PortalId, "READ") - WriteRoles = FileSystemUtils.GetRoles("", ArticleModuleBase.PortalId, "WRITE") + ReadRoles = folderPermissions.ToString("READ") + WriteRoles = folderPermissions.ToString("WRITE") Else FolderItem.Text = folder.FolderPath - ReadRoles = FileSystemUtils.GetRoles(FolderItem.Text, ArticleModuleBase.PortalId, "READ") - WriteRoles = FileSystemUtils.GetRoles(FolderItem.Text, ArticleModuleBase.PortalId, "WRITE") + ReadRoles = folderPermissions.ToString("READ") + WriteRoles = folderPermissions.ToString("WRITE") End If FolderItem.Value = folder.FolderID @@ -154,7 +157,7 @@ Namespace Ventrian.NewsArticles.Controls width = Convert.ToInt32(objImage.Width / (objImage.Height / height)) End If - Dim settings As PortalSettings = PortalController.GetCurrentPortalSettings() + Dim settings As PortalSettings = PortalController.Instance.GetCurrentPortalSettings() Return Page.ResolveUrl("~/DesktopModules/DnnForge - NewsArticles/ImageHandler.ashx?Width=" & width.ToString() & "&Height=" & height.ToString() & "&HomeDirectory=" & Server.UrlEncode(settings.HomeDirectory) & "&FileName=" & Server.UrlEncode(objImage.Folder & objImage.FileName) & "&PortalID=" & settings.PortalId.ToString() & "&q=1") @@ -279,7 +282,7 @@ Namespace Ventrian.NewsArticles.Controls End Sub - Protected Sub cmdRefreshPhotos_Click(ByVal sender As Object, ByVal e As EventArgs) Handles cmdRefreshPhotos.Click + Protected Sub cmdRefreshPhotos_Click(ByVal sender As Object, ByVal e As System.EventArgs) Handles cmdRefreshPhotos.Click Try @@ -515,7 +518,7 @@ Namespace Ventrian.NewsArticles.Controls End Sub - Protected Sub cmdAddExistingImage_Click(ByVal sender As Object, ByVal e As EventArgs) Handles cmdAddExistingImage.Click + Protected Sub cmdAddExistingImage_Click(ByVal sender As Object, ByVal e As System.EventArgs) Handles cmdAddExistingImage.Click Try @@ -523,8 +526,7 @@ Namespace Ventrian.NewsArticles.Controls If (ctlImage.Url.ToLower().StartsWith("fileid=")) Then If (IsNumeric(ctlImage.Url.ToLower().Replace("fileid=", ""))) Then Dim fileID As Integer = Convert.ToInt32(ctlImage.Url.ToLower().Replace("fileid=", "")) - Dim objFileController As New DotNetNuke.Services.FileSystem.FileController - Dim objFile As DotNetNuke.Services.FileSystem.FileInfo = objFileController.GetFileById(fileID, ArticleModuleBase.PortalId) + Dim objFile As DotNetNuke.Services.FileSystem.FileInfo = FileManager.Instance.GetFile(fileID) If (objFile IsNot Nothing) Then Dim objImageController As New ImageController @@ -541,7 +543,7 @@ Namespace Ventrian.NewsArticles.Controls objImage.SortOrder = 0 Dim imagesList As List(Of ImageInfo) = objImageController.GetImageList(_articleID, ArticleGuid) If (imagesList.Count > 0) Then - objImage.SortOrder = CType(imagesList(imagesList.Count - 1), ImageInfo).SortOrder + 1 + objImage.SortOrder = imagesList(imagesList.Count - 1).SortOrder + 1 End If objImage.Folder = objFile.Folder objImage.Extension = objFile.Extension @@ -563,7 +565,7 @@ Namespace Ventrian.NewsArticles.Controls End Sub - Protected Sub btUpload_Click(sender As Object, e As EventArgs) + Protected Sub btUpload_Click(sender As Object, e As System.EventArgs) Dim objImageController As New ImageController Dim objPortalController As New PortalController() @@ -616,14 +618,13 @@ Namespace Ventrian.NewsArticles.Controls objImage.SortOrder = CType(imagesList(imagesList.Count - 1), ImageInfo).SortOrder + 1 End If - Dim objPortalSettings As PortalSettings = PortalController.GetCurrentPortalSettings() + Dim objPortalSettings As PortalSettings = PortalController.Instance.GetCurrentPortalSettings() Dim folder As String = "" Dim folderId As Integer = Integer.Parse(drpUploadImageFolder.SelectedValue) If (folderId <> Null.NullInteger) Then - Dim objFolderController As New DotNetNuke.Services.FileSystem.FolderController - Dim objFolder As DotNetNuke.Services.FileSystem.FolderInfo = objFolderController.GetFolderInfo(ArticleModuleBase.PortalId, folderId) + Dim objFolder As FolderInfo = FolderManager.Instance.GetFolder(folderId) If (objFolder IsNot Nothing) Then folder = objFolder.FolderPath End If diff --git a/LatestArticles.ascx.vb b/LatestArticles.ascx.vb index 212098f..1a26ed9 100755 --- a/LatestArticles.ascx.vb +++ b/LatestArticles.ascx.vb @@ -120,7 +120,7 @@ Namespace Ventrian.NewsArticles Get If (_serverTimeZone = Null.NullInteger) Then - _serverTimeZone = PortalSettings.TimeZoneOffset + _serverTimeZone = PortalSettings.TimeZone.GetUtcOffset(DateTime.Now).TotalHours Dim objModuleSettingController As New ModuleController Dim newsSettings As Hashtable = Common.GetModuleSettings(_articleModuleID) diff --git a/LatestArticlesOptions.ascx.vb b/LatestArticlesOptions.ascx.vb index 818e429..5332545 100755 --- a/LatestArticlesOptions.ascx.vb +++ b/LatestArticlesOptions.ascx.vb @@ -13,6 +13,9 @@ Imports DotNetNuke.Services.Localization Imports DotNetNuke.Services.Exceptions Imports Ventrian.NewsArticles.Components.CustomFields Imports System.IO +Imports DotNetNuke.Entities.Users +Imports DotNetNuke.Security.Permissions +Imports DotNetNuke.Security.Roles Namespace Ventrian.NewsArticles @@ -67,8 +70,8 @@ Namespace Ventrian.NewsArticles Dim objTabController As New TabController() - Dim objTabs As ArrayList = objTabController.GetTabs(PortalId) - For Each objTab As DotNetNuke.Entities.Tabs.TabInfo In objTabs + Dim objTabs As TabCollection =TabController.Instance.GetTabsByPortal(PortalId) + For Each objTab As DotNetNuke.Entities.Tabs.TabInfo In objTabs.Values drpPageFilter.Items.Add(New ListItem(objTab.TabPath.Replace("//", "/").TrimStart("/"c), objTab.TabID.ToString())) Next @@ -108,14 +111,13 @@ Namespace Ventrian.NewsArticles Private Sub BindModules() - Dim objDesktopModuleController As New DesktopModuleController - Dim objDesktopModuleInfo As DesktopModuleInfo = objDesktopModuleController.GetDesktopModuleByModuleName("DnnForge - NewsArticles") + Dim objDesktopModuleInfo As DesktopModuleInfo = DesktopModuleController.GetDesktopModuleByModuleName("DnnForge - NewsArticles", PortalSettings.PortalId) If Not (objDesktopModuleInfo Is Nothing) Then Dim objTabController As New TabController() - Dim objTabs As ArrayList = objTabController.GetTabs(PortalId) - For Each objTab As DotNetNuke.Entities.Tabs.TabInfo In objTabs + Dim objTabs As TabCollection = TabController.Instance.GetTabsByPortal(PortalId) + For Each objTab As TabInfo In objTabs.Values If Not (objTab Is Nothing) Then If (objTab.IsDeleted = False) Then Dim objModules As New ModuleController @@ -123,7 +125,7 @@ Namespace Ventrian.NewsArticles Dim objModule As ModuleInfo = pair.Value If (objModule.IsDeleted = False) Then If (objModule.DesktopModuleID = objDesktopModuleInfo.DesktopModuleID) Then - If PortalSecurity.IsInRoles(objModule.AuthorizedEditRoles) = True And objModule.IsDeleted = False Then + If ModulePermissionController.CanEditModuleContent(objModule) = True And objModule.IsDeleted = False Then Dim strPath As String = objTab.TabName Dim objTabSelected As TabInfo = objTab While objTabSelected.ParentId <> Null.NullInteger @@ -672,13 +674,13 @@ Namespace Ventrian.NewsArticles Dim objRole As DotNetNuke.Security.Roles.RoleInfo = objRoleController.GetRoleByName(PortalSettings.PortalId, role) If Not (objRole Is Nothing) Then - Dim objUsers As ArrayList = objRoleController.GetUserRolesByRoleName(PortalSettings.PortalId, objRole.RoleName) - For Each objUser As DotNetNuke.Entities.Users.UserRoleInfo In objUsers + Dim objUsers As List(Of UserInfo) = RoleController.Instance.GetUsersByRole(PortalSettings.PortalId, objRole.RoleName) + For Each objUser As UserInfo In objUsers If (userIDs.Contains(objUser.UserID) = False) Then Dim objUserController As DotNetNuke.Entities.Users.UserController = New DotNetNuke.Entities.Users.UserController Dim objSelectedUser As DotNetNuke.Entities.Users.UserInfo = objUserController.GetUser(PortalSettings.PortalId, objUser.UserID) If Not (objSelectedUser Is Nothing) Then - If (objSelectedUser.Membership.Email.Length > 0) Then + If (objSelectedUser.Email.Length > 0) Then userIDs.Add(objUser.UserID, objUser.UserID) userList.Add(objSelectedUser) End If diff --git a/NewsArticles.ascx.vb b/NewsArticles.ascx.vb index f144078..15f4da2 100755 --- a/NewsArticles.ascx.vb +++ b/NewsArticles.ascx.vb @@ -176,7 +176,7 @@ Namespace Ventrian.NewsArticles Try - jQuery.RegisterJQuery(Page) + 'jQuery.RegisterJQuery(Page) Catch exc As Exception 'Module failed to load ProcessModuleLoadException(Me, exc) diff --git a/Print.aspx.vb b/Print.aspx.vb index abecb99..6c7517f 100755 --- a/Print.aspx.vb +++ b/Print.aspx.vb @@ -8,8 +8,10 @@ Imports System.IO Imports DotNetNuke.Common Imports DotNetNuke.Common.Utilities +Imports DotNetNuke.Entities.Host Imports DotNetNuke.Entities.Modules Imports DotNetNuke.Framework +Imports DotNetNuke.Security.Permissions Namespace Ventrian.NewsArticles @@ -101,7 +103,7 @@ Namespace Ventrian.NewsArticles Else objCSSCache(ID) = "" End If - If Not DotNetNuke.Common.Globals.PerformanceSetting = DotNetNuke.Common.Globals.PerformanceSettings.NoCaching Then + If Not Host.PerformanceSetting = PerformanceSettings.NoCaching Then DataCache.SetCache("CSS", objCSSCache) End If End If @@ -122,7 +124,7 @@ Namespace Ventrian.NewsArticles Else objCSSCache(ID) = "" End If - If Not DotNetNuke.Common.Globals.PerformanceSetting = DotNetNuke.Common.Globals.PerformanceSettings.NoCaching Then + If Not Host.PerformanceSetting = PerformanceSettings.NoCaching Then DataCache.SetCache("CSS", objCSSCache) End If End If @@ -180,7 +182,7 @@ Namespace Ventrian.NewsArticles Dim objModule As ModuleInfo = objModuleController.GetModule(objArticle.ModuleID, _tabID) If Not (objModule Is Nothing) Then - If (DotNetNuke.Security.PortalSecurity.IsInRoles(objModule.AuthorizedViewRoles) = False) Then + If (ModulePermissionController.CanViewModule(objModule) = False) Then Response.Redirect(NavigateURL(_tabID), True) End If diff --git a/Providers/FileProvider/CoreFileProvider.vb b/Providers/FileProvider/CoreFileProvider.vb index ca8cfed..6dad1d9 100755 --- a/Providers/FileProvider/CoreFileProvider.vb +++ b/Providers/FileProvider/CoreFileProvider.vb @@ -26,13 +26,12 @@ Namespace Ventrian.NewsArticles objFile.SortOrder = CType(filesList(filesList.Count - 1), FileInfo).SortOrder + 1 End If - Dim objPortalSettings As PortalSettings = PortalController.GetCurrentPortalSettings() + Dim objPortalSettings As PortalSettings = PortalController.Instance.GetCurrentPortalSettings() Dim folder As String = "" If (folderID <> Null.NullInteger) Then - Dim objFolderController As New FolderController - Dim objFolder As FolderInfo = objFolderController.GetFolderInfo(objPortalSettings.PortalId, folderID) + Dim objFolder As FolderInfo = FolderManager.Instance.GetFolder(folderID) If (objFolder IsNot Nothing) Then folder = objFolder.FolderPath End If @@ -111,7 +110,7 @@ Namespace Ventrian.NewsArticles Public Overrides Function GetFile(ByVal fileID As Integer) As FileInfo Dim objFileController As New FileController() Dim objFile As FileInfo = objFileController.Get(fileID) - objFile.Link = PortalController.GetCurrentPortalSettings().HomeDirectory() & objFile.Folder & objFile.FileName + objFile.Link = PortalController.Instance.GetCurrentPortalSettings().HomeDirectory() & objFile.Folder & objFile.FileName Return objFile End Function @@ -119,7 +118,7 @@ Namespace Ventrian.NewsArticles Dim objFileController As New FileController() Dim objFiles As List(Of FileInfo) = objFileController.GetFileList(articleID, Null.NullString()) For Each objFile As FileInfo In objFiles - objFile.Link = PortalController.GetCurrentPortalSettings().HomeDirectory() & objFile.Folder & objFile.FileName + objFile.Link = PortalController.Instance.GetCurrentPortalSettings().HomeDirectory() & objFile.Folder & objFile.FileName Next Return objFiles End Function diff --git a/Rss.aspx.vb b/Rss.aspx.vb index d3eb6f8..48bd883 100755 --- a/Rss.aspx.vb +++ b/Rss.aspx.vb @@ -283,13 +283,13 @@ Namespace Ventrian.NewsArticles Case "PORTALNAME" Dim objLiteral As New Literal objLiteral.ID = Globals.CreateValidID("Rss-" & iPtr.ToString()) - objLiteral.Text = Server.HtmlEncode(PortalController.GetCurrentPortalSettings().PortalName) + objLiteral.Text = Server.HtmlEncode(PortalController.Instance.GetCurrentPortalSettings().PortalName) objPlaceHolder.Add(objLiteral) Case "PORTALURL" Dim objLiteral As New Literal objLiteral.ID = Globals.CreateValidID("Rss-" & iPtr.ToString()) - objLiteral.Text = Server.HtmlEncode(AddHTTP(PortalController.GetCurrentPortalSettings().PortalAlias.HTTPAlias)) + objLiteral.Text = Server.HtmlEncode(AddHTTP(PortalController.Instance.GetCurrentPortalSettings().PortalAlias.HTTPAlias)) objPlaceHolder.Add(objLiteral) End Select @@ -312,7 +312,7 @@ Namespace Ventrian.NewsArticles Private Sub ProcessItem(ByRef objPlaceHolder As ControlCollection, ByVal templateArray As String(), ByVal objArticle As ArticleInfo, ByVal articleSettings As ArticleSettings, ByVal objTab As TabInfo) - Dim portalSettings As PortalSettings = PortalController.GetCurrentPortalSettings() + Dim portalSettings As PortalSettings = PortalController.Instance.GetCurrentPortalSettings() Dim enclosureLink As String = "" Dim enclosureType As String = "" diff --git a/RssComments.aspx.vb b/RssComments.aspx.vb index 0499bc7..3953b52 100755 --- a/RssComments.aspx.vb +++ b/RssComments.aspx.vb @@ -41,19 +41,19 @@ Namespace Ventrian.NewsArticles Case "PORTALEMAIL" Dim objLiteral As New Literal objLiteral.ID = Globals.CreateValidID("Rss-" & iPtr.ToString()) - objLiteral.Text = PortalController.GetCurrentPortalSettings().Email + objLiteral.Text = PortalController.Instance.GetCurrentPortalSettings().Email objPlaceHolder.Add(objLiteral) Case "PORTALNAME" Dim objLiteral As New Literal objLiteral.ID = Globals.CreateValidID("Rss-" & iPtr.ToString()) - objLiteral.Text = Server.HtmlEncode(PortalController.GetCurrentPortalSettings().PortalName) + objLiteral.Text = Server.HtmlEncode(PortalController.Instance.GetCurrentPortalSettings().PortalName) objPlaceHolder.Add(objLiteral) Case "PORTALURL" Dim objLiteral As New Literal objLiteral.ID = Globals.CreateValidID("Rss-" & iPtr.ToString()) - objLiteral.Text = Server.HtmlEncode(AddHTTP(PortalController.GetCurrentPortalSettings().PortalAlias.HTTPAlias)) + objLiteral.Text = Server.HtmlEncode(AddHTTP(PortalController.Instance.GetCurrentPortalSettings().PortalAlias.HTTPAlias)) objPlaceHolder.Add(objLiteral) End Select @@ -66,7 +66,7 @@ Namespace Ventrian.NewsArticles Private Sub ProcessItem(ByRef objPlaceHolder As ControlCollection, ByVal templateArray As String(), ByVal objArticle As ArticleInfo, ByVal objComment As CommentInfo, ByVal articleSettings As ArticleSettings) - Dim portalSettings As PortalSettings = PortalController.GetCurrentPortalSettings() + Dim portalSettings As PortalSettings = PortalController.Instance.GetCurrentPortalSettings() For iPtr As Integer = 0 To templateArray.Length - 1 Step 2 diff --git a/ucSubmitNews.ascx.vb b/ucSubmitNews.ascx.vb index ed7be15..8fc0802 100755 --- a/ucSubmitNews.ascx.vb +++ b/ucSubmitNews.ascx.vb @@ -249,7 +249,7 @@ Namespace Ventrian.NewsArticles chkFeatured.Checked = ArticleSettings.IsAutoFeatured chkSecure.Checked = ArticleSettings.IsAutoSecured If (ArticleSettings.AuthorDefault <> Null.NullInteger) Then - Dim objUser As UserInfo = UserController.GetUser(PortalId, ArticleSettings.AuthorDefault, True) + Dim objUser As UserInfo = UserController.Instance.GetUser(PortalId, ArticleSettings.AuthorDefault) If (objUser IsNot Nothing) Then lblAuthor.Text = objUser.Username @@ -389,8 +389,8 @@ Namespace Ventrian.NewsArticles Dim objRole As DotNetNuke.Security.Roles.RoleInfo = objRoleController.GetRoleByName(PortalSettings.PortalId, role) If Not (objRole Is Nothing) Then - Dim objUsers As ArrayList = objRoleController.GetUserRolesByRoleName(PortalSettings.PortalId, objRole.RoleName) - For Each objUser As DotNetNuke.Entities.Users.UserRoleInfo In objUsers + Dim objUsers As List(Of UserInfo) = RoleController.Instance.GetUsersByRole(PortalSettings.PortalId, objRole.RoleName) + For Each objUser As UserInfo In objUsers If (userIDs.Contains(objUser.UserID) = False) Then Dim objUserController As DotNetNuke.Entities.Users.UserController = New DotNetNuke.Entities.Users.UserController Dim objSelectedUser As DotNetNuke.Entities.Users.UserInfo = objUserController.GetUser(PortalSettings.PortalId, objUser.UserID) @@ -599,8 +599,7 @@ Namespace Ventrian.NewsArticles If (objSettingsLinked.ContainsKey(ArticleConstants.DEFAULT_FILES_FOLDER_SETTING)) Then If (IsNumeric(objSettingsLinked(ArticleConstants.DEFAULT_FILES_FOLDER_SETTING))) Then Dim folderID As Integer = Convert.ToInt32(objSettingsLinked(ArticleConstants.DEFAULT_FILES_FOLDER_SETTING)) - Dim objFolderController As New FolderController - Dim objFolder As FolderInfo = objFolderController.GetFolderInfo(Convert.ToInt32(drpMirrorModule.SelectedValue.Split("-"c)(0)), folderID) + Dim objFolder As FolderInfo = FolderManager.Instance.GetFolder(folderID) If (objFolder IsNot Nothing) Then folderLinked = objFolder.FolderPath End If @@ -619,8 +618,7 @@ Namespace Ventrian.NewsArticles If (objSettings.ContainsKey(ArticleConstants.DEFAULT_FILES_FOLDER_SETTING)) Then If (IsNumeric(objSettings(ArticleConstants.DEFAULT_FILES_FOLDER_SETTING))) Then Dim folderID As Integer = Convert.ToInt32(objSettings(ArticleConstants.DEFAULT_FILES_FOLDER_SETTING)) - Dim objFolderController As New FolderController - Dim objFolder As FolderInfo = objFolderController.GetFolderInfo(PortalId, folderID) + Dim objFolder As FolderInfo = FolderManager.Instance.GetFolder(folderID) If (objFolder IsNot Nothing) Then folder = objFolder.FolderPath End If @@ -667,8 +665,7 @@ Namespace Ventrian.NewsArticles If (objSettingsLinked.ContainsKey(ArticleConstants.DEFAULT_IMAGES_FOLDER_SETTING)) Then If (IsNumeric(objSettingsLinked(ArticleConstants.DEFAULT_IMAGES_FOLDER_SETTING))) Then Dim folderID As Integer = Convert.ToInt32(objSettingsLinked(ArticleConstants.DEFAULT_IMAGES_FOLDER_SETTING)) - Dim objFolderController As New FolderController - Dim objFolder As FolderInfo = objFolderController.GetFolderInfo(Convert.ToInt32(drpMirrorModule.SelectedValue.Split("-"c)(0)), folderID) + Dim objFolder As FolderInfo = FolderManager.Instance.GetFolder(folderID) If (objFolder IsNot Nothing) Then folderImagesLinked = objFolder.FolderPath End If @@ -682,8 +679,7 @@ Namespace Ventrian.NewsArticles If (objSettings.ContainsKey(ArticleConstants.DEFAULT_IMAGES_FOLDER_SETTING)) Then If (IsNumeric(objSettings(ArticleConstants.DEFAULT_IMAGES_FOLDER_SETTING))) Then Dim folderID As Integer = Convert.ToInt32(objSettings(ArticleConstants.DEFAULT_IMAGES_FOLDER_SETTING)) - Dim objFolderController As New FolderController - Dim objFolder As FolderInfo = objFolderController.GetFolderInfo(PortalId, folderID) + Dim objFolder As FolderInfo = FolderManager.Instance.GetFolder(folderID) If (objFolder IsNot Nothing) Then folderImages = objFolder.FolderPath End If @@ -968,8 +964,7 @@ Namespace Ventrian.NewsArticles If (objSettingsLinked.ContainsKey(ArticleConstants.DEFAULT_FILES_FOLDER_SETTING)) Then If (IsNumeric(objSettingsLinked(ArticleConstants.DEFAULT_FILES_FOLDER_SETTING))) Then Dim folderID As Integer = Convert.ToInt32(objSettingsLinked(ArticleConstants.DEFAULT_FILES_FOLDER_SETTING)) - Dim objFolderController As New FolderController - Dim objFolder As FolderInfo = objFolderController.GetFolderInfo(objArticleMirrored.ModuleID, folderID) + Dim objFolder As FolderInfo = FolderManager.Instance.GetFolder(folderID) If (objFolder IsNot Nothing) Then folderLinked = objFolder.FolderPath End If @@ -988,8 +983,7 @@ Namespace Ventrian.NewsArticles If (objSettings.ContainsKey(ArticleConstants.DEFAULT_FILES_FOLDER_SETTING)) Then If (IsNumeric(objSettings(ArticleConstants.DEFAULT_FILES_FOLDER_SETTING))) Then Dim folderID As Integer = Convert.ToInt32(objSettings(ArticleConstants.DEFAULT_FILES_FOLDER_SETTING)) - Dim objFolderController As New FolderController - Dim objFolder As FolderInfo = objFolderController.GetFolderInfo(PortalId, folderID) + Dim objFolder As FolderInfo = FolderManager.Instance.GetFolder(folderID) If (objFolder IsNot Nothing) Then folder = objFolder.FolderPath End If @@ -1035,8 +1029,7 @@ Namespace Ventrian.NewsArticles If (objSettingsLinked.ContainsKey(ArticleConstants.DEFAULT_IMAGES_FOLDER_SETTING)) Then If (IsNumeric(objSettingsLinked(ArticleConstants.DEFAULT_IMAGES_FOLDER_SETTING))) Then Dim folderID As Integer = Convert.ToInt32(objSettingsLinked(ArticleConstants.DEFAULT_IMAGES_FOLDER_SETTING)) - Dim objFolderController As New FolderController - Dim objFolder As FolderInfo = objFolderController.GetFolderInfo(objArticleMirrored.ModuleID, folderID) + Dim objFolder As FolderInfo = FolderManager.Instance.GetFolder(folderID) If (objFolder IsNot Nothing) Then folderImagesLinked = objFolder.FolderPath End If @@ -1050,8 +1043,7 @@ Namespace Ventrian.NewsArticles If (objSettings.ContainsKey(ArticleConstants.DEFAULT_IMAGES_FOLDER_SETTING)) Then If (IsNumeric(objSettings(ArticleConstants.DEFAULT_IMAGES_FOLDER_SETTING))) Then Dim folderID As Integer = Convert.ToInt32(objSettings(ArticleConstants.DEFAULT_IMAGES_FOLDER_SETTING)) - Dim objFolderController As New FolderController - Dim objFolder As FolderInfo = objFolderController.GetFolderInfo(PortalId, folderID) + Dim objFolder As FolderInfo = FolderManager.Instance.GetFolder(folderID) If (objFolder IsNot Nothing) Then folderImages = objFolder.FolderPath End If diff --git a/ucViewOptions.ascx.designer.vb b/ucViewOptions.ascx.designer.vb index 7553520..c81df54 100755 --- a/ucViewOptions.ascx.designer.vb +++ b/ucViewOptions.ascx.designer.vb @@ -11,9 +11,9 @@ Option Strict On Option Explicit On Namespace Ventrian.NewsArticles - + Partial Public Class ucViewOptions - + ''' '''ucHeader1 control. ''' @@ -22,7 +22,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents ucHeader1 As Global.Ventrian.NewsArticles.ucHeader - + ''' '''dshBasic control. ''' @@ -31,7 +31,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents dshBasic As Global.System.Web.UI.UserControl - + ''' '''tblArticle control. ''' @@ -40,7 +40,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents tblArticle As Global.System.Web.UI.HtmlControls.HtmlTable - + ''' '''lblArticleSettingsHelp control. ''' @@ -49,7 +49,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents lblArticleSettingsHelp As Global.System.Web.UI.WebControls.Label - + ''' '''dshDetails control. ''' @@ -58,7 +58,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents dshDetails As Global.System.Web.UI.UserControl - + ''' '''tblDetails control. ''' @@ -67,7 +67,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents tblDetails As Global.System.Web.UI.HtmlControls.HtmlTable - + ''' '''plEnableRatings control. ''' @@ -76,7 +76,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plEnableRatings As Global.System.Web.UI.UserControl - + ''' '''chkEnableRatingsAuthenticated control. ''' @@ -85,7 +85,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkEnableRatingsAuthenticated As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plEnableAnonymousRatings control. ''' @@ -94,7 +94,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plEnableAnonymousRatings As Global.System.Web.UI.UserControl - + ''' '''chkEnableRatingsAnonymous control. ''' @@ -103,7 +103,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkEnableRatingsAnonymous As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plEnableCoreSearch control. ''' @@ -112,7 +112,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plEnableCoreSearch As Global.System.Web.UI.UserControl - + ''' '''chkEnableCoreSearch control. ''' @@ -121,7 +121,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkEnableCoreSearch As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plEnableNotificationPing control. ''' @@ -130,7 +130,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plEnableNotificationPing As Global.System.Web.UI.UserControl - + ''' '''chkEnableNotificationPing control. ''' @@ -139,7 +139,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkEnableNotificationPing As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plEnableAutoTrackback control. ''' @@ -148,7 +148,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plEnableAutoTrackback As Global.System.Web.UI.UserControl - + ''' '''chkEnableAutoTrackback control. ''' @@ -157,7 +157,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkEnableAutoTrackback As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plEnableIncomingTrackback control. ''' @@ -166,7 +166,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plEnableIncomingTrackback As Global.System.Web.UI.UserControl - + ''' '''chkEnableIncomingTrackback control. ''' @@ -175,7 +175,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkEnableIncomingTrackback As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plLaunchLinks control. ''' @@ -184,7 +184,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plLaunchLinks As Global.System.Web.UI.UserControl - + ''' '''chkLaunchLinks control. ''' @@ -193,7 +193,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkLaunchLinks As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plBubbleFeaturedArticles control. ''' @@ -202,7 +202,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plBubbleFeaturedArticles As Global.System.Web.UI.UserControl - + ''' '''chkBubbleFeaturedArticles control. ''' @@ -211,7 +211,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkBubbleFeaturedArticles As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plProcessPostTokens control. ''' @@ -220,7 +220,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plProcessPostTokens As Global.System.Web.UI.UserControl - + ''' '''chkProcessPostTokens control. ''' @@ -229,7 +229,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkProcessPostTokens As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plDisplayType control. ''' @@ -238,7 +238,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plDisplayType As Global.System.Web.UI.UserControl - + ''' '''drpDisplayType control. ''' @@ -247,7 +247,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents drpDisplayType As Global.System.Web.UI.WebControls.DropDownList - + ''' '''plArticlePageSize control. ''' @@ -256,7 +256,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plArticlePageSize As Global.System.Web.UI.UserControl - + ''' '''drpNumber control. ''' @@ -265,7 +265,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents drpNumber As Global.System.Web.UI.WebControls.DropDownList - + ''' '''plTemplate control. ''' @@ -274,7 +274,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plTemplate As Global.System.Web.UI.UserControl - + ''' '''drpTemplates control. ''' @@ -283,7 +283,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents drpTemplates As Global.System.Web.UI.WebControls.DropDownList - + ''' '''plTimeZone control. ''' @@ -292,7 +292,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plTimeZone As Global.System.Web.UI.UserControl - + ''' '''drpTimeZone control. ''' @@ -301,7 +301,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents drpTimeZone As Global.System.Web.UI.WebControls.DropDownList - + ''' '''plSortBy control. ''' @@ -310,7 +310,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plSortBy As Global.System.Web.UI.UserControl - + ''' '''drpSortBy control. ''' @@ -319,7 +319,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents drpSortBy As Global.System.Web.UI.WebControls.DropDownList - + ''' '''plSortDirection control. ''' @@ -328,7 +328,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plSortDirection As Global.System.Web.UI.UserControl - + ''' '''drpSortDirection control. ''' @@ -337,7 +337,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents drpSortDirection As Global.System.Web.UI.WebControls.DropDownList - + ''' '''plMenuPosition control. ''' @@ -346,7 +346,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plMenuPosition As Global.System.Web.UI.UserControl - + ''' '''lstMenuPosition control. ''' @@ -355,7 +355,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents lstMenuPosition As Global.System.Web.UI.WebControls.RadioButtonList - + ''' '''dshArchive control. ''' @@ -364,7 +364,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents dshArchive As Global.System.Web.UI.UserControl - + ''' '''tblArchive control. ''' @@ -373,7 +373,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents tblArchive As Global.System.Web.UI.HtmlControls.HtmlTable - + ''' '''Label1 control. ''' @@ -382,7 +382,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents Label1 As Global.System.Web.UI.UserControl - + ''' '''chkArchiveCurrentArticles control. ''' @@ -391,7 +391,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkArchiveCurrentArticles As Global.System.Web.UI.WebControls.CheckBox - + ''' '''Label2 control. ''' @@ -400,7 +400,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents Label2 As Global.System.Web.UI.UserControl - + ''' '''chkArchiveCategories control. ''' @@ -409,7 +409,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkArchiveCategories As Global.System.Web.UI.WebControls.CheckBox - + ''' '''Label3 control. ''' @@ -418,7 +418,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents Label3 As Global.System.Web.UI.UserControl - + ''' '''chkArchiveAuthor control. ''' @@ -427,7 +427,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkArchiveAuthor As Global.System.Web.UI.WebControls.CheckBox - + ''' '''Label4 control. ''' @@ -436,7 +436,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents Label4 As Global.System.Web.UI.UserControl - + ''' '''chkArchiveMonth control. ''' @@ -445,7 +445,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkArchiveMonth As Global.System.Web.UI.WebControls.CheckBox - + ''' '''dshCategory control. ''' @@ -454,7 +454,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents dshCategory As Global.System.Web.UI.UserControl - + ''' '''tblCategory control. ''' @@ -463,7 +463,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents tblCategory As Global.System.Web.UI.HtmlControls.HtmlTable - + ''' '''plRequireCategory control. ''' @@ -472,7 +472,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plRequireCategory As Global.System.Web.UI.UserControl - + ''' '''chkRequireCategory control. ''' @@ -481,7 +481,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkRequireCategory As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plDefaultCategories control. ''' @@ -490,7 +490,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plDefaultCategories As Global.System.Web.UI.UserControl - + ''' '''lstDefaultCategories control. ''' @@ -499,7 +499,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents lstDefaultCategories As Global.System.Web.UI.WebControls.ListBox - + ''' '''plCategorySelectionHeight control. ''' @@ -508,7 +508,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plCategorySelectionHeight As Global.System.Web.UI.UserControl - + ''' '''txtCategorySelectionHeight control. ''' @@ -517,7 +517,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents txtCategorySelectionHeight As Global.System.Web.UI.WebControls.TextBox - + ''' '''valCategorySelectionHeight control. ''' @@ -526,7 +526,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents valCategorySelectionHeight As Global.System.Web.UI.WebControls.RequiredFieldValidator - + ''' '''valCategorySelectionHeightIsValid control. ''' @@ -535,7 +535,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents valCategorySelectionHeightIsValid As Global.System.Web.UI.WebControls.CompareValidator - + ''' '''plCategoryBreadcrumb control. ''' @@ -544,7 +544,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plCategoryBreadcrumb As Global.System.Web.UI.UserControl - + ''' '''chkCategoryBreadcrumb control. ''' @@ -553,7 +553,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkCategoryBreadcrumb As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plCategoryName control. ''' @@ -562,7 +562,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plCategoryName As Global.System.Web.UI.UserControl - + ''' '''chkCategoryName control. ''' @@ -571,7 +571,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkCategoryName As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plCategorySortOrder control. ''' @@ -580,7 +580,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plCategorySortOrder As Global.System.Web.UI.UserControl - + ''' '''lstCategorySortOrder control. ''' @@ -589,7 +589,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents lstCategorySortOrder As Global.System.Web.UI.WebControls.RadioButtonList - + ''' '''plCategoryFilterSubmit control. ''' @@ -598,7 +598,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plCategoryFilterSubmit As Global.System.Web.UI.UserControl - + ''' '''chkCategoryFilterSubmit control. ''' @@ -607,7 +607,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkCategoryFilterSubmit As Global.System.Web.UI.WebControls.CheckBox - + ''' '''dshComments control. ''' @@ -616,7 +616,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents dshComments As Global.System.Web.UI.UserControl - + ''' '''tblComments control. ''' @@ -625,7 +625,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents tblComments As Global.System.Web.UI.HtmlControls.HtmlTable - + ''' '''plEnableComments control. ''' @@ -634,7 +634,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plEnableComments As Global.System.Web.UI.UserControl - + ''' '''chkEnableComments control. ''' @@ -643,7 +643,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkEnableComments As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plEnableAnonymousComments control. ''' @@ -652,7 +652,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plEnableAnonymousComments As Global.System.Web.UI.UserControl - + ''' '''chkEnableAnonymousComments control. ''' @@ -661,7 +661,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkEnableAnonymousComments As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plEnableCommentModeration control. ''' @@ -670,7 +670,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plEnableCommentModeration As Global.System.Web.UI.UserControl - + ''' '''chkEnableCommentModeration control. ''' @@ -679,7 +679,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkEnableCommentModeration As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plUseCaptcha control. ''' @@ -688,7 +688,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plUseCaptcha As Global.System.Web.UI.UserControl - + ''' '''chkUseCaptcha control. ''' @@ -697,7 +697,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkUseCaptcha As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plHideWebsite control. ''' @@ -706,7 +706,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plHideWebsite As Global.System.Web.UI.UserControl - + ''' '''chkHideWebsite control. ''' @@ -715,7 +715,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkHideWebsite As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plRequireName control. ''' @@ -724,7 +724,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plRequireName As Global.System.Web.UI.UserControl - + ''' '''chkRequireName control. ''' @@ -733,7 +733,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkRequireName As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plRequireEmail control. ''' @@ -742,7 +742,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plRequireEmail As Global.System.Web.UI.UserControl - + ''' '''chkRequireEmail control. ''' @@ -751,7 +751,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkRequireEmail As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plNotifyDefault control. ''' @@ -760,7 +760,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plNotifyDefault As Global.System.Web.UI.UserControl - + ''' '''chkNotifyDefault control. ''' @@ -769,7 +769,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkNotifyDefault As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plSortDirectionComments control. ''' @@ -778,7 +778,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plSortDirectionComments As Global.System.Web.UI.UserControl - + ''' '''drpSortDirectionComments control. ''' @@ -787,7 +787,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents drpSortDirectionComments As Global.System.Web.UI.WebControls.DropDownList - + ''' '''plAkismetKey control. ''' @@ -796,7 +796,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plAkismetKey As Global.System.Web.UI.UserControl - + ''' '''txtAkismetKey control. ''' @@ -805,7 +805,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents txtAkismetKey As Global.System.Web.UI.WebControls.TextBox - + ''' '''phContentSharing control. ''' @@ -814,7 +814,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents phContentSharing As Global.System.Web.UI.WebControls.PlaceHolder - + ''' '''dshContentSharing control. ''' @@ -823,7 +823,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents dshContentSharing As Global.System.Web.UI.UserControl - + ''' '''tblContentSharing control. ''' @@ -832,7 +832,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents tblContentSharing As Global.System.Web.UI.HtmlControls.HtmlTable - + ''' '''lblContentSharing control. ''' @@ -841,7 +841,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents lblContentSharing As Global.System.Web.UI.WebControls.Label - + ''' '''plAddArticleInstances control. ''' @@ -850,7 +850,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plAddArticleInstances As Global.System.Web.UI.UserControl - + ''' '''drpContentSharingPortals control. ''' @@ -859,7 +859,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents drpContentSharingPortals As Global.System.Web.UI.WebControls.DropDownList - + ''' '''cmdContentSharingAdd control. ''' @@ -868,7 +868,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents cmdContentSharingAdd As Global.System.Web.UI.WebControls.LinkButton - + ''' '''lblContentSharingNoneAvailable control. ''' @@ -877,7 +877,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents lblContentSharingNoneAvailable As Global.System.Web.UI.WebControls.Label - + ''' '''plAvailableArticleInstances control. ''' @@ -886,7 +886,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plAvailableArticleInstances As Global.System.Web.UI.UserControl - + ''' '''grdContentSharing control. ''' @@ -895,7 +895,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents grdContentSharing As Global.System.Web.UI.WebControls.DataGrid - + ''' '''lblNoContentSharing control. ''' @@ -904,7 +904,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents lblNoContentSharing As Global.System.Web.UI.WebControls.Label - + ''' '''dshFileSettings control. ''' @@ -913,7 +913,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents dshFileSettings As Global.System.Web.UI.UserControl - + ''' '''tblFile control. ''' @@ -922,7 +922,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents tblFile As Global.System.Web.UI.HtmlControls.HtmlTable - + ''' '''plDefaultFileFolder control. ''' @@ -931,7 +931,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plDefaultFileFolder As Global.System.Web.UI.UserControl - + ''' '''drpDefaultFileFolder control. ''' @@ -940,7 +940,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents drpDefaultFileFolder As Global.System.Web.UI.WebControls.DropDownList - + ''' '''dshFilter control. ''' @@ -949,7 +949,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents dshFilter As Global.System.Web.UI.UserControl - + ''' '''tblFilter control. ''' @@ -958,7 +958,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents tblFilter As Global.System.Web.UI.HtmlControls.HtmlTable - + ''' '''plMaxArticles control. ''' @@ -967,7 +967,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plMaxArticles As Global.System.Web.UI.UserControl - + ''' '''txtMaxArticles control. ''' @@ -976,7 +976,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents txtMaxArticles As Global.System.Web.UI.WebControls.TextBox - + ''' '''valMaxArticlesIsValid control. ''' @@ -985,7 +985,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents valMaxArticlesIsValid As Global.System.Web.UI.WebControls.CompareValidator - + ''' '''plMaxAge control. ''' @@ -994,7 +994,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plMaxAge As Global.System.Web.UI.UserControl - + ''' '''txtMaxAge control. ''' @@ -1003,7 +1003,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents txtMaxAge As Global.System.Web.UI.WebControls.TextBox - + ''' '''lblMaxAge control. ''' @@ -1012,7 +1012,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents lblMaxAge As Global.System.Web.UI.WebControls.Label - + ''' '''valMaxAgeType control. ''' @@ -1021,7 +1021,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents valMaxAgeType As Global.System.Web.UI.WebControls.CompareValidator - + ''' '''plCategories control. ''' @@ -1030,7 +1030,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plCategories As Global.System.Web.UI.UserControl - + ''' '''rdoAllCategories control. ''' @@ -1039,7 +1039,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents rdoAllCategories As Global.System.Web.UI.WebControls.RadioButton - + ''' '''rdoSingleCategory control. ''' @@ -1048,7 +1048,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents rdoSingleCategory As Global.System.Web.UI.WebControls.RadioButton - + ''' '''drpCategories control. ''' @@ -1057,7 +1057,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents drpCategories As Global.System.Web.UI.WebControls.DropDownList - + ''' '''rdoMatchAny control. ''' @@ -1066,7 +1066,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents rdoMatchAny As Global.System.Web.UI.WebControls.RadioButton - + ''' '''rdoMatchAll control. ''' @@ -1075,7 +1075,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents rdoMatchAll As Global.System.Web.UI.WebControls.RadioButton - + ''' '''lstCategories control. ''' @@ -1084,7 +1084,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents lstCategories As Global.System.Web.UI.WebControls.ListBox - + ''' '''lblHoldCtrl control. ''' @@ -1093,7 +1093,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents lblHoldCtrl As Global.System.Web.UI.WebControls.Label - + ''' '''plShowPending control. ''' @@ -1102,7 +1102,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plShowPending As Global.System.Web.UI.UserControl - + ''' '''chkShowPending control. ''' @@ -1111,7 +1111,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkShowPending As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plShowFeaturedOnly control. ''' @@ -1120,7 +1120,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plShowFeaturedOnly As Global.System.Web.UI.UserControl - + ''' '''chkShowFeaturedOnly control. ''' @@ -1129,7 +1129,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkShowFeaturedOnly As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plShowNotFeaturedOnly control. ''' @@ -1138,7 +1138,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plShowNotFeaturedOnly As Global.System.Web.UI.UserControl - + ''' '''chkShowNotFeaturedOnly control. ''' @@ -1147,7 +1147,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkShowNotFeaturedOnly As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plShowSecuredOnly control. ''' @@ -1156,7 +1156,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plShowSecuredOnly As Global.System.Web.UI.UserControl - + ''' '''chkShowSecuredOnly control. ''' @@ -1165,7 +1165,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkShowSecuredOnly As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plShowNotSecuredOnly control. ''' @@ -1174,7 +1174,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plShowNotSecuredOnly As Global.System.Web.UI.UserControl - + ''' '''chkShowNotSecuredOnly control. ''' @@ -1183,7 +1183,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkShowNotSecuredOnly As Global.System.Web.UI.WebControls.CheckBox - + ''' '''dshAuthorFilterSettings control. ''' @@ -1192,7 +1192,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents dshAuthorFilterSettings As Global.System.Web.UI.UserControl - + ''' '''tblAuthorFilterSettings control. ''' @@ -1201,7 +1201,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents tblAuthorFilterSettings As Global.System.Web.UI.HtmlControls.HtmlTable - + ''' '''plAuthor control. ''' @@ -1210,7 +1210,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plAuthor As Global.System.Web.UI.UserControl - + ''' '''lblAuthorFilter control. ''' @@ -1219,7 +1219,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents lblAuthorFilter As Global.System.Web.UI.WebControls.Label - + ''' '''cmdSelectAuthor control. ''' @@ -1228,7 +1228,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents cmdSelectAuthor As Global.System.Web.UI.WebControls.LinkButton - + ''' '''ddlAuthor control. ''' @@ -1237,7 +1237,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents ddlAuthor As Global.System.Web.UI.WebControls.DropDownList - + ''' '''plQueryStringFilter control. ''' @@ -1246,7 +1246,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plQueryStringFilter As Global.System.Web.UI.UserControl - + ''' '''chkQueryStringFilter control. ''' @@ -1255,7 +1255,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkQueryStringFilter As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plQueryStringParam control. ''' @@ -1264,7 +1264,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plQueryStringParam As Global.System.Web.UI.UserControl - + ''' '''txtQueryStringParam control. ''' @@ -1273,7 +1273,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents txtQueryStringParam As Global.System.Web.UI.WebControls.TextBox - + ''' '''plUsernameFilter control. ''' @@ -1282,7 +1282,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plUsernameFilter As Global.System.Web.UI.UserControl - + ''' '''chkUsernameFilter control. ''' @@ -1291,7 +1291,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkUsernameFilter As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plUsernameParam control. ''' @@ -1300,7 +1300,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plUsernameParam As Global.System.Web.UI.UserControl - + ''' '''txtUsernameParam control. ''' @@ -1309,7 +1309,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents txtUsernameParam As Global.System.Web.UI.WebControls.TextBox - + ''' '''plLoggedInUser control. ''' @@ -1318,7 +1318,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plLoggedInUser As Global.System.Web.UI.UserControl - + ''' '''chkLoggedInUser control. ''' @@ -1327,7 +1327,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkLoggedInUser As Global.System.Web.UI.WebControls.CheckBox - + ''' '''dshForm control. ''' @@ -1336,7 +1336,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents dshForm As Global.System.Web.UI.UserControl - + ''' '''tblForm control. ''' @@ -1345,7 +1345,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents tblForm As Global.System.Web.UI.HtmlControls.HtmlTable - + ''' '''plAuthorSelection control. ''' @@ -1354,7 +1354,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plAuthorSelection As Global.System.Web.UI.UserControl - + ''' '''lstAuthorSelection control. ''' @@ -1363,7 +1363,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents lstAuthorSelection As Global.System.Web.UI.WebControls.RadioButtonList - + ''' '''plAuthorDefault control. ''' @@ -1372,7 +1372,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plAuthorDefault As Global.System.Web.UI.UserControl - + ''' '''lblAuthorDefault control. ''' @@ -1381,7 +1381,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents lblAuthorDefault As Global.System.Web.UI.WebControls.Label - + ''' '''cmdSelectAuthorDefault control. ''' @@ -1390,7 +1390,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents cmdSelectAuthorDefault As Global.System.Web.UI.WebControls.LinkButton - + ''' '''drpAuthorDefault control. ''' @@ -1399,7 +1399,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents drpAuthorDefault As Global.System.Web.UI.WebControls.DropDownList - + ''' '''plExpandSummary control. ''' @@ -1408,7 +1408,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plExpandSummary As Global.System.Web.UI.UserControl - + ''' '''chkExpandSummary control. ''' @@ -1417,7 +1417,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkExpandSummary As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plTextEditorWidth control. ''' @@ -1426,7 +1426,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plTextEditorWidth As Global.System.Web.UI.UserControl - + ''' '''txtTextEditorWidth control. ''' @@ -1435,7 +1435,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents txtTextEditorWidth As Global.System.Web.UI.WebControls.TextBox - + ''' '''valEditorWidth control. ''' @@ -1444,7 +1444,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents valEditorWidth As Global.System.Web.UI.WebControls.RequiredFieldValidator - + ''' '''valEditorWidthIsValid control. ''' @@ -1453,7 +1453,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents valEditorWidthIsValid As Global.System.Web.UI.WebControls.CustomValidator - + ''' '''plTextEditorHeight control. ''' @@ -1462,7 +1462,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plTextEditorHeight As Global.System.Web.UI.UserControl - + ''' '''txtTextEditorHeight control. ''' @@ -1471,7 +1471,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents txtTextEditorHeight As Global.System.Web.UI.WebControls.TextBox - + ''' '''valEditorHeight control. ''' @@ -1480,7 +1480,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents valEditorHeight As Global.System.Web.UI.WebControls.RequiredFieldValidator - + ''' '''valEditorHeightIsvalid control. ''' @@ -1489,7 +1489,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents valEditorHeightIsvalid As Global.System.Web.UI.WebControls.CustomValidator - + ''' '''plTextEditorSummaryMode control. ''' @@ -1498,7 +1498,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plTextEditorSummaryMode As Global.System.Web.UI.UserControl - + ''' '''lstTextEditorSummaryMode control. ''' @@ -1507,7 +1507,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents lstTextEditorSummaryMode As Global.System.Web.UI.WebControls.RadioButtonList - + ''' '''plTextEditorSummaryWidth control. ''' @@ -1516,7 +1516,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plTextEditorSummaryWidth As Global.System.Web.UI.UserControl - + ''' '''txtTextEditorSummaryWidth control. ''' @@ -1525,7 +1525,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents txtTextEditorSummaryWidth As Global.System.Web.UI.WebControls.TextBox - + ''' '''valTextEditorSummaryWidth control. ''' @@ -1534,7 +1534,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents valTextEditorSummaryWidth As Global.System.Web.UI.WebControls.RequiredFieldValidator - + ''' '''valTextEditorSummaryWidthIsValid control. ''' @@ -1543,7 +1543,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents valTextEditorSummaryWidthIsValid As Global.System.Web.UI.WebControls.CustomValidator - + ''' '''plTextEditorSummaryHeight control. ''' @@ -1552,7 +1552,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plTextEditorSummaryHeight As Global.System.Web.UI.UserControl - + ''' '''txtTextEditorSummaryHeight control. ''' @@ -1561,7 +1561,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents txtTextEditorSummaryHeight As Global.System.Web.UI.WebControls.TextBox - + ''' '''valTextEditorSummaryHeight control. ''' @@ -1570,7 +1570,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents valTextEditorSummaryHeight As Global.System.Web.UI.WebControls.RequiredFieldValidator - + ''' '''valTextEditorSummaryHeightIsValid control. ''' @@ -1579,7 +1579,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents valTextEditorSummaryHeightIsValid As Global.System.Web.UI.WebControls.CustomValidator - + ''' '''dshImage control. ''' @@ -1588,7 +1588,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents dshImage As Global.System.Web.UI.UserControl - + ''' '''tblImage control. ''' @@ -1597,7 +1597,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents tblImage As Global.System.Web.UI.HtmlControls.HtmlTable - + ''' '''plIncludeJQuery control. ''' @@ -1606,7 +1606,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plIncludeJQuery As Global.System.Web.UI.UserControl - + ''' '''chkIncludeJQuery control. ''' @@ -1615,7 +1615,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkIncludeJQuery As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plJQueryPath control. ''' @@ -1624,7 +1624,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plJQueryPath As Global.System.Web.UI.UserControl - + ''' '''txtJQueryPath control. ''' @@ -1633,7 +1633,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents txtJQueryPath As Global.System.Web.UI.WebControls.TextBox - + ''' '''plEnableImagesUpload control. ''' @@ -1642,7 +1642,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plEnableImagesUpload As Global.System.Web.UI.UserControl - + ''' '''chkEnableImagesUpload control. ''' @@ -1651,7 +1651,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkEnableImagesUpload As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plEnableImages control. ''' @@ -1660,7 +1660,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plEnableImages As Global.System.Web.UI.UserControl - + ''' '''chkEnablePortalImages control. ''' @@ -1669,7 +1669,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkEnablePortalImages As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plEnableImagesExternal control. ''' @@ -1678,7 +1678,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plEnableImagesExternal As Global.System.Web.UI.UserControl - + ''' '''chkEnableExternalImages control. ''' @@ -1687,7 +1687,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkEnableExternalImages As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plDefaultImageFolder control. ''' @@ -1696,7 +1696,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plDefaultImageFolder As Global.System.Web.UI.UserControl - + ''' '''drpDefaultImageFolder control. ''' @@ -1705,7 +1705,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents drpDefaultImageFolder As Global.System.Web.UI.WebControls.DropDownList - + ''' '''plResizeImages control. ''' @@ -1714,7 +1714,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plResizeImages As Global.System.Web.UI.UserControl - + ''' '''chkResizeImages control. ''' @@ -1723,7 +1723,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkResizeImages As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plImageMaxWidth control. ''' @@ -1732,7 +1732,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plImageMaxWidth As Global.System.Web.UI.UserControl - + ''' '''txtImageMaxWidth control. ''' @@ -1741,7 +1741,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents txtImageMaxWidth As Global.System.Web.UI.WebControls.TextBox - + ''' '''valImageMaxWidth control. ''' @@ -1750,7 +1750,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents valImageMaxWidth As Global.System.Web.UI.WebControls.RequiredFieldValidator - + ''' '''valImageMaxWidthIsNumber control. ''' @@ -1759,7 +1759,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents valImageMaxWidthIsNumber As Global.System.Web.UI.WebControls.CompareValidator - + ''' '''plImageMaxHeight control. ''' @@ -1768,7 +1768,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plImageMaxHeight As Global.System.Web.UI.UserControl - + ''' '''txtImageMaxHeight control. ''' @@ -1777,7 +1777,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents txtImageMaxHeight As Global.System.Web.UI.WebControls.TextBox - + ''' '''valImageMaxHeight control. ''' @@ -1786,7 +1786,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents valImageMaxHeight As Global.System.Web.UI.WebControls.RequiredFieldValidator - + ''' '''valImageMaxHeightIsNumber control. ''' @@ -1795,7 +1795,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents valImageMaxHeightIsNumber As Global.System.Web.UI.WebControls.CompareValidator - + ''' '''plThumbnailType control. ''' @@ -1804,7 +1804,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plThumbnailType As Global.System.Web.UI.UserControl - + ''' '''rdoThumbnailType control. ''' @@ -1813,7 +1813,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents rdoThumbnailType As Global.System.Web.UI.WebControls.RadioButtonList - + ''' '''plUseWatermark control. ''' @@ -1822,7 +1822,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plUseWatermark As Global.System.Web.UI.UserControl - + ''' '''chkUseWatermark control. ''' @@ -1831,7 +1831,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkUseWatermark As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plWatermarkText control. ''' @@ -1840,7 +1840,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plWatermarkText As Global.System.Web.UI.UserControl - + ''' '''txtWatermarkText control. ''' @@ -1849,7 +1849,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents txtWatermarkText As Global.System.Web.UI.WebControls.TextBox - + ''' '''plWatermarkImage control. ''' @@ -1858,7 +1858,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plWatermarkImage As Global.System.Web.UI.UserControl - + ''' '''ctlWatermarkImage control. ''' @@ -1866,8 +1866,8 @@ Namespace Ventrian.NewsArticles '''Auto-generated field. '''To modify move field declaration from designer file to code-behind file. ''' - Protected WithEvents ctlWatermarkImage As DotNetNuke.UI.UserControls.UrlControl - + Protected WithEvents ctlWatermarkImage As Global.System.Web.UI.UserControl + ''' '''plWatermarkPosition control. ''' @@ -1876,7 +1876,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plWatermarkPosition As Global.System.Web.UI.UserControl - + ''' '''drpWatermarkPosition control. ''' @@ -1885,7 +1885,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents drpWatermarkPosition As Global.System.Web.UI.WebControls.DropDownList - + ''' '''dshNotification control. ''' @@ -1894,7 +1894,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents dshNotification As Global.System.Web.UI.UserControl - + ''' '''tblNotification control. ''' @@ -1903,7 +1903,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents tblNotification As Global.System.Web.UI.HtmlControls.HtmlTable - + ''' '''plNotifySubmission control. ''' @@ -1912,7 +1912,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plNotifySubmission As Global.System.Web.UI.UserControl - + ''' '''chkNotifySubmission control. ''' @@ -1921,7 +1921,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkNotifySubmission As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plNotifySubmissionEmail control. ''' @@ -1930,7 +1930,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plNotifySubmissionEmail As Global.System.Web.UI.UserControl - + ''' '''txtSubmissionEmail control. ''' @@ -1939,7 +1939,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents txtSubmissionEmail As Global.System.Web.UI.WebControls.TextBox - + ''' '''plNotifyApproval control. ''' @@ -1948,7 +1948,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plNotifyApproval As Global.System.Web.UI.UserControl - + ''' '''chkNotifyApproval control. ''' @@ -1957,7 +1957,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkNotifyApproval As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plNotifyComment control. ''' @@ -1966,7 +1966,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plNotifyComment As Global.System.Web.UI.UserControl - + ''' '''chkNotifyComment control. ''' @@ -1975,7 +1975,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkNotifyComment As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plNotifyCommentEmail control. ''' @@ -1984,7 +1984,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plNotifyCommentEmail As Global.System.Web.UI.UserControl - + ''' '''txtNotifyCommentEmail control. ''' @@ -1993,7 +1993,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents txtNotifyCommentEmail As Global.System.Web.UI.WebControls.TextBox - + ''' '''plNotifyCommentApproval control. ''' @@ -2002,7 +2002,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plNotifyCommentApproval As Global.System.Web.UI.UserControl - + ''' '''chkNotifyCommentApproval control. ''' @@ -2011,7 +2011,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkNotifyCommentApproval As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plNotifyCommentApprovalEmail control. ''' @@ -2020,7 +2020,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plNotifyCommentApprovalEmail As Global.System.Web.UI.UserControl - + ''' '''txtNotifyCommentApprovalEmail control. ''' @@ -2029,7 +2029,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents txtNotifyCommentApprovalEmail As Global.System.Web.UI.WebControls.TextBox - + ''' '''dshRelated control. ''' @@ -2038,7 +2038,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents dshRelated As Global.System.Web.UI.UserControl - + ''' '''tblRelated control. ''' @@ -2047,7 +2047,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents tblRelated As Global.System.Web.UI.HtmlControls.HtmlTable - + ''' '''plRelatedMode control. ''' @@ -2056,7 +2056,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plRelatedMode As Global.System.Web.UI.UserControl - + ''' '''lstRelatedMode control. ''' @@ -2065,7 +2065,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents lstRelatedMode As Global.System.Web.UI.WebControls.RadioButtonList - + ''' '''dshSecurity control. ''' @@ -2074,7 +2074,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents dshSecurity As Global.System.Web.UI.UserControl - + ''' '''tblSecurity control. ''' @@ -2083,7 +2083,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents tblSecurity As Global.System.Web.UI.HtmlControls.HtmlTable - + ''' '''plRoleGroup control. ''' @@ -2092,7 +2092,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plRoleGroup As Global.System.Web.UI.UserControl - + ''' '''drpSecurityRoleGroups control. ''' @@ -2101,7 +2101,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents drpSecurityRoleGroups As Global.System.Web.UI.WebControls.DropDownList - + ''' '''plBasicSettings control. ''' @@ -2110,7 +2110,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plBasicSettings As Global.System.Web.UI.UserControl - + ''' '''grdBasicPermissions control. ''' @@ -2119,7 +2119,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents grdBasicPermissions As Global.System.Web.UI.WebControls.DataGrid - + ''' '''plSecureUrl control. ''' @@ -2128,7 +2128,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plSecureUrl As Global.System.Web.UI.UserControl - + ''' '''txtSecureUrl control. ''' @@ -2137,7 +2137,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents txtSecureUrl As Global.System.Web.UI.WebControls.TextBox - + ''' '''plFormSettings control. ''' @@ -2146,7 +2146,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plFormSettings As Global.System.Web.UI.UserControl - + ''' '''grdFormPermissions control. ''' @@ -2155,7 +2155,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents grdFormPermissions As Global.System.Web.UI.WebControls.DataGrid - + ''' '''lblFormSettingsHelp control. ''' @@ -2164,7 +2164,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents lblFormSettingsHelp As Global.System.Web.UI.WebControls.Label - + ''' '''trAdminSettings1 control. ''' @@ -2173,7 +2173,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents trAdminSettings1 As Global.System.Web.UI.HtmlControls.HtmlTableRow - + ''' '''plAdminSettings control. ''' @@ -2182,7 +2182,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plAdminSettings As Global.System.Web.UI.UserControl - + ''' '''trAdminSettings2 control. ''' @@ -2191,7 +2191,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents trAdminSettings2 As Global.System.Web.UI.HtmlControls.HtmlTableRow - + ''' '''grdAdminPermissions control. ''' @@ -2200,7 +2200,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents grdAdminPermissions As Global.System.Web.UI.WebControls.DataGrid - + ''' '''dshSEOSettings control. ''' @@ -2209,7 +2209,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents dshSEOSettings As Global.System.Web.UI.UserControl - + ''' '''tblSEO control. ''' @@ -2218,7 +2218,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents tblSEO As Global.System.Web.UI.HtmlControls.HtmlTable - + ''' '''plTitleReplacement control. ''' @@ -2227,7 +2227,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plTitleReplacement As Global.System.Web.UI.UserControl - + ''' '''lstTitleReplacement control. ''' @@ -2236,7 +2236,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents lstTitleReplacement As Global.System.Web.UI.WebControls.RadioButtonList - + ''' '''plAlwaysShowPageID control. ''' @@ -2245,7 +2245,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plAlwaysShowPageID As Global.System.Web.UI.UserControl - + ''' '''chkAlwaysShowPageID control. ''' @@ -2254,7 +2254,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkAlwaysShowPageID As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plUrlMode control. ''' @@ -2263,7 +2263,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plUrlMode As Global.System.Web.UI.UserControl - + ''' '''lstUrlMode control. ''' @@ -2272,7 +2272,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents lstUrlMode As Global.System.Web.UI.WebControls.RadioButtonList - + ''' '''plShorternID control. ''' @@ -2281,7 +2281,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plShorternID As Global.System.Web.UI.UserControl - + ''' '''txtShorternID control. ''' @@ -2290,7 +2290,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents txtShorternID As Global.System.Web.UI.WebControls.TextBox - + ''' '''valShorternID control. ''' @@ -2299,7 +2299,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents valShorternID As Global.System.Web.UI.WebControls.RequiredFieldValidator - + ''' '''plUseCanonicalLink control. ''' @@ -2308,7 +2308,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plUseCanonicalLink As Global.System.Web.UI.UserControl - + ''' '''chkUseCanonicalLink control. ''' @@ -2317,7 +2317,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkUseCanonicalLink As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plExpandMetaInformation control. ''' @@ -2326,7 +2326,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plExpandMetaInformation As Global.System.Web.UI.UserControl - + ''' '''chkExpandMetaInformation control. ''' @@ -2335,7 +2335,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkExpandMetaInformation As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plUniquePageTitles control. ''' @@ -2344,7 +2344,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plUniquePageTitles As Global.System.Web.UI.UserControl - + ''' '''chkUniquePageTitles control. ''' @@ -2353,7 +2353,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkUniquePageTitles As Global.System.Web.UI.WebControls.CheckBox - + ''' '''dshSyndicationSettings control. ''' @@ -2362,7 +2362,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents dshSyndicationSettings As Global.System.Web.UI.UserControl - + ''' '''tblSyndication control. ''' @@ -2371,7 +2371,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents tblSyndication As Global.System.Web.UI.HtmlControls.HtmlTable - + ''' '''plEnableSyndication control. ''' @@ -2380,7 +2380,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plEnableSyndication As Global.System.Web.UI.UserControl - + ''' '''chkEnableSyndication control. ''' @@ -2389,7 +2389,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkEnableSyndication As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plEnableSyndicationEnclosures control. ''' @@ -2398,7 +2398,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plEnableSyndicationEnclosures As Global.System.Web.UI.UserControl - + ''' '''chkEnableSyndicationEnclosures control. ''' @@ -2407,7 +2407,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkEnableSyndicationEnclosures As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plSyndicationEnclosureType control. ''' @@ -2416,7 +2416,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plSyndicationEnclosureType As Global.System.Web.UI.UserControl - + ''' '''lstSyndicationEnclosureType control. ''' @@ -2425,7 +2425,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents lstSyndicationEnclosureType As Global.System.Web.UI.WebControls.RadioButtonList - + ''' '''plEnableSyndicationHtml control. ''' @@ -2434,7 +2434,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plEnableSyndicationHtml As Global.System.Web.UI.UserControl - + ''' '''chkEnableSyndicationHtml control. ''' @@ -2443,7 +2443,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkEnableSyndicationHtml As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plSyndicationLinkMode control. ''' @@ -2452,7 +2452,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plSyndicationLinkMode As Global.System.Web.UI.UserControl - + ''' '''lstSyndicationLinkMode control. ''' @@ -2461,7 +2461,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents lstSyndicationLinkMode As Global.System.Web.UI.WebControls.RadioButtonList - + ''' '''plSyndicationSummaryLength control. ''' @@ -2470,7 +2470,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plSyndicationSummaryLength As Global.System.Web.UI.UserControl - + ''' '''txtSyndicationSummaryLength control. ''' @@ -2479,7 +2479,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents txtSyndicationSummaryLength As Global.System.Web.UI.WebControls.TextBox - + ''' '''valSyndicationSummaryLength control. ''' @@ -2488,7 +2488,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents valSyndicationSummaryLength As Global.System.Web.UI.WebControls.CompareValidator - + ''' '''lblSyndicationSummaryLengthHelp control. ''' @@ -2497,7 +2497,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents lblSyndicationSummaryLengthHelp As Global.System.Web.UI.WebControls.Label - + ''' '''plSyndicationMaxCount control. ''' @@ -2506,7 +2506,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plSyndicationMaxCount As Global.System.Web.UI.UserControl - + ''' '''txtSyndicationMaxCount control. ''' @@ -2515,7 +2515,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents txtSyndicationMaxCount As Global.System.Web.UI.WebControls.TextBox - + ''' '''valSyndicationMaxCount control. ''' @@ -2524,7 +2524,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents valSyndicationMaxCount As Global.System.Web.UI.WebControls.RequiredFieldValidator - + ''' '''valSyndicationMaxCountIsValid control. ''' @@ -2533,7 +2533,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents valSyndicationMaxCountIsValid As Global.System.Web.UI.WebControls.CompareValidator - + ''' '''plSyndicationImagePath control. ''' @@ -2542,7 +2542,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plSyndicationImagePath As Global.System.Web.UI.UserControl - + ''' '''txtSyndicationImagePath control. ''' @@ -2551,7 +2551,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents txtSyndicationImagePath As Global.System.Web.UI.WebControls.TextBox - + ''' '''dshTwitterSettings control. ''' @@ -2560,7 +2560,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents dshTwitterSettings As Global.System.Web.UI.UserControl - + ''' '''tblTwitter control. ''' @@ -2569,7 +2569,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents tblTwitter As Global.System.Web.UI.HtmlControls.HtmlTable - + ''' '''plTwitterName control. ''' @@ -2578,7 +2578,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plTwitterName As Global.System.Web.UI.UserControl - + ''' '''txtTwitterName control. ''' @@ -2587,7 +2587,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents txtTwitterName As Global.System.Web.UI.WebControls.TextBox - + ''' '''plBitLyLogin control. ''' @@ -2596,7 +2596,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plBitLyLogin As Global.System.Web.UI.UserControl - + ''' '''txtBitLyLogin control. ''' @@ -2605,7 +2605,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents txtBitLyLogin As Global.System.Web.UI.WebControls.TextBox - + ''' '''plBitLyAPIKey control. ''' @@ -2614,7 +2614,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plBitLyAPIKey As Global.System.Web.UI.UserControl - + ''' '''txtBitLyAPIKey control. ''' @@ -2623,7 +2623,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents txtBitLyAPIKey As Global.System.Web.UI.WebControls.TextBox - + ''' '''dsh3rdPartySettings control. ''' @@ -2632,7 +2632,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents dsh3rdPartySettings As Global.System.Web.UI.UserControl - + ''' '''tbl3rdParty control. ''' @@ -2641,7 +2641,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents tbl3rdParty As Global.System.Web.UI.HtmlControls.HtmlTable - + ''' '''plJournalIntegration control. ''' @@ -2650,7 +2650,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plJournalIntegration As Global.System.Web.UI.UserControl - + ''' '''chkJournalIntegration control. ''' @@ -2659,7 +2659,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkJournalIntegration As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plJournalIntegrationGroups control. ''' @@ -2668,7 +2668,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plJournalIntegrationGroups As Global.System.Web.UI.UserControl - + ''' '''chkJournalIntegrationGroups control. ''' @@ -2677,7 +2677,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkJournalIntegrationGroups As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plActiveSocial control. ''' @@ -2686,7 +2686,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plActiveSocial As Global.System.Web.UI.UserControl - + ''' '''chkActiveSocial control. ''' @@ -2695,7 +2695,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkActiveSocial As Global.System.Web.UI.WebControls.CheckBox - + ''' '''plActiveSocialSubmissionKey control. ''' @@ -2704,7 +2704,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plActiveSocialSubmissionKey As Global.System.Web.UI.UserControl - + ''' '''txtActiveSocialSubmissionKey control. ''' @@ -2713,7 +2713,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents txtActiveSocialSubmissionKey As Global.System.Web.UI.WebControls.TextBox - + ''' '''plActiveSocialRateKey control. ''' @@ -2722,7 +2722,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plActiveSocialRateKey As Global.System.Web.UI.UserControl - + ''' '''txtActiveSocialRateKey control. ''' @@ -2731,7 +2731,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents txtActiveSocialRateKey As Global.System.Web.UI.WebControls.TextBox - + ''' '''plActiveSocialCommentKey control. ''' @@ -2740,7 +2740,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plActiveSocialCommentKey As Global.System.Web.UI.UserControl - + ''' '''txtActiveSocialCommentKey control. ''' @@ -2749,7 +2749,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents txtActiveSocialCommentKey As Global.System.Web.UI.WebControls.TextBox - + ''' '''plSmartThinkerStoryFeed control. ''' @@ -2758,7 +2758,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents plSmartThinkerStoryFeed As Global.System.Web.UI.UserControl - + ''' '''chkSmartThinkerStoryFeed control. ''' @@ -2767,7 +2767,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkSmartThinkerStoryFeed As Global.System.Web.UI.WebControls.CheckBox - + ''' '''cmdUpdate control. ''' @@ -2776,7 +2776,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents cmdUpdate As Global.System.Web.UI.WebControls.LinkButton - + ''' '''cmdCancel control. ''' @@ -2785,7 +2785,7 @@ Namespace Ventrian.NewsArticles '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents cmdCancel As Global.System.Web.UI.WebControls.LinkButton - + ''' '''ucHeader2 control. ''' diff --git a/ucViewOptions.ascx.vb b/ucViewOptions.ascx.vb index 7dc5cb2..5c296ff 100755 --- a/ucViewOptions.ascx.vb +++ b/ucViewOptions.ascx.vb @@ -15,6 +15,8 @@ Imports DotNetNuke.Services.Localization Imports Ventrian.NewsArticles.Components.Types Imports DotNetNuke.Services.FileSystem Imports DotNetNuke.Entities.Portals +Imports DotNetNuke.Entities.Tabs +Imports DotNetNuke.Entities.Users Imports Ventrian.NewsArticles.Base @@ -290,7 +292,11 @@ Namespace Ventrian.NewsArticles Private Sub BindTimeZone() - DotNetNuke.Services.Localization.Localization.LoadTimeZoneDropDownList(drpTimeZone, BasePage.PageCulture.Name, Convert.ToString(PortalSettings.TimeZoneOffset)) + drpTimeZone.Items.Clear() + For Each tz As TimeZoneInfo In TimeZoneInfo.GetSystemTimeZones() + drpTimeZone.Items.Add(New ListItem(tz.DisplayName, tz.BaseUtcOffset.TotalMinutes)) + Next + 'DotNetNuke.Services.Localization.Localization.LoadTimeZoneDropDownList(drpTimeZone, BasePage.PageCulture.Name, Convert.ToString(PortalSettings.TimeZoneOffset)) End Sub @@ -1384,11 +1390,11 @@ Namespace Ventrian.NewsArticles Dim objRole As DotNetNuke.Security.Roles.RoleInfo = objRoleController.GetRoleByName(PortalSettings.PortalId, role) If Not (objRole Is Nothing) Then - Dim objUsers As ArrayList = objRoleController.GetUserRolesByRoleName(PortalSettings.PortalId, objRole.RoleName) - For Each objUser As DotNetNuke.Entities.Users.UserRoleInfo In objUsers + Dim objUsers As List(Of UserInfo) = RoleController.Instance.GetUsersByRole(PortalSettings.PortalId, objRole.RoleName) + For Each objUser As UserInfo In objUsers If (userIDs.Contains(objUser.UserID) = False) Then - Dim objUserController As DotNetNuke.Entities.Users.UserController = New DotNetNuke.Entities.Users.UserController - Dim objSelectedUser As DotNetNuke.Entities.Users.UserInfo = objUserController.GetUser(PortalSettings.PortalId, objUser.UserID) + Dim objUserController As UserController = New DotNetNuke.Entities.Users.UserController + Dim objSelectedUser As UserInfo = objUserController.GetUser(PortalSettings.PortalId, objUser.UserID) If Not (objSelectedUser Is Nothing) Then If (objSelectedUser.Email.Length > 0) Then userIDs.Add(objUser.UserID, objUser.UserID) @@ -1420,14 +1426,13 @@ Namespace Ventrian.NewsArticles If (objPortal.PortalID <> Me.PortalId) Then - Dim objDesktopModuleController As New DesktopModuleController - Dim objDesktopModuleInfo As DesktopModuleInfo = objDesktopModuleController.GetDesktopModuleByModuleName("DnnForge - NewsArticles") + Dim objDesktopModuleInfo As DesktopModuleInfo = DesktopModuleController.GetDesktopModuleByModuleName("DnnForge - NewsArticles", PortalSettings.PortalId) If Not (objDesktopModuleInfo Is Nothing) Then Dim objTabController As New DotNetNuke.Entities.Tabs.TabController() - Dim objTabs As ArrayList = objTabController.GetTabs(objPortal.PortalID) - For Each objTab As DotNetNuke.Entities.Tabs.TabInfo In objTabs + Dim objTabs As TabCollection = objTabController.GetTabsByPortal(objPortal.PortalID) + For Each objTab As DotNetNuke.Entities.Tabs.TabInfo In objTabs.Values If Not (objTab Is Nothing) Then If (objTab.IsDeleted = False) Then Dim objModules As New ModuleController