diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0881b8d --- /dev/null +++ b/.gitignore @@ -0,0 +1,151 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. + +# User-specific files +*.suo +*.user +*.sln.docstates + +# Build results + +[Dd]ebug/ +[Rr]elease/ +x64/ +build/ +[Bb]in/ +[Oo]bj/ + +# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets +!packages/*/build/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +*_i.c +*_p.c +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.log +*.scc + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opensdf +*.sdf +*.cachefile + +# Visual Studio profiler +*.psess +*.vsp +*.vspx + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# NCrunch +*.ncrunch* +.*crunch*.local.xml + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.Publish.xml +*.pubxml + +# NuGet Packages Directory +## TODO: If you have NuGet Package Restore enabled, uncomment the next line +#packages/ + +# Windows Azure Build Output +csx +*.build.csdef + +# Windows Store app package directory +AppPackages/ + +# Others +sql/ +*.Cache +ClientBin/ +[Ss]tyle[Cc]op.* +~$* +*~ +*.dbmdl +*.[Pp]ublish.xml +*.pfx +*.publishsettings + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file to a newer +# Visual Studio version. Backup files are not needed, because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm + +# SQL Server files +App_Data/*.mdf +App_Data/*.ldf + +# ========================= +# Windows detritus +# ========================= + +# Windows image file caches +Thumbs.db +ehthumbs.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Mac crap +.DS_Store diff --git a/App_LocalResources/Settings.ascx.resx b/App_LocalResources/Settings.ascx.resx index 253cd63..d24b997 100644 --- a/App_LocalResources/Settings.ascx.resx +++ b/App_LocalResources/Settings.ascx.resx @@ -192,4 +192,10 @@ Create from Lastname + + Enter the external interface qualifier. See <a href="https://github.com/DNN-Connect/UserAccountRegistration/wiki/External-Interfaces" target="_blank">this article</a> on how to do that and how it can help you. + + + External Interface + \ No newline at end of file diff --git a/AssemblyInfo.vb b/AssemblyInfo.vb index 60f6adc..d12f20c 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 4ef6535..ed88e57 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 @@ -14,7 +14,7 @@ - 07.01.00 + 07.02.01 diff --git a/Connect_AccountRegistration.vbproj b/Connect_AccountRegistration.vbproj index 48fbda1..46f43fa 100644 --- a/Connect_AccountRegistration.vbproj +++ b/Connect_AccountRegistration.vbproj @@ -139,6 +139,11 @@ + + + + + diff --git a/Settings.ascx b/Settings.ascx index e407a6c..8bd4ba7 100644 --- a/Settings.ascx +++ b/Settings.ascx @@ -48,4 +48,9 @@
+
+ +
+ +
\ No newline at end of file diff --git a/Settings.ascx.designer.vb b/Settings.ascx.designer.vb index 0803ecd..e684fad 100644 --- a/Settings.ascx.designer.vb +++ b/Settings.ascx.designer.vb @@ -139,5 +139,23 @@ Namespace Connect.Modules.UserManagement.AccountRegistration '''To modify move field declaration from designer file to code-behind file. ''' Protected WithEvents chkNotifyUser As Global.System.Web.UI.WebControls.CheckBox + + ''' + '''lblInterface control. + ''' + ''' + '''Auto-generated field. + '''To modify move field declaration from designer file to code-behind file. + ''' + Protected WithEvents lblInterface As Global.DotNetNuke.UI.UserControls.LabelControl + + ''' + '''txtInterface control. + ''' + ''' + '''Auto-generated field. + '''To modify move field declaration from designer file to code-behind file. + ''' + Protected WithEvents txtInterface As Global.System.Web.UI.WebControls.TextBox End Class End Namespace diff --git a/Settings.ascx.vb b/Settings.ascx.vb index a2cccc7..2868b98 100644 --- a/Settings.ascx.vb +++ b/Settings.ascx.vb @@ -17,6 +17,7 @@ Namespace Connect.Modules.UserManagement.AccountRegistration BindPages() BindRoles() + If (Settings.Contains("ExternalInterface")) Then txtInterface.Text = Settings("ExternalInterface").ToString() If (Settings.Contains("ShowUserName")) Then drpUsernameMode.SelectedValue = Settings("ShowUserName").ToString() If (Settings.Contains("ShowDisplayName")) Then drpDisplaynameMode.SelectedValue = Settings("ShowDisplayName").ToString() If (Settings.Contains("RedirectAfterSubmit")) Then drpRedirectAfterSubmit.SelectedValue = Settings("RedirectAfterSubmit").ToString() @@ -35,7 +36,7 @@ Namespace Connect.Modules.UserManagement.AccountRegistration Try Dim objModules As New Entities.Modules.ModuleController - + objModules.UpdateTabModuleSetting(TabModuleId, "ExternalInterface", txtInterface.Text) objModules.UpdateTabModuleSetting(TabModuleId, "ShowUserName", drpUsernameMode.SelectedValue) objModules.UpdateTabModuleSetting(TabModuleId, "ShowDisplayName", drpDisplaynameMode.SelectedValue) objModules.UpdateTabModuleSetting(TabModuleId, "RedirectAfterSubmit", drpRedirectAfterSubmit.SelectedValue) diff --git a/Templates.ascx.vb b/Templates.ascx.vb index 2a94eb4..d71612f 100644 --- a/Templates.ascx.vb +++ b/Templates.ascx.vb @@ -8,6 +8,7 @@ Imports DotNetNuke.Entities.Profile Imports DotNetNuke.UI.Skins.Controls Imports DotNetNuke.Services.Localization Imports DotNetNuke.Common.Globals +Imports DotNetNuke.Framework.JavaScriptLibraries Namespace Connect.Modules.UserManagement.AccountRegistration @@ -17,7 +18,7 @@ Namespace Connect.Modules.UserManagement.AccountRegistration Private Sub Page_Init(sender As Object, e As System.EventArgs) Handles Me.Init - DotNetNuke.Framework.jQuery.RequestDnnPluginsRegistration() + JavaScript.RequestRegistration(CommonJs.DnnPlugins) End Sub diff --git a/View.ascx.vb b/View.ascx.vb index 7374c14..68ae4b9 100644 --- a/View.ascx.vb +++ b/View.ascx.vb @@ -118,7 +118,6 @@ Namespace Connect.Modules.UserManagement.AccountRegistration Private Sub Register() - pnlSuccess.Visible = False pnlError.Visible = False @@ -659,6 +658,23 @@ Namespace Connect.Modules.UserManagement.AccountRegistration lblSucess.Text = "
  • " & String.Format(Localization.GetString("RegisterSuccess", LocalResourceFile), NavigateURL(PortalSettings.HomeTabId)) & "
" pnlSuccess.Visible = True + + If ExternalInterface <> Null.NullString Then + + Dim objInterface As Object = Nothing + + If ExternalInterface.Contains(",") Then + Dim strAssembly As String = ExternalInterface.Split(Char.Parse(","))(0).Trim + Dim strClass As String = ExternalInterface.Split(Char.Parse(","))(1).Trim + objInterface = System.Activator.CreateInstance(strAssembly, strClass).Unwrap + End If + + If Not objInterface Is Nothing Then + CType(objInterface, Interfaces.iAccountRegistration).FinalizeAccountRegistration(Server, Response, Request, oUser) + End If + + End If + If Not Request.QueryString("ReturnURL") Is Nothing Then Response.Redirect(Server.UrlDecode(Request.QueryString("ReturnURL")), True) End If