ispman/lib/ISPMan DomainMan.pm,1.69,1.70

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

Modified Files:
	DomainMan.pm 
Log Message:
fixes bugfix for [ 972117 ] ;)


Index: DomainMan.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/ISPMan/DomainMan.pm,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- DomainMan.pm	14 Jun 2004 08:08:30 -0000	1.69
+++ DomainMan.pm	14 Jun 2004 08:48:45 -0000	1.70
@@ -622,25 +622,22 @@
 
     # add changes to LDAP and generate processes
     if ( $self->{'ldap'}->updateEntryWithData( $dn, $data ) ) {
-        $self->addDomainSMTPProcess( $domain, "modifyTransport" );
 
         # adjust mail maps when delivery method has changed
         if ( $data->{'ispmanDomainMailDeliveryMethod'} ) {
+
+            $self->addDomainSMTPProcess( $domain, "modifyTransport" );
+
             if ( $domain_info->{'ispmanDomainMailDeliveryMethod'} eq "local" ) {
-                $self->addDomainSMTPProcess(
-                    $domain,
-                    "RemoveDestinationDomainEntry",
-                    $r->param("ispmanReplicaMaster")
-                );
-                $self->addDomainSMTPProcess( $domain, "AddRelayDomainEntry",
-                    $r->param("ispmanReplicaMaster") );
+                $self->addDomainSMTPProcess( $domain,
+                    "RemoveDestinationDomainEntry" );
+                $self->addDomainSMTPProcess( $domain, "AddRelayDomainEntry" );
             }
             else {
-                $self->addDomainSMTPProcess( $domain, "RemoveRelayDomainEntry",
-                    $r->param("ispmanReplicaMaster") );
                 $self->addDomainSMTPProcess( $domain,
-                    "AddDestinationDomainEntry",
-                    $r->param("ispmanReplicaMaster") );
+                    "RemoveRelayDomainEntry" );
+                $self->addDomainSMTPProcess( $domain,
+                    "AddDestinationDomainEntry" );
             }
         }
 
@@ -744,7 +741,7 @@
    return the DN of the domain.
    
    If you want the DN of the domain, use this method.
-   Do not recreate the domain's DN by concatinating 
+   Do not recreate the domain´s DN by concatinating 
    ispmanDomain=name, ldapBaseDN
    
 
@@ -860,14 +857,14 @@
 my $domInfo=$ispman->getDomainInfo("developer.ch");
 
 
-Getting domain info by passing a domain's DN
+Getting domain info by passing a domain´s DN
 my $domInfo=$ispman->getDomainInfo("ispmanDomain=developer.ch, o=4unet");
 
 The first time this function is called, it searches the LDAP directory for 
 all domains and caches the result. Every subsequent request gets a cached result. 
 (slow for diconnected access , extremely fast with mod_perl)
 
-You can pass optionally a positive value so that you don't get a cached result.
+You can pass optionally a positive value so that you don´t get a cached result.
 
 I<EXAMPLE>
 
@@ -1458,6 +1455,15 @@
     $self->setDomainAttribute( $domain, "ispmanDomainMailDeliveryMethod",
         $transport );
     $self->addDomainSMTPProcess( $domain, "modifyTransport" );
+
+    if ( $transport eq "smtp" ) {
+        $self->addDomainSMTPProcess( $domain, "RemoveDestinationDomainEntry" );
+        $self->addDomainSMTPProcess( $domain, "AddRelayDomainEntry" );
+    }
+    else {
+        $self->addDomainSMTPProcess( $domain, "RemoveRelayDomainEntry" );
+        $self->addDomainSMTPProcess( $domain, "AddDestinationDomainEntry" );
+    }
 }
 
 sub summary {



-------------------------------------------------------
This SF.Net email is sponsored by the new InstallShield X.
From Windows to Linux, servers to mobile, InstallShield X is the
one installation-authoring solution that does it all. Learn more and
evaluate today! http://www.installshield.com/Dev2Dev/0504