diff --git a/.gitignore b/.gitignore index 0881b8d..451e485 100644 --- a/.gitignore +++ b/.gitignore @@ -149,3 +149,9 @@ $RECYCLE.BIN/ # Mac crap .DS_Store +*.zip +*.dll +*.pdb +obj/Release/Connect.Modules.AccountRegistration.xml +obj/Release/Connect_AccountRegistration.vbproj.FileListAbsolute.txt +*.cache diff --git a/App_LocalResources/Settings.ascx.resx b/App_LocalResources/Settings.ascx.resx index d24b997..532c99a 100644 --- a/App_LocalResources/Settings.ascx.resx +++ b/App_LocalResources/Settings.ascx.resx @@ -198,4 +198,16 @@ External Interface + + Select the status of the role membership after submitting the form + + + Role status after submit: + + + Approved + + + Pending + \ No newline at end of file diff --git a/AssemblyInfo.vb b/AssemblyInfo.vb index d12f20c..dbbcc31 100644 --- a/AssemblyInfo.vb +++ b/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - - + + diff --git a/Connect_AccountRegistration.dnn b/Connect_AccountRegistration.dnn index ed88e57..ac35c76 100644 --- a/Connect_AccountRegistration.dnn +++ b/Connect_AccountRegistration.dnn @@ -1,6 +1,6 @@ - + Connect: AccountRegistration A community module that handles account registrations and login in DNN Images/icon_extensions.gif diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index f0f3efd..0101686 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -8,6 +8,22 @@

Release Notes

+

+ Version 01.02.00

+

+

Extended Token Support

+

Changes

+
    +
  • New conditional token: [IFSOCIALMEMBERSHIPPENDING:XXX]...[/IFSOCIALMEMBERSHIPPENDING:XXX] renders everything in between the tokens if the current user is in the specified XXX social group and the group membership is pending.
    • +
  • New conditional token: [IFSOCIALMEMBERSHIPAPPROVED:XXX]...[/IFSOCIALMEMBERSHIPAPPROVED:XXX] renders everything in between the tokens if the current user is in the specified XXX social group and the group membership is pending.
    • +
  • New conditional token: [IFSOCIALMEMBERSHIPNONE:XXX]...[/IFSOCIALMEMBERSHIPNONE:XXX] renders everything in between the tokens if the current user is not yet in the specified XXX social group and also has not applied yet for becoming a member.
    • +
  • New conditional token: [IFISINROLE:XXX]...[/IFISINROLE:XXX] renders everything in between the tokens if the current user is in the specified XXX role.
    • +
  • New conditional token: [IFNOTISINROLE:XXX]...[/IFNOTISINROLE:XXX] renders everything in between the tokens if the current user is not in the specified XXX role.
    • +
  • New control token: [CTL:ROLEMEMBERSHP:XXX] renders a checkbox that - once checked - will add the user account to the specified XXX role.
    • +
  • New control token: [CTL:ROLEMEMBERSHP:XXX:Pending] will do the same but will rather make the role membership pending.
    • +
  • New Setting: When adding users to a role through the modulesettings you can now set the status of that role membership
    • +
+

Version 01.00.01

diff --git a/Resources.zip b/Resources.zip index ec29b8e..6e5275a 100644 Binary files a/Resources.zip and b/Resources.zip differ diff --git a/Settings.ascx b/Settings.ascx index 8bd4ba7..3c4a968 100644 --- a/Settings.ascx +++ b/Settings.ascx @@ -40,6 +40,14 @@
+
+ + + + + +
+
diff --git a/Settings.ascx.designer.vb b/Settings.ascx.designer.vb index e684fad..322d6d8 100644 --- a/Settings.ascx.designer.vb +++ b/Settings.ascx.designer.vb @@ -104,6 +104,24 @@ Namespace Connect.Modules.UserManagement.AccountRegistration ''' Protected WithEvents drpAddToRole As Global.System.Web.UI.WebControls.DropDownList + ''' + '''lblAddToRoleStatus control. + ''' + ''' + '''Auto-generated field. + '''To modify move field declaration from designer file to code-behind file. + ''' + Protected WithEvents lblAddToRoleStatus As Global.DotNetNuke.UI.UserControls.LabelControl + + ''' + '''drpRoleStatus control. + ''' + ''' + '''Auto-generated field. + '''To modify move field declaration from designer file to code-behind file. + ''' + Protected WithEvents drpRoleStatus As Global.System.Web.UI.WebControls.DropDownList + ''' '''lblNotifyRole control. ''' diff --git a/Settings.ascx.vb b/Settings.ascx.vb index 2868b98..6467c5f 100644 --- a/Settings.ascx.vb +++ b/Settings.ascx.vb @@ -25,6 +25,7 @@ Namespace Connect.Modules.UserManagement.AccountRegistration If (Settings.Contains("AddToRoleOnSubmit")) Then drpAddToRole.SelectedValue = Settings("AddToRoleOnSubmit").ToString() If (Settings.Contains("NotifyRole")) Then drpNotifyRole.Items.FindByText(Settings("NotifyRole").ToString()).Selected = True If (Settings.Contains("NotifyUser")) Then chkNotifyUser.Checked = CType(Settings("NotifyUser"), Boolean) + If (Settings.Contains("AddToRoleStatus")) Then drpRoleStatus.SelectedValue = CType(Settings("AddToRoleStatus"), String) End If Catch exc As Exception 'Module failed to load @@ -45,6 +46,7 @@ Namespace Connect.Modules.UserManagement.AccountRegistration 'we need the rolename for sending mails to users, therefor store here the rolename rather than the id! objModules.UpdateTabModuleSetting(TabModuleId, "NotifyRole", drpNotifyRole.SelectedItem.Text) objModules.UpdateTabModuleSetting(TabModuleId, "NotifyUser", chkNotifyUser.Checked.ToString) + objModules.UpdateTabModuleSetting(TabModuleId, "AddToRoleStatus", drpRoleStatus.SelectedValue) Catch exc As Exception 'Module failed to load ProcessModuleLoadException(Me, exc) diff --git a/View.ascx.vb b/View.ascx.vb index c5c7472..ba43adf 100644 --- a/View.ascx.vb +++ b/View.ascx.vb @@ -570,8 +570,7 @@ Namespace Connect.Modules.UserManagement.AccountRegistration strAdminBody = strAdminBody.Replace("[REGISTRATIONMODE]", Localization.GetString("RegistrationMode_Public.Text", LocalResourceFile)) End If - strAdminBody = strAdminBody.Replace("[USERURL]", NavigateURL(UsermanagementTab, "", "uid=" & oUser.UserID.ToString)) - + strAdminBody = strAdminBody.Replace("[USERURL]", NavigateURL(UsermanagementTab, "", "uid=" & oUser.UserID.ToString, "RoleId=" & PortalSettings.RegisteredRoleId.ToString)) Dim ctrlRoles As New RoleController @@ -639,7 +638,11 @@ Namespace Connect.Modules.UserManagement.AccountRegistration If AddToRoleOnSubmit <> Null.NullInteger Then Try Dim rc As New RoleController - rc.AddUserRole(PortalId, oUser.UserID, AddToRoleOnSubmit, Null.NullDate) + If AddToRoleStatus.ToLower = "pending" Then + rc.AddUserRole(PortalId, oUser.UserID, AddToRoleOnSubmit, RoleStatus.Pending, False, Date.Now, Null.NullDate) + Else + rc.AddUserRole(PortalId, oUser.UserID, AddToRoleOnSubmit, RoleStatus.Approved, False, Date.Now, Null.NullDate) + End If Catch End Try End If diff --git a/obj/Release/Connect.Modules.AccountRegistration.dll b/obj/Release/Connect.Modules.AccountRegistration.dll index 44a12e8..53acda8 100644 Binary files a/obj/Release/Connect.Modules.AccountRegistration.dll and b/obj/Release/Connect.Modules.AccountRegistration.dll differ diff --git a/obj/Release/Connect.Modules.AccountRegistration.pdb b/obj/Release/Connect.Modules.AccountRegistration.pdb index f49815d..381ffb1 100644 Binary files a/obj/Release/Connect.Modules.AccountRegistration.pdb and b/obj/Release/Connect.Modules.AccountRegistration.pdb differ diff --git a/obj/Release/Connect.Modules.AccountRegistration.xml b/obj/Release/Connect.Modules.AccountRegistration.xml index 4c5f0f5..2cfa7a3 100644 --- a/obj/Release/Connect.Modules.AccountRegistration.xml +++ b/obj/Release/Connect.Modules.AccountRegistration.xml @@ -46,313 +46,345 @@ plhRegister control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -plTheme control. +lblUsernameMode control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -drpThemes control. +drpUsernameMode control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -cmdCopySelected control. +lblDisplaynameMode control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -cmdDeleteSelected control. +drpDisplaynameMode control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -pnlLocales control. +lblRedirectAfterSubmit control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -plLocale control. +drpRedirectAfterSubmit control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -drpLocales control. +lblUsermanagementTab control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -plUseTheme control. +drpUserManagementTab control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -chkUseTheme control. +lblAddToRole control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -pnlTemplateName control. +drpAddToRole control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -plTemplateName control. +lblAddToRoleStatus control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -txtTemplateName control. +drpRoleStatus control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -RegisterTemplatesTabs control. +lblNotifyRole control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -lblFormTemplate control. +drpNotifyRole control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -lblEmailUser control. +lblNotifyUser control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -lblEmailUserPrivate control. +chkNotifyUser control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -lblEmailUserVerified control. +lblInterface control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -lblEmailAdminTemplate control. +txtInterface control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -txtFormTemplate control. +plTheme control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -txtEmailUser control. +drpThemes control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -txtEmailUserPrivate control. +cmdCopySelected control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -txtEmailUserVerified control. +cmdDeleteSelected control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -txtEmailAdminTemplate control. +pnlLocales control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -cmdUpdateSettings control. +plLocale control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -cmdCancel control. +drpLocales control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -lblUsernameMode control. +plUseTheme control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -drpUsernameMode control. +chkUseTheme control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -lblDisplaynameMode control. +pnlTemplateName control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -drpDisplaynameMode control. +plTemplateName control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -lblRedirectAfterSubmit control. +txtTemplateName control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -drpRedirectAfterSubmit control. +RegisterTemplatesTabs control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -lblUsermanagementTab control. +lblFormTemplate control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -drpUserManagementTab control. +lblEmailUser control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -lblAddToRole control. +lblEmailUserPrivate control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -drpAddToRole control. +lblEmailUserVerified control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -lblNotifyRole control. +lblEmailAdminTemplate control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -drpNotifyRole control. +txtFormTemplate control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -lblNotifyUser control. +txtEmailUser control. Auto-generated field. To modify move field declaration from designer file to code-behind file. - + -chkNotifyUser control. +txtEmailUserPrivate control. + + +Auto-generated field. +To modify move field declaration from designer file to code-behind file. + + + +txtEmailUserVerified control. + + +Auto-generated field. +To modify move field declaration from designer file to code-behind file. + + + +txtEmailAdminTemplate control. + + +Auto-generated field. +To modify move field declaration from designer file to code-behind file. + + + +cmdUpdateSettings control. + + +Auto-generated field. +To modify move field declaration from designer file to code-behind file. + + + +cmdCancel control. Auto-generated field. diff --git a/obj/Release/Connect_AccountRegistration.vbproj.FileListAbsolute.txt b/obj/Release/Connect_AccountRegistration.vbproj.FileListAbsolute.txt index 97574ec..82f6d3a 100644 --- a/obj/Release/Connect_AccountRegistration.vbproj.FileListAbsolute.txt +++ b/obj/Release/Connect_AccountRegistration.vbproj.FileListAbsolute.txt @@ -5,3 +5,10 @@ D:\Development\Websites\dev_DNN7\website\DesktopModules\Connect\AccountRegistrat D:\Development\Websites\dev_DNN7\website\DesktopModules\Connect\AccountRegistration\obj\Release\Connect.Modules.AccountRegistration.dll D:\Development\Websites\dev_DNN7\website\DesktopModules\Connect\AccountRegistration\obj\Release\Connect.Modules.AccountRegistration.xml D:\Development\Websites\dev_DNN7\website\DesktopModules\Connect\AccountRegistration\obj\Release\Connect.Modules.AccountRegistration.pdb +D:\Development\Websites\dev_DNNConnect\wwwRoot\bin\Connect.Modules.AccountRegistration.dll +D:\Development\Websites\dev_DNNConnect\wwwRoot\bin\Connect.Modules.AccountRegistration.pdb +D:\Development\Websites\dev_DNNConnect\wwwRoot\bin\Connect.Modules.AccountRegistration.xml +D:\Development\Websites\dev_DNNConnect\wwwRoot\DesktopModules\Connect\AccountRegistration\obj\Release\Connect_AccountRegistration.vbprojResolveAssemblyReference.cache +D:\Development\Websites\dev_DNNConnect\wwwRoot\DesktopModules\Connect\AccountRegistration\obj\Release\Connect.Modules.AccountRegistration.dll +D:\Development\Websites\dev_DNNConnect\wwwRoot\DesktopModules\Connect\AccountRegistration\obj\Release\Connect.Modules.AccountRegistration.xml +D:\Development\Websites\dev_DNNConnect\wwwRoot\DesktopModules\Connect\AccountRegistration\obj\Release\Connect.Modules.AccountRegistration.pdb diff --git a/obj/Release/Connect_AccountRegistration.vbprojResolveAssemblyReference.cache b/obj/Release/Connect_AccountRegistration.vbprojResolveAssemblyReference.cache index 48acd22..54b85a1 100644 Binary files a/obj/Release/Connect_AccountRegistration.vbprojResolveAssemblyReference.cache and b/obj/Release/Connect_AccountRegistration.vbprojResolveAssemblyReference.cache differ diff --git a/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index 913599f..970238e 100644 Binary files a/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/packages/Connect_AccountRegistration_01.00.01_Install.zip b/packages/Connect_AccountRegistration_01.00.01_Install.zip index d769c75..c01a71a 100644 Binary files a/packages/Connect_AccountRegistration_01.00.01_Install.zip and b/packages/Connect_AccountRegistration_01.00.01_Install.zip differ diff --git a/packages/Connect_AccountRegistration_01.00.01_Source.zip b/packages/Connect_AccountRegistration_01.00.01_Source.zip index 008485c..3916765 100644 Binary files a/packages/Connect_AccountRegistration_01.00.01_Source.zip and b/packages/Connect_AccountRegistration_01.00.01_Source.zip differ