CVS: ispman/lib/ISPMan ApacheMan.pm,1.32,1.33

Update of /cvsroot/ispman/ispman/lib/ISPMan
In directory sc8-pr-cvs1:/tmp/cvs-serv20655/ISPMan

Modified Files:
	ApacheMan.pm 
Log Message:
just changing the order in which the parameters were passed to maintain backwards compatibility.

Added log_message call to log properly to the log file



Index: ApacheMan.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/ISPMan/ApacheMan.pm,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** ApacheMan.pm	31 Jul 2003 00:03:58 -0000	1.32
--- ApacheMan.pm	7 Oct 2003 15:33:20 -0000	1.33
***************
*** 271,287 ****
     my $dn=$self->getVhostDN($domain, $ispmanVhostName);
     $r->param("dn", $dn);
!    
     $self->prepareBranchForDN($self->getVhostsBranchDN($domain));
!    
     my $documentrootoptions=$self->as_arrayref($r->param("ispmanVhostDocumentRootOption"));
     my $scriptdiroptions=$self->as_arrayref($r->param("ispmanVhostScriptDirOption"));;
  
!    if ($r->param("ispmanVhostServerAlias")) { 
  
!       my $serveralias=[split(/\s\s*/, $r->param("ispmanVhostServerAlias"))];  
!       $r->param("ispmanVhostServerAlias", $serveralias) if $serveralias;  
!    } else { 
!       $r->param("ispmanVhostServerAlias", " ");  
!    } 
  
     my $data;
--- 271,287 ----
     my $dn=$self->getVhostDN($domain, $ispmanVhostName);
     $r->param("dn", $dn);
! 
     $self->prepareBranchForDN($self->getVhostsBranchDN($domain));
! 
     my $documentrootoptions=$self->as_arrayref($r->param("ispmanVhostDocumentRootOption"));
     my $scriptdiroptions=$self->as_arrayref($r->param("ispmanVhostScriptDirOption"));;
  
!    if ($r->param("ispmanVhostServerAlias")) {
  
!       my $serveralias=[split(/\s\s*/, $r->param("ispmanVhostServerAlias"))];
!       $r->param("ispmanVhostServerAlias", $serveralias) if $serveralias;
!    } else {
!       $r->param("ispmanVhostServerAlias", " ");
!    }
  
     my $data;
***************
*** 295,299 ****
     };
     $data->{'uid'}=join '.' , ($r->param("ispmanVhostName"), $r->param("ispmanDomain"));
!    
     $data->{'objectClass'}=$self->{'Config'}{'ispmanVhostObjectclasses'};
     $data->{'homeDirectory'}=join '/' , ($domain_info->{'homeDirectory'}, "vhosts", $r->param("ispmanVhostName"));
--- 295,299 ----
     };
     $data->{'uid'}=join '.' , ($r->param("ispmanVhostName"), $r->param("ispmanDomain"));
! 
     $data->{'objectClass'}=$self->{'Config'}{'ispmanVhostObjectclasses'};
     $data->{'homeDirectory'}=join '/' , ($domain_info->{'homeDirectory'}, "vhosts", $r->param("ispmanVhostName"));
***************
*** 305,311 ****
  
  
!    
     $data->{"ispmanVhostExtraConf"} = $r->param("ispmanVhostExtraConf") if $r->param("ispmanVhostExtraConf");
!    
     $data->{"ispmanVhostDocumentRootOption"} = $documentrootoptions;
     $data->{"ispmanVhostScriptDirOption"} = $scriptdiroptions;
--- 305,311 ----
  
  
! 
     $data->{"ispmanVhostExtraConf"} = $r->param("ispmanVhostExtraConf") if $r->param("ispmanVhostExtraConf");
! 
     $data->{"ispmanVhostDocumentRootOption"} = $documentrootoptions;
     $data->{"ispmanVhostScriptDirOption"} = $scriptdiroptions;
***************
*** 343,350 ****
     $data->{"fileHost"} = $r->param("fileHost")  || $domain_info->{'ispmanDomainDefaultFileServer'};
     my $IpAddress;
!    if ($data->{"ispmanVhostIpAddress"} eq "*") {  
!      $IpAddress = $self->getHostIp($data->{'webHost'});    
!    } else {  
!      $IpAddress = $data->{"ispmanVhostIpAddress"};  
     }
  
--- 343,350 ----
     $data->{"fileHost"} = $r->param("fileHost")  || $domain_info->{'ispmanDomainDefaultFileServer'};
     my $IpAddress;
!    if ($data->{"ispmanVhostIpAddress"} eq "*") {
!      $IpAddress = $self->getHostIp($data->{'webHost'});
!    } else {
!      $IpAddress = $data->{"ispmanVhostIpAddress"};
     }
  
***************
*** 357,363 ****
              }
              $self->addProcessToHost($r->param("ispmanDomain"), $data->{"webHost"}, "AddVirtualHost", $r->param("ispmanVhostName"));
!             
              $self->addVirtualHostDirectoriesProcess(
!                $r->param("ispmanDomain"), 
                 $r->param("ispmanVhostName"), 
                 "AddVirtualHostDirectories",
--- 357,363 ----
              }
              $self->addProcessToHost($r->param("ispmanDomain"), $data->{"webHost"}, "AddVirtualHost", $r->param("ispmanVhostName"));
! 
              $self->addVirtualHostDirectoriesProcess(
!                $r->param("ispmanDomain"),
                 $r->param("ispmanVhostName"), 
                 "AddVirtualHostDirectories",
***************
*** 366,374 ****
                    $domain_info->{'homeDirectory'}, 
                    $data->{"ispmanVhostDocumentRoot"}, 
!                   $data->{"ispmanVhostScriptDir"}, 
                    $data->{"ispmanVhostLogdir"},
                    $data->{"ispmanVhostStatdir"},
-                   $domain_info->{'uidNumber'}, 
-                   $domain_info->{'gidNumber'}
                    )
               );
--- 366,374 ----
                    $domain_info->{'homeDirectory'}, 
                    $data->{"ispmanVhostDocumentRoot"}, 
!                   $data->{"ispmanVhostScriptDir"},
!                   $domain_info->{'uidNumber'},
!                   $domain_info->{'gidNumber'},
                    $data->{"ispmanVhostLogdir"},
                    $data->{"ispmanVhostStatdir"},
                    )
               );



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf