ispman/lib/ISPMan UserMan.pm,1.58.4.3,1.58.4.4

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

Modified Files:
      Tag: dev_1_3-cyrus_virtdomain2
	UserMan.pm 
Log Message:
Reverted to original, but while deleting a user, if running in cyrus virtdomains mode, the user's DN branch is not deleted right away, instead it adds a new process which calls a task just for this, why, because mailbox_actions_cyrus.lib fetches the correct mailbox naming from ldap.


Index: UserMan.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/ISPMan/UserMan.pm,v
retrieving revision 1.58.4.3
retrieving revision 1.58.4.4
diff -u -d -r1.58.4.3 -r1.58.4.4
--- UserMan.pm	3 Oct 2006 17:33:40 -0000	1.58.4.3
+++ UserMan.pm	5 Oct 2006 09:43:27 -0000	1.58.4.4
@@ -175,24 +175,8 @@
     if ( $self->addDataFromLdif( "templates/users.ldif.template", $r ) ) {
         if ( $r->param("mailHost") ) {
             my $quota=$r->param("mailQuota") * 1024;
-            if ( lc( $ISPMan::Config->{'AllowFullEmailLogins'} ) == 'yes' ) {
-                my $cvd_uid = join '@', ( $r->param("userid"), $r->param("ispmanDomain") );
-                $self->addProcessToHost(
-                    $domain, $r->param("mailHost"),"createMailbox", "mailbox=$cvd_uid"
-                );
-                $self->addProcessToHost(
-                    $domain, $r->param("mailHost"), "setMailboxQuota",
-                    "mailbox=$cvd_uid&quota=$quota"
-                );
-            } else {
-                $self->addProcessToHost(
-                    $domain, $r->param("mailHost"),"createMailbox", "mailbox=$_uid"
-                );
-                #my $quota=$r->param("mailQuota") * 1024;
-                $self->addProcessToHost(
-                    $domain, $r->param("mailHost"), "setMailboxQuota", "mailbox=$_uid&quota=$quota"
-                );
-            }
+            $self->addProcessToHost($domain, $r->param("mailHost"), "createMailbox", "mailbox=$_uid");
+            $self->addProcessToHost($domain, $r->param("mailHost"), "setMailboxQuota", "mailbox=$_uid&quota=$quota");
         }
 
       # send the process to method addUserFileServerProcess
@@ -285,7 +269,18 @@
             $self->{'user'}{"mailHost"},
             "deleteMailbox", "mailbox=$self->{'user'}{'uid'}");
     }
-    $self->deleteEntry($dn);
+
+    if ( lc( $self->getConf('AllowFullEmailLogins') ) == 'yes' ) {
+        my $_dn = $dn;
+        $_dn =~ s/=/#/g;
+        
+        $self->addProcessToHost(
+            $self->{'user'}{'ispmanDomain'},
+            $self->{'Config'}->{'ldapHost'},
+            "deleteEntryDN", "dn=$_dn");
+    } else {
+        $self->deleteEntry($dn);
+    }
 }
 
 sub deleteUser {


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV