ispman/lib/ISPMan DomainMan.pm,1.89,1.90

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

Modified Files:
	DomainMan.pm 
Log Message:
fixed bug [ 1693680 ] Adding replica failed for resellers/clients

Index: DomainMan.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/ISPMan/DomainMan.pm,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- DomainMan.pm	18 Apr 2007 22:36:34 -0000	1.89
+++ DomainMan.pm	19 Apr 2007 21:30:23 -0000	1.90
@@ -193,9 +193,12 @@
         # check if homeDirectory lies in defaultHomeDirectoryPath
         my $defaultHomeDirectoryPath =
           $self->getConf("defaultHomeDirectoryPath");
-        if ( $r->param("homeDirectory") !~ m/^$defaultHomeDirectoryPath/ ) {
-            print
-              "Add Domain aborted!\nHomeDirectory must be subdir of $defaultHomeDirectoryPath.\n";
+        if (    $r->param("ispmanDomainType") ne "replica"
+            and $r->param("homeDirectory") !~ m/^$defaultHomeDirectoryPath/ )
+        {
+            print "Add Domain aborted!\nHomeDirectory '"
+              . $r->param("homeDirectory")
+              . "' must be subdir of $defaultHomeDirectoryPath.\n";
             return;
         }
     }
@@ -536,7 +539,7 @@
     $data->{'ispmanDomainType'} = $ispmanDomainType;
     if ( $ispmanDomainType ne "replica" ) {
 
-        $data->{'uid'}          = $domain;
+        $data->{'uid'} = $domain;
         $data->{'userPassword'} =
           $self->encryptPassWithMethod( $r->param("userPassword"),
             $self->getConf('userPassHashMethod') );
@@ -585,8 +588,8 @@
 
     }
     else {    # Replica
-        $data->{'ispmanReplicaMaster'}   = $r->param("ispmanReplicaMaster");
-        $data->{'ispmanDomainComment'}   = $r->param("ispmanDomainComment");
+        $data->{'ispmanReplicaMaster'} = $r->param("ispmanReplicaMaster");
+        $data->{'ispmanDomainComment'} = $r->param("ispmanDomainComment");
         $data->{'mailForwardingAddress'} =
           '@' . $r->param("ispmanReplicaMaster");
     }
@@ -1355,7 +1358,7 @@
         exit;
     }
     my $domaintype = $r->param("ispmanDomainType");
-    my $template   =
+    my $template =
       $self->getTemplate( "domains/add_" . $domaintype . "_Domain.tmpl" );
     print $template->fill_in( PACKAGE => "ISPMan" );
 


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