From: Dan Scott <dscott@laurentian.ca>
Date: Sun, 11 Nov 2012 21:41:23 +0000 (-0500)
Subject: Don't break TPAC with email address usernames
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=3994b9762fdf96bdd97e3263e2bd48aaa4d33d65;p=contrib%2FConifer.git

Don't break TPAC with email address usernames

"next if..." is not valid if you're not inside a loop. Sheesh.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
---

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
index 9606e9c42f..6c88f83f9e 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
@@ -388,8 +388,9 @@ sub load_login {
         # do we need to append an email hostname?
         if ($ou_email_host) {
             # Assume they already passed in an email address
-            next if $username =~ m/\@/;
-            $username .= "\@$ou_email_host";
+            if ($username !~ m/\@/) {
+                $username .= "\@$ou_email_host";
+            }
         }
         $args->{username} = $username;
     }