ispman/lib/ISPMan DomainMan.pm,1.86,1.87

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

Modified Files:
	DomainMan.pm 
Log Message:
perltidy

Index: DomainMan.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/ISPMan/DomainMan.pm,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- DomainMan.pm	10 Feb 2007 20:42:06 -0000	1.86
+++ DomainMan.pm	10 Feb 2007 20:50:21 -0000	1.87
@@ -195,7 +195,7 @@
           $self->getConf("defaultHomeDirectoryPath");
         if ( $r->param("homeDirectory") !~ m/^$defaultHomeDirectoryPath/ ) {
             print
-"Add Domain aborted!\nHomeDirectory must be subdir of $defaultHomeDirectoryPath.\n";
+              "Add Domain aborted!\nHomeDirectory must be subdir of $defaultHomeDirectoryPath.\n";
             return;
         }
     }
@@ -279,26 +279,29 @@
     if ( $r->param("ispmanDomainType") eq "replica" ) {
 
         # Add entry for canonical map
-        $self->addDomainSMTPProcess( $r->param("ispmanDomain"),"AddCanonicalMapEntry", "ispmanReplicaMaster=" .$r->param("ispmanReplicaMaster") );
+        $self->addDomainSMTPProcess( $r->param("ispmanDomain"),
+            "AddCanonicalMapEntry",
+            "ispmanReplicaMaster=" . $r->param("ispmanReplicaMaster") );
 
         # Update ServerAliases for vhosts of MasterDomain
         my $vhosts = $self->getApacheVhosts( $r->param("ispmanReplicaMaster") );
         for my $vhost ( keys %$vhosts ) {
-            $self->addVhostProcess(
-                $r->param("ispmanReplicaMaster"), $vhost,
-                "ModifyVirtualHost",              "ispmanVhostName=$vhost"
-            );
+            $self->addVhostProcess( $r->param("ispmanReplicaMaster"),
+                $vhost, "ModifyVirtualHost", "ispmanVhostName=$vhost" );
         }
-    } else {
+    }
+    else {
 
         # Create directories for this domain
         # send the task to addDomainFileServerProcess.
         # It will add it to host or group
         # Give directory, uid, gid information
-       my $_domainInfo=$self->getDomainInfo($r->param("ispmanDomain"));
+        my $_domainInfo = $self->getDomainInfo( $r->param("ispmanDomain") );
 
-        $self->addDomainFileServerProcess( $r->param("ispmanDomain"),"createDomainDirectories" ,
-        "homeDirectory=$_domainInfo->{'homeDirectory'}&uidNumber=$_domainInfo->{'uidNumber'}&gidNumber=$_domainInfo->{'gidNumber'}"
+        $self->addDomainFileServerProcess(
+            $r->param("ispmanDomain"),
+            "createDomainDirectories",
+            "homeDirectory=$_domainInfo->{'homeDirectory'}&uidNumber=$_domainInfo->{'uidNumber'}&gidNumber=$_domainInfo->{'gidNumber'}"
         );
     }
 
@@ -401,7 +404,7 @@
     my $replicas = $self->getReplicasOfDomain($domain);
     if ($replicas) {
         print
-"<font size=+2 face=Arial><b>You cannot delete this domain.<br> It has other domains (replicas) depending on it.<br><br>";
+          "<font size=+2 face=Arial><b>You cannot delete this domain.<br> It has other domains (replicas) depending on it.<br><br>";
         print "Delete the following domains before deleting this one<br>\n";
         print join "\n", map { "<li>$_</li>" } keys %$replicas;
         print "<br>";
@@ -425,7 +428,7 @@
     my $users = $self->getUsers($domain);
 
     for ( keys %$users ) {
-        $self->killUser( $_ );
+        $self->killUser($_);
     }
 
     # delete all vhosts of domain
@@ -454,9 +457,13 @@
         # Delete directories for this domain
         # send the task to addDomainFileServerProcess.
         # It will add it to host or group
-        $self->addDomainFileServerProcess( $domain, "deleteDomainDirectories",
+        $self->addDomainFileServerProcess(
+            $domain,
+            "deleteDomainDirectories",
             join '&',
-            map { "$_=$domain_info->{$_}" } qw(homeDirectory uidNumber gidNumber) );
+            map { "$_=$domain_info->{$_}" }
+              qw(homeDirectory uidNumber gidNumber)
+        );
     }
 
     # Remove this domain from RelayDomains
@@ -613,7 +620,9 @@
         # adjust mail maps when delivery method has changed
         if ( $data->{'ispmanDomainMailDeliveryMethod'} ) {
 
-           $self->addDomainSMTPProcess( $domain, "modifyTransport", "ispmanDomainMailDeliveryMethod=" . $self->getTransportMap($domain));
+            $self->addDomainSMTPProcess( $domain, "modifyTransport",
+                "ispmanDomainMailDeliveryMethod="
+                  . $self->getTransportMap($domain) );
 
             if ( $domain_info->{'ispmanDomainMailDeliveryMethod'} eq "local" ) {
                 $self->addDomainSMTPProcess( $domain,
@@ -634,7 +643,8 @@
             if ( $domain_info->{'ispmanReplicaMaster'} ne
                 $r->param("ispmanReplicaMaster") )
             {
-                $self->addDomainSMTPProcess( $domain, "AddCanonicalMapEntry", "ispmanReplicaMaster=" . $r->param("ispmanReplicaMaster") );
+                $self->addDomainSMTPProcess( $domain, "AddCanonicalMapEntry",
+                    "ispmanReplicaMaster=" . $r->param("ispmanReplicaMaster") );
                 $self->addDomainDNSProcess( $domain, "modifyDomain" );
 
                 # Update ServerAliases for vhosts of old MasterDomain
@@ -651,10 +661,8 @@
                 $vhosts =
                   $self->getApacheVhosts( $r->param("ispmanReplicaMaster") );
                 for my $vhost ( keys %$vhosts ) {
-                    $self->addVhostProcess(
-                        $r->param("ispmanReplicaMaster"), $vhost,
-                        "ModifyVirtualHost",              "ispmanVhostName=$vhost"
-                    );
+                    $self->addVhostProcess( $r->param("ispmanReplicaMaster"),
+                        $vhost, "ModifyVirtualHost", "ispmanVhostName=$vhost" );
                 }
 
             }
@@ -1066,7 +1074,7 @@
     my ( $self, $domain ) = @_;
     return $self->getCount(
         $self->getConf('ldapBaseDN'),
-"&(objectclass=ispmanDomain)(ispmanDomainType=replica)(ispmanReplicaMaster=$domain)",
+        "&(objectclass=ispmanDomain)(ispmanDomainType=replica)(ispmanReplicaMaster=$domain)",
         ["ispmanDomain"]
     );
 
@@ -1107,7 +1115,7 @@
     my ( $self, $domain ) = @_;
     my $domains = $self->getEntriesAsHashRef(
         $self->getConf('ldapBaseDN'),
-"&(objectclass=ispmanDomain)(ispmanDomainType=replica)(ispmanReplicaMaster=$domain)",
+        "&(objectclass=ispmanDomain)(ispmanDomainType=replica)(ispmanReplicaMaster=$domain)",
         ["ispmanDomain"]
     );
     return $self->makeDomainHash($domains);
@@ -1388,15 +1396,21 @@
 }
 
 sub selectDomainType {
-    my $self     = shift;
-    my $r        = shift;
-    
-    if (   $self->{'session'} && $self->{'session'}->param("logintype") eq "reseller" && !$self->getClients() ) {
-        print "No clients are defined for this reseller. Please add clients first!";
-    } else {    
+    my $self = shift;
+    my $r    = shift;
+
+    if (   $self->{'session'}
+        && $self->{'session'}->param("logintype") eq "reseller"
+        && !$self->getClients() )
+    {
+        print
+          "No clients are defined for this reseller. Please add clients first!";
+    }
+    else {
         my $template = $self->getTemplate("domains/selectDomainType.tmpl");
         print $template->fill_in( PACKAGE => "ISPMan" );
     }
+
 =item B<selectDomainType>
 
 Loads and print selectDomainType.tmpl
@@ -1444,7 +1458,8 @@
     my $transport = shift;
     $self->setDomainAttribute( $domain, "ispmanDomainMailDeliveryMethod",
         $transport );
-    $self->addDomainSMTPProcess( $domain, "modifyTransport", "ispmanDomainMailDeliveryMethod=" . $self->getTransportMap($domain));
+    $self->addDomainSMTPProcess( $domain, "modifyTransport",
+        "ispmanDomainMailDeliveryMethod=" . $self->getTransportMap($domain) );
 
     if ( $transport eq "smtp" ) {
         $self->addDomainSMTPProcess( $domain, "RemoveDestinationDomainEntry" );


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642