ispman/lib/ISPMan DomainMan.pm, 1.88, 1.89 UserMan.pm, 1.65, 1.66

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

Modified Files:
	DomainMan.pm UserMan.pm 
Log Message:
added patch [ 1692612 ] PAB per domain and per user support

Index: UserMan.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/ISPMan/UserMan.pm,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- UserMan.pm	19 Feb 2007 00:09:54 -0000	1.65
+++ UserMan.pm	18 Apr 2007 22:36:34 -0000	1.66
@@ -183,20 +183,24 @@
 
     # 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);
-        
+        my $_userInfo = $self->getUserInfo($_uid);
+
         if ( $r->param("mailHost") ) {
-            my $quota=$r->param("mailQuota") * 1024;
-            $self->addProcessToHost($domain, $_userInfo->{'mailHost'},
-            "createMailbox",
-            "mailbox=".$_userInfo->{'mailLocalAddress'});
-            
-            $self->addProcessToHost($domain, $_userInfo->{'mailHost'},
-            "setMailboxQuota", 
-            "mailbox=".$_userInfo->{'mailLocalAddress'}."&".
-            "quota=$quota");
+            my $quota = $r->param("mailQuota") * 1024;
+            $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
@@ -300,11 +304,20 @@
         $self->addProcessToHost(
             $self->{'user'}{'ispmanDomain'},
             $self->{'user'}{"mailHost"},
-            "deleteMailbox", 
-            "mailbox=".$self->{'user'}{'mailLocalAddress'});
+            "deleteMailbox", "mailbox=" . $self->{'user'}{'mailLocalAddress'}
+        );
     }
 
     $self->deleteEntry($dn);
+
+    # Delete User PAB
+    my $pab_dn = 'ou='
+      . $self->{'user'}{'uid'} . ',ou='
+      . $self->{'user'}{'ispmanDomain'}
+      . ',ou=pabs,'
+      . $self->getConf("ldapBaseDN");
+    print "deleting PAB: $pab_dn";
+    $self->delTree($pab_dn);
 }
 
 sub deleteUser {

Index: DomainMan.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/ISPMan/DomainMan.pm,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- DomainMan.pm	19 Feb 2007 00:22:09 -0000	1.88
+++ DomainMan.pm	18 Apr 2007 22:36:34 -0000	1.89
@@ -307,14 +307,12 @@
 
     # create process for domain actions
     if ( $r->param("domainActions") ) {
-        for ($r->param("domainActions")) {
-            $self->addDomainFileServerProcess(
-                $r->param("ispmanDomain"),
-                "execDomainActions",
-                "script=$_");
+        for ( $r->param("domainActions") ) {
+            $self->addDomainFileServerProcess( $r->param("ispmanDomain"),
+                "execDomainActions", "script=$_" );
         }
     }
-    
+
 }
 
 sub checkDomainType {
@@ -466,6 +464,10 @@
 
     $self->delTree( $self->getDNSDN($domain) );
 
+    # Delete Domain PAB's
+    $self->delTree(
+        'ou=' . $domain . ',ou=pabs,' . $self->getConf("ldapBaseDN") );
+
 }
 
 sub domainExists {


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/