ispman/lib/ISPMan UserMan.pm,1.58,1.58.2.1

Update of /cvsroot/ispman/ispman/lib/ISPMan
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv11362/lib/ISPMan

Modified Files:
      Tag: dev_1_3-cyrus_virtdomain
	UserMan.pm 
Log Message:
applied s0undt3ch's patch for cyrus virtudomain feature


Index: UserMan.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/ISPMan/UserMan.pm,v
retrieving revision 1.58
retrieving revision 1.58.2.1
diff -u -d -r1.58 -r1.58.2.1
--- UserMan.pm	27 May 2006 16:25:05 -0000	1.58
+++ UserMan.pm	8 Sep 2006 13:15:40 -0000	1.58.2.1
@@ -586,12 +586,19 @@
  # If you don't want this behaviour and just wasn't uid uncomment the next line;
  # return $userId;
 
-    $domain =~ s/\./_/g;
-    $userId =~ s/\./_/g;
+    if ( $ISPMan::Config->{'AllowFullEmailLogins'} ) {
+        unless ( $userId =~ /$domain$/ ) {
+            $userId = join "@", ( $userId, $domain );
+        }
+    } else {
+        $domain =~ s/\./_/g;
+        $userId =~ s/\./_/g;
 
-    unless ( $userId =~ /$domain$/ ) {
-        $userId = join "_", ( $userId, $domain );
+        unless ( $userId =~ /$domain$/ ) {
+            $userId = join "_", ( $userId, $domain );
+        }
     }
+    
     return $userId;
 }
 


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642