ispman/lib/ISPMan UserMan.pm,1.58.4.7,1.58.4.8

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

Modified Files:
      Tag: dev_1_3-cyrus_virtdomain2
	UserMan.pm 
Log Message:
changed paramter for createMailbox task
removed createSubMailbox task
changed parameter for deleteMailbox task
removed deleteEntryDN task

Index: UserMan.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/ISPMan/UserMan.pm,v
retrieving revision 1.58.4.7
retrieving revision 1.58.4.8
diff -u -d -r1.58.4.7 -r1.58.4.8
--- UserMan.pm	5 Oct 2006 13:57:50 -0000	1.58.4.7
+++ UserMan.pm	24 Oct 2006 21:05:40 -0000	1.58.4.8
@@ -173,15 +173,20 @@
 
     # add user to LDAP from user ldif template
     if ( $self->addDataFromLdif( "templates/users.ldif.template", $r ) ) {
+        
+        # reread user from LDAP to get computed values
+        my $_userInfo=$self->getUserInfo($_uid);
+        
         if ( $r->param("mailHost") ) {
             my $quota=$r->param("mailQuota") * 1024;
-            $self->addProcessToHost($domain, $r->param("mailHost"), "createMailbox", "mailbox=$_uid");
-            $self->addProcessToHost($domain, $r->param("mailHost"), "setMailboxQuota", "mailbox=$_uid&quota=$quota");
-            my @folders = split(' ', $self->getConf('newMailboxFolders'));
-            foreach my $folder (@folders) {
-                $self->addProcessToHost($domain, $r->param("mailHost"),
-                    "createSubMailbox", "uid=$_uid&folder=$folder");
-            }
+            $self->addProcessToHost($domain, $_userInfo->{'mailHost'},
+            "createMailbox",
+            "mailbox=".$_userInfo->{'mailLocalAddress'});
+            
+            $self->addProcessToHost($domain, $_userInfo->{'mailHost'},
+            "setMailboxQuota", 
+            "mailbox=".$_userInfo->{'mailLocalAddress'}."&".
+            "quota=$quota");
         }
 
       # send the process to method addUserFileServerProcess
@@ -189,8 +194,12 @@
       # if not defined then we fall back to the old method and send to the filserver group
 
         # passing domain, username, process and username as params
-        my $_userInfo=$self->getUserInfo($_uid);
-        $self->addUserFileServerProcess( $domain, $_uid, 'createHomeDirectory', "uid=$_uid&homeDirectory=$_userInfo->{'homeDirectory'}&uidNumber=$_userInfo->{'uidNumber'}&gidNumber=$_userInfo->{'gidNumber'}");
+        $self->addUserFileServerProcess( $domain, $_uid,
+          'createHomeDirectory',
+          "uid=$_uid&".
+          "homeDirectory=$_userInfo->{'homeDirectory'}&".
+          "uidNumber=$_userInfo->{'uidNumber'}&".
+          "gidNumber=$_userInfo->{'gidNumber'}");
 
         return 1;
     }
@@ -272,20 +281,11 @@
         $self->addProcessToHost(
             $self->{'user'}{'ispmanDomain'},
             $self->{'user'}{"mailHost"},
-            "deleteMailbox", "mailbox=$self->{'user'}{'uid'}");
+            "deleteMailbox", 
+            "mailbox=".$self->{'user'}{'mailLocalAddress'});
     }
 
-    if ( lc( $self->getConf('allowFullEmailLogins') ) eq 'yes' ) {
-        my $_dn = $dn;
-        $_dn =~ s/=/#/g;
-        
-        $self->addProcessToHost(
-            $self->{'user'}{'ispmanDomain'},
-            $self->{'Config'}->{'ldapHost'},
-            "deleteEntryDN", "dn=$_dn");
-    } else {
-        $self->deleteEntry($dn);
-    }
+    $self->deleteEntry($dn);
 }
 
 sub deleteUser {


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