Skip to content
This repository has been archived by the owner on Feb 12, 2018. It is now read-only.

Commit

Permalink
License Changes
Browse files Browse the repository at this point in the history
Move from BSD to GPLv2
  • Loading branch information
peppertree committed Jul 9, 2014
1 parent 53b4dde commit bbaee05
Show file tree
Hide file tree
Showing 19 changed files with 995 additions and 34 deletions.
4 changes: 2 additions & 2 deletions AssemblyInfo.vb
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("01.02.00")>
<Assembly: AssemblyFileVersion("01.02.00")>
<Assembly: AssemblyVersion("01.02.01")>
<Assembly: AssemblyFileVersion("01.02.01")>
2 changes: 1 addition & 1 deletion Connect_AccountRegistration.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="Connect AccountRegistrationForm" type="Module" version="01.02.01">
<package name="Connect AccountRegistrationForm" type="Module" version="01.02.02">
<friendlyName>Connect: AccountRegistration</friendlyName>
<description>A community module that handles account registrations and login in DNN</description>
<iconFile>Images/icon_extensions.gif</iconFile>
Expand Down
10 changes: 5 additions & 5 deletions Connect_AccountRegistration.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,11 @@
<None Include="BuildScripts\MSBuild.Community.Tasks.Targets" />
<None Include="Connect_AccountRegistration.dnn" />
<Content Include="Templates.ascx" />
<Content Include="Templates\Default - Copy\Email.Admin.txt" />
<Content Include="Templates\Default - Copy\Email.User.Private.txt" />
<Content Include="Templates\Default - Copy\Email.User.txt" />
<Content Include="Templates\Default - Copy\Email.User.Verified.txt" />
<Content Include="Templates\Default - Copy\Form.txt" />
<Content Include="Templates\Connect\Email.Admin.txt" />
<Content Include="Templates\Connect\Email.User.Private.txt" />
<Content Include="Templates\Connect\Email.User.txt" />
<Content Include="Templates\Connect\Email.User.Verified.txt" />
<Content Include="Templates\Connect\Form.txt" />
<Content Include="Templates\Default\Email.Admin.txt" />
<Content Include="Templates\Default\Email.User.Private.txt" />
<Content Include="Templates\Default\Email.User.txt" />
Expand Down
655 changes: 636 additions & 19 deletions License.txt

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions ReleaseNotes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@
<div class="License">
<h3>Release Notes</h3>

<p class="Owner">
<b>Version 01.02.02</b><br /><br />
</p>
<p>Minor Release</p>
<ul>
<li>Moved license from BSD to GPLv2</li>
</ul>

<p class="Owner">
<b>Version 01.02.01</b><br /><br />
</p>
Expand Down
Binary file modified Resources.zip
Binary file not shown.
22 changes: 21 additions & 1 deletion Settings.ascx.vb
Original file line number Diff line number Diff line change
@@ -1,4 +1,24 @@

'***********************************************************************************
' Connect UsersLibrary
'
' Copyright (C) 2013-2014 DNN-Connect Association, Philipp Becker
' http://dnn-connect.org
'
' This program is free software; you can redistribute it and/or
' modify it under the terms of the GNU General Public License
' as published by the Free Software Foundation; either version 2
' of the License, or (at your option) any later version.
'
' This program is distributed in the hope that it will be useful,
' but WITHOUT ANY WARRANTY; without even the implied warranty of
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
' GNU General Public License for more details.
'
' You should have received a copy of the GNU General Public License
' along with this program; if not, write to the Free Software
' Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
'
'***********************************************************************************
Imports DotNetNuke
Imports DotNetNuke.Services.Exceptions
Imports DotNetNuke.Entities.Tabs
Expand Down
21 changes: 21 additions & 0 deletions Templates.ascx.vb
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
'***********************************************************************************
' Connect UsersLibrary
'
' Copyright (C) 2013-2014 DNN-Connect Association, Philipp Becker
' http://dnn-connect.org
'
' This program is free software; you can redistribute it and/or
' modify it under the terms of the GNU General Public License
' as published by the Free Software Foundation; either version 2
' of the License, or (at your option) any later version.
'
' This program is distributed in the hope that it will be useful,
' but WITHOUT ANY WARRANTY; without even the implied warranty of
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
' GNU General Public License for more details.
'
' You should have received a copy of the GNU General Public License
' along with this program; if not, write to the Free Software
' Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
'
'***********************************************************************************
Imports DotNetNuke.Entities.Modules
Imports Connect.Libraries.UserManagement
Imports DotNetNuke.Entities.Users
Expand Down
24 changes: 24 additions & 0 deletions Templates/Connect/Email.Admin.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@

<p>A user has registered an account on the website <a href="[PORTALURL]"><strong>[PORTALNAME]</strong></a>.</p>
<p>The registration mode of the portal is set to <strong><i>[REGISTRATIONMODE]</i></strong>, so the following action is necessary:</p>
<ul>
<li>[ADMINACTION]</li>
</ul>
<h2>Details about the account</h2>
<table>
<tr>
<td>Username:</td><td>[USERNAME]</td>
</tr>
<tr>
<td>Name:</td><td>[FIRSTNAME] [LASTNAME]</td>
</tr>
<tr>
<td>E-Mail Adress:</td><td>[EMAIL]</td>
</tr>
</table>

<div style="margin-top: 20px;padding: 20px;border: 1px dashed #ccc;background-color: #eee;">
<a href="[USERURL]">Click to manage Account</a>
</div>


29 changes: 29 additions & 0 deletions Templates/Connect/Email.User.Private.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@

<p>Dear [DISPLAYNAME],</p>
<p>your user account on the website <strong>[PORTALNAME]</strong> has been created succesfully. In order to log on to your account you will have to wait until we have verified your account details and activate your account. This may take up to 24 hours and you will receive another notification e-mail as soon as this process has been finished.</p>

<p>For now it is already adviseable to keep your registration details in a safe place in case you need it one day.</p>

<h2>Details about your account</h2>

<table>
<tr>
<td>Username:</td><td>[USERNAME]</td>
</tr>
<tr>
<td>Password:</td><td>[PASSWORD]</td>
</tr>
<tr>
<td>E-Mail Adress:</td><td>[EMAIL]</td>
</tr>
</table>

<p style="padding-top:20px;">
Once we have activated your account you can use the following link to manage your account details:
</p>

<div style="margin-top: 20px;padding: 20px;border: 1px dashed #ccc;background-color: #eee;">
<a href="[USERURL]">Click to manage Account</a>
</div>


36 changes: 36 additions & 0 deletions Templates/Connect/Email.User.Verified.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
This is the default template:

<p>Dear [DISPLAYNAME],</p>
<p>your user account on the website <strong>[PORTALNAME]</strong> has been created succesfully. To finalize the activation of the account we require you to verify your e-mail address. This is to prevent automated systems to register accounts on our website and we're trying to make that last step as easy as possible for you. Simply click on the link below and your account will be activated instantly. In case you will be asked of a verification code while logging on to the website you can also enter the key provided below.</p>

<div style="margin-top: 20px;padding: 20px;border: 1px dashed #ccc;background-color: #eee;">
<a href="[VERIFYURL]">Click to activate Account</a>
</div>

<p>It is adviseable to keep your registration details in a safe place in case you need it one day.</p>

<h2>Details about your account</h2>
<table>
<tr>
<td>Username:</td><td>[USERNAME]</td>
</tr>
<tr>
<td>Password:</td><td>[PASSWORD]</td>
</tr>
<tr>
<td>Verification Code:</td><td>[VERIFICATIONCODE]</td>
</tr>
<tr>
<td>E-Mail Adress:</td><td>[EMAIL]</td>
</tr>
</table>

<p style="padding-top:20px;">
Once your account is activated you can use the following link to manage your account details:
</p>

<div style="margin-top: 20px;padding: 20px;border: 1px dashed #ccc;background-color: #eee;">
<a href="[USERURL]">Click to manage Account</a>
</div>


28 changes: 28 additions & 0 deletions Templates/Connect/Email.User.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@

<p>Dear [DISPLAYNAME],</p>
<p>your user account on the website <strong>[PORTALNAME]</strong> has been created succesfully.</p>
<p>It is adviseable to keep your registration details in a safe place in case you need it one day.</p>

<h2>Details about your account</h2>
<table>
<tr>
<td>Username:</td><td>[USERNAME]</td>
</tr>
<tr>
<td>Password:</td><td>[PASSWORD]</td>
</tr>
<tr>
<td>E-Mail Adress:</td><td>[EMAIL]</td>
</tr>
</table>

<div style="margin-top: 20px;padding: 20px;border: 1px dashed #ccc;background-color: #eee;">
<a href="[USERURL]">Click to manage Account</a>
</div>

<p style="padding-top: 20px;">
Best wishes,<br />the team from [PORTALNAME]
</p>
<p>
[PORTALURL]
</p>
101 changes: 101 additions & 0 deletions Templates/Connect/Form.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
<div id="ConnectRegisterForm" class="dnnForm dnnClear">

<ul id="ConnectRegisterFormTabs" runat="Server" class="dnnAdminTabNav dnnClear">
<li><a href="#dvFormTemplate" class="connect_RegisterTabLink">[RESX:LOGIN:CreateAccountTab]</a></li>
<li><a href="#dvLoginTemplate" class="connect_LoginTabLink">[RESX:LOGIN:LoginTab]</a></li>
</ul>

<div id="dvFormTemplate" class="connect_register">

<div class="dnnFormItem dnnClear">
[DNNLBL:USER:Username:HideRequired]
[CTL:USER:Username]
[REQUIRED:USER:Username]
</div>

<div class="dnnFormItem dnnClear">
[DNNLBL:USER:Email:HideRequired]
[CTL:USER:Email]
[REQUIRED:USER:Email]
</div>

<div class="dnnFormItem dnnClear">
[DNNLBL:USER:Firstname:HideRequired]
[CTL:USER:Firstname]
[REQUIRED:USER:Firstname]
</div>

<div class="dnnFormItem dnnClear">
[DNNLBL:USER:Lastname:HideRequired]
[CTL:USER:Lastname]
[REQUIRED:USER:Lastname]
</div>

<div class="dnnFormItem dnnClear">
[DNNLBL:USER:Password1:HideRequired]
[CTL:USER:Password1]
[REQUIRED:USER:Password1]
</div>

<div class="dnnFormItem dnnClear">
[DNNLBL:USER:Password2:HideRequired]
[CTL:USER:Password2]
[REQUIRED:USER:Password2]
</div>

<ul class="dnnActions">
<li>[CTL:UPDATEBUTTON:CreateAccount]</li>
</ul>

</div>

<div id="dvLoginTemplate" class="connect_login">


<div class="dnnFormItem dnnClear">
[DNNLBL:LOGIN:Username]
[CTL:LOGIN:Username]
</div>

<div class="dnnFormItem dnnClear">
[DNNLBL:LOGIN:Password]
[CTL:LOGIN:Password]
</div>

<div class="dnnFormItem dnnClear">
[DNNLBL:LOGIN:Remember]
[CTL:LOGIN:Remember]
</div>

<ul class="dnnActions">
<li>[CTL:LOGINBUTTON:Login]</li>
<li>[CTL:LOSTPASSWORDBUTTON:LostPassword]</li>
</ul>


</div>
</div>

<script language="javascript" type="text/javascript">
/*globals jQuery, window, Sys */
(function ($, Sys) {

function setupFormSettings() {
$('#ConnectRegisterForm').dnnTabs();
$('.connect_LoginTabLink').click(function () {
$('#dvLoginTemplate > input.dnnPrimaryAction').focus();
});
$('.connect_RegisterTabLink').click(function () {
$('#dvFormTemplate > input.dnnPrimaryAction').focus();
});
}

$(document).ready(function () {
setupFormSettings();
Sys.WebForms.PageRequestManager.getInstance().add_endRequest(function () {
setupFormSettings();
});
});

} (jQuery, window.Sys));
</script>
21 changes: 21 additions & 0 deletions View.ascx.vb
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
'***********************************************************************************
' Connect UsersLibrary
'
' Copyright (C) 2013-2014 DNN-Connect Association, Philipp Becker
' http://dnn-connect.org
'
' This program is free software; you can redistribute it and/or
' modify it under the terms of the GNU General Public License
' as published by the Free Software Foundation; either version 2
' of the License, or (at your option) any later version.
'
' This program is distributed in the hope that it will be useful,
' but WITHOUT ANY WARRANTY; without even the implied warranty of
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
' GNU General Public License for more details.
'
' You should have received a copy of the GNU General Public License
' along with this program; if not, write to the Free Software
' Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
'
'***********************************************************************************
Imports DotNetNuke.Entities.Modules
Imports Connect.Libraries.UserManagement
Imports DotNetNuke.Entities.Users
Expand Down
Binary file modified obj/Release/Connect.Modules.AccountRegistration.dll
Binary file not shown.
Binary file modified obj/Release/Connect.Modules.AccountRegistration.pdb
Binary file not shown.
Loading

0 comments on commit bbaee05

Please sign in to comment.