ispman/lib/CustomerMan UserMan.pm,1.10,1.10.2.1

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

Modified Files:
      Tag: dev_1_3-cyrus_virtdomain
	UserMan.pm 
Log Message:
Branch is now "aparently" updated to HEAD, though debuging is needed.


Index: UserMan.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/CustomerMan/UserMan.pm,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- UserMan.pm	2 May 2006 20:04:55 -0000	1.10
+++ UserMan.pm	11 Sep 2006 23:31:27 -0000	1.10.2.1
@@ -176,17 +176,7 @@
     my $_dn;
     my $_users;
 
-    my $users = $self->{'ispman'}->getUsers( $self->{'domain'} );
-
-    #print $self->{'ispman'}->html_dumper($users);
-
-    for ( keys %$users ) {
-        $_dn = ISPMan::explodeDN( $users->{$_} );
-        $_dn->{'ispmanDomain'} =~ s/\./_/g;
-        $_dn->{'uid'}          =~ s/_$_dn->{'ispmanDomain'}//g;
-        $_users->{ $_dn->{'uid'} } = $_;
-    }
-    return $_users;
+    return $self->{'ispman'}->getUsers( $self->{'domain'} );
 }
 
 sub editUsers {
@@ -287,7 +277,7 @@
     my $r        = shift;
     my $maildrop = $r->param("maildrop");
     my @errors   = ();
-    if ( RFC::RFC822::Address::valid($maildrop) ) {
+    if ( Mail::RFC822::Address::valid($maildrop) ) {
         my $uid = $self->userid2uid( $r->param("user") );
         my $dn  = "uid=$uid, ou=users, $self->{'domaindn'}";
         if ( $self->{'ispman'}


-------------------------------------------------------------------------
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