ispman/lib/ISPMan DomainMan.pm,1.60,1.61

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

Modified Files:
	DomainMan.pm 
Log Message:
some reformating

Index: DomainMan.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/ISPMan/DomainMan.pm,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- DomainMan.pm	30 Apr 2004 23:40:54 -0000	1.60
+++ DomainMan.pm	1 May 2004 10:06:18 -0000	1.61
@@ -220,29 +220,27 @@
    
    # do some checks for resellers/clients
    if ($self->{'session'} && $self->{'session'}->param("logintype") =~m/reseller|client/ ) {
-  
-         my $ispmanClientInfo=$self->getClientById($r->param("ispmanClientId"));
-         my $ispmanClientMaxDomainsLimit=$ispmanClientInfo->{'ispmanClientMaxDomains'};
-         my $ispmanClientDomains=$self->getDomainsCount(sprintf("ispmanClientId=%s" , $r->param("ispmanClientId")));
-
-         # 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";
-	    return
-	 }
+       # check if reseller/client has reached domain limit
+       my $ispmanClientInfo=$self->getClientById($r->param("ispmanClientId"));
+       my $ispmanClientMaxDomainsLimit=$ispmanClientInfo->{'ispmanClientMaxDomains'};
+       my $ispmanClientDomains=$self->getDomainsCount(sprintf("ispmanClientId=%s" , $r->param("ispmanClientId")));
 
-         unless ($ispmanClientDomains < $ispmanClientMaxDomainsLimit) {
-            $self->{'message'}="Max domains limit reached. Domain not added";
-            print $self->{'message'};
-            return;
-         }
-      }
+       unless ($ispmanClientDomains < $ispmanClientMaxDomainsLimit) {
+	   $self->{'message'}="Max domains limit reached. Domain not added";
+	   print $self->{'message'};
+	   return;
+       }
+       
+       # 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";
+	   return;
+       }
+       
    }
    
    
-
-   
    return if $self->domainExists($r->param("ispmanDomain"));
 
    $self->addDomain($r, $self->{'Config'});



-------------------------------------------------------
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click