ispman/lib/ISPMan ApacheMan.pm,1.70,1.71

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

Modified Files:
	ApacheMan.pm 
Log Message:
fixes [ 967559 ] * instead of real IP for vhost

Index: ApacheMan.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/ISPMan/ApacheMan.pm,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- ApacheMan.pm	6 Jun 2004 09:08:36 -0000	1.70
+++ ApacheMan.pm	8 Jun 2004 18:54:40 -0000	1.71
@@ -282,10 +282,6 @@
     $ispmanVhostName =~ s/[^a-zA-Z0-9\.-]//g;
     $r->param( "ispmanVhostName", $ispmanVhostName );
 
-    unless ( $r->param("ispmanVhostIpAddress") ) {
-        $r->param( "ispmanVhostIpAddress", "*" );
-    }
-
     my ( $vhostIp, $vhostPort ) = split ":", $r->param("ispmanVhostIpAddress");
     my $domain = $r->param("ispmanDomain");
 
@@ -375,11 +371,11 @@
         if ( $#webhosts == 0 ) {
 
             # only single webhost is defined
-            # (ispmanVhostIpAddress overrides webhost ip)
+            # (use webhost's IP if no explicit was supplied)
             my $ip = (
                 ( $r->param("ispmanVhostIpAddress") eq "*" )
                 ? $self->getHostIp( $webhosts[0] )
-                : $vhostIp
+                : $r->param("ispmanVhostIpAddress")
             );
             $self->addVhostDNSRecord( $r->param("ispmanDomain"),
                 $r->param("ispmanVhostName"), $ip );



-------------------------------------------------------
This SF.Net email is sponsored by: GNOME Foundation
Hackers Unite!  GUADEC: The world's #1 Open Source Desktop Event.
GNOME Users and Developers European Conference, 28-30th June in Norway
http://2004/guadec.org