CVS: ispman/lib http.lib,1.41,1.42

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

Modified Files:
	http.lib 
Log Message:
adding the extra vhost server aliases code

Index: http.lib
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/http.lib,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** http.lib	4 Aug 2003 01:43:58 -0000	1.41
--- http.lib	8 Oct 2003 01:24:40 -0000	1.42
***************
*** 9,17 ****
  $sleepSecondsBetweenRestart = $ispman->getConf("sleepSecondsBetweenRestart");
  
- sub read_vhosts_hash {
-   my $vhostFile=shift;
- 
-   do $vhostFile;
  
    return $VAR1;
  }
--- 9,16 ----
  $sleepSecondsBetweenRestart = $ispman->getConf("sleepSecondsBetweenRestart");
  
  
+ sub read_vhosts_hash{
+ 	my $vhostsFile=shift;
+ 	do  $vhostsFile;
    return $VAR1;
  }
***************
*** 31,34 ****
--- 30,50 ----
     
    my $vhostInfo = $ispman->getVhostInfo($vhost, $domain);
+ 	#print Dumper($vhostInfo);
+ 
+ 	#New ispmanVhostServerAlias branches. The old code will go away in future.
+ 	$ispmanVhostServerAliases=$ispman->getAliases($domain, $vhost);
+ 	@_ispmanVhostServerAliases=();
+ 	for (keys %$ispmanVhostServerAliases){
+ 		# Add the domain suffix to the alias.
+ 		# These aliases are not fully qualified names.
+ 		push @_ispmanVhostServerAliases, join '.', ($ispmanVhostServerAliases->{$_}{'ispmanVhostServerAlias'}, $domain);
+ 		
+ 	}
+ 
+ 
+ 	$vhostInfo->{'ispmanVhostServerAlias'}=$ispman->as_arrayref(@_ispmanVhostServerAliases, $vhostInfo->{'ispmanVhostServerAlias'});
+         
+ 	
+ 	
    my $domainInfo = $ispman->getDomainInfo($domain);
    my $vhostConfFile = $apacheVhostsFile;



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