From efb0109465ef30cf05d7eb8c1c558d3d793b798c Mon Sep 17 00:00:00 2001
From: Doug Bell <doug@plainblack.com>
Date: Fri, 16 Feb 2007 16:53:50 +0000
Subject: [PATCH] fix: Creating users with same e-mail address doesn't work

---
 docs/changelog/7.x.x.txt                      |  1 +
 .../auth-webgui-createAccount.tmpl            | 59 +++++++++++++++++++
 lib/WebGUI/Auth/WebGUI.pm                     |  4 +-
 lib/WebGUI/i18n/English/WebGUI.pm             |  3 +-
 4 files changed, 64 insertions(+), 3 deletions(-)
 create mode 100644 docs/upgrades/templates-7.3.10/auth-webgui-createAccount.tmpl

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 6d26a6f6c..b4c76cc5c 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -8,6 +8,7 @@
    earlier than 7.3.8.
  - fix: Rich Text Editor - Add Asset Tree Link doesn't work with images
  - fix: Calendar Next / Previous when startTime was involved (Jukka Raimovaara / Axxion Oy)
+ - fix: Creating users with same e-mail address doesn't work.
 
 7.3.9
  - fix: SQL Form and big table imports
diff --git a/docs/upgrades/templates-7.3.10/auth-webgui-createAccount.tmpl b/docs/upgrades/templates-7.3.10/auth-webgui-createAccount.tmpl
new file mode 100644
index 000000000..ea636c5e3
--- /dev/null
+++ b/docs/upgrades/templates-7.3.10/auth-webgui-createAccount.tmpl
@@ -0,0 +1,59 @@
+#PBtmpl0000000000000011
+<h2><tmpl_var title></h2>
+
+<tmpl_if create.message>
+   <tmpl_var create.message>
+</tmpl_if>
+
+<tmpl_var create.form.header>
+<tmpl_var create.form.hidden>
+<table >
+<tr>
+   <td class="formDescription" valign="top"><tmpl_var create.form.username.label></td>
+   <td class="tableData"><tmpl_var create.form.username></td>
+</tr>
+<tr>
+   <td class="formDescription" valign="top"><tmpl_var create.form.password.label></td>
+   <td class="tableData"><tmpl_var create.form.password></td>
+</tr>
+<tr>
+   <td class="formDescription" valign="top"><tmpl_var create.form.passwordConfirm.label></td>
+   <td class="tableData"><tmpl_var create.form.passwordConfirm></td>
+</tr>
+<tmpl_loop create.form.profile>
+<tr>
+   <td class="formDescription" valign="top"><tmpl_var profile.formElement.label></td>
+   <td class="tableData"><tmpl_var profile.formElement></td>
+</tr>
+</tmpl_loop>
+<tmpl_if useCaptcha>
+<tr>
+   <td class="formDescription" valign="top"><tmpl_var create.form.captcha.label></td>
+   <td class="tableData"><tmpl_var create.form.captcha></td>
+</tr>
+</tmpl_if>
+<tr>
+    <td colspan="2">&nbsp;</td>
+</tr>
+<tr>
+   <td class="submitData" colspan="2"><tmpl_var create.form.submit></td>
+</tr>
+</table>
+<tmpl_var create.form.footer>
+
+<div class="accountOptions">
+   <ul>
+      <li><a href="<tmpl_var login.url>"><tmpl_var login.label></a></li>
+      <tmpl_if recoverPassword.isAllowed>
+         <li><a href="<tmpl_var recoverPassword.url>"><tmpl_var recoverPassword.label></a></li>
+      </tmpl_if>
+   </ul>
+</div>
+~~~
+<style type="text/css">
+    .submitData {
+        text-align:right;
+        border-top:solid gray 1px;
+    }
+</style>
+
diff --git a/lib/WebGUI/Auth/WebGUI.pm b/lib/WebGUI/Auth/WebGUI.pm
index e4db93798..270e6a46f 100644
--- a/lib/WebGUI/Auth/WebGUI.pm
+++ b/lib/WebGUI/Auth/WebGUI.pm
@@ -190,8 +190,8 @@ sub createAccountSave {
    $error .= $temp;
    
    return $self->createAccount($error) unless ($error eq "");
-   #If Email address is not unique, a warning is displayed
-   if($warning ne "" && !$self->session->form->process("confirm")){
+   # If Email address is not unique, a warning is displayed
+   if ($warning ne "" && !$self->session->form->process("confirm")) {
       return $self->createAccount('<li>'.$i18n->get(1078).'</li>', 1);
    }
 
diff --git a/lib/WebGUI/i18n/English/WebGUI.pm b/lib/WebGUI/i18n/English/WebGUI.pm
index 3d0865c1c..13706e2c1 100644
--- a/lib/WebGUI/i18n/English/WebGUI.pm
+++ b/lib/WebGUI/i18n/English/WebGUI.pm
@@ -2509,7 +2509,8 @@ div.tabs {
 	},
 
 	'1078' => {
-		message => q|There is already a user of this system with the email address you've entered.  Press "Save" if you still wish to create this user|,
+		message => q|There is already a user of this system with the email address you've entered.  
+        Please re-complete the form and press "Save" if you still wish to create this user|,
 		lastUpdated => 1067951807
 	},