ispman/lib http.lib,1.66,1.67

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

Modified Files:
	http.lib 
Log Message:
fixed bug [ 1765210 ] vhost ACLs are buggy


Index: http.lib
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/http.lib,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- http.lib	11 Jun 2007 10:14:48 -0000	1.66
+++ http.lib	1 Aug 2007 11:15:33 -0000	1.67
@@ -110,7 +110,6 @@
     ### delete this vhost from hash if it already exists
     delete $vhostHash->{$ispmanDomain}{$ispmanVhostName};
 
-
     $vhostHash->{$ispmanDomain}{$ispmanVhostName} = {
         servername             => "$vhost.$ispmanDomain",
         vhost                  => $vhost,
@@ -120,9 +119,10 @@
         homeDirectory          => $vhostInfo->{'homeDirectory'},
         ispmanVhostServerAlias => $vhostInfo->{'ispmanVhostServerAlias'},
         ispmanVhostIpAddress   => $vhostInfo->{'ispmanVhostIpAddress'},
-        ispmanVhostExtraConf   =>
+        ispmanVhostExtraConf =>
           HTML::Entities::decode( $vhostInfo->{'ispmanVhostExtraConf'} ),
-        ispmanVhostFeature     => $ispman->as_hashref($vhostInfo->{'ispmanVhostFeature'}),
+        ispmanVhostFeature =>
+          $ispman->as_hashref( $vhostInfo->{'ispmanVhostFeature'} ),
         ispmanVhostDocumentRootOption =>
           $vhostInfo->{'ispmanVhostDocumentRootOption'},
         ispmanVhostScriptDirOption =>
@@ -130,7 +130,7 @@
         ispmanVhostStats => $vhostInfo->{'ispmanVhostStats'},
         ispmanStatus     => $vhostInfo->{'ispmanStatus'},
         acls             => $ispman->getAcls( $ispmanDomain, $ispmanVhostName ),
-        urlredirect      =>
+        urlredirect =>
           $ispman->getRedirections( $ispmanDomain, $ispmanVhostName ),
     };
 
@@ -368,11 +368,11 @@
                         HASH => {
                             location => $vhostHash->{$domain}{$vh}{'acls'}{$_}
                               {'ispmanVhostAclLocation'},
-                            vhost      => $vh,
-                            domain     => $domain,
-                            ldapHost   => $ispman->{'Config'}{'ldapHost'},
-                            ldapBaseDN => $ispman->{'Config'}{'ldapBaseDN'},
-                            filter     => $filter
+                            vhost        => $vh,
+                            ispmanDomain => $domain,
+                            ldapHost     => $ispman->{'Config'}{'ldapHost'},
+                            ldapBaseDN   => $ispman->{'Config'}{'ldapBaseDN'},
+                            filter       => $filter
                         }
                     );
                 }
@@ -400,7 +400,7 @@
 
             $vhostHash->{$domain}{$vh}{'ispmanDomain'} = $domain;
             $vhostHash->{$domain}{$vh}{'vhost'}        = $vh;
-            $vhostHash->{$domain}{$vh}{'ldapBaseDN'}   =
+            $vhostHash->{$domain}{$vh}{'ldapBaseDN'} =
               $ispman->{'Config'}{'ldapBaseDN'};
             $vhostHash->{$domain}{$vh}{'ldapHost'} =
               $ispman->{'Config'}{'ldapHost'};
@@ -462,10 +462,10 @@
 }
 
 sub reloadServer {
-    my $apacheGracefulCommand      = $ispman->getConf("apacheGracefulCommand");
-    my $apacheReloadCommand        = $ispman->getConf("apacheReloadCommand");
-    my $apacheStopCommand          = $ispman->getConf("apacheStopCommand");
-    my $apacheStartCommand         = $ispman->getConf("apacheStartCommand");
+    my $apacheGracefulCommand = $ispman->getConf("apacheGracefulCommand");
+    my $apacheReloadCommand   = $ispman->getConf("apacheReloadCommand");
+    my $apacheStopCommand     = $ispman->getConf("apacheStopCommand");
+    my $apacheStartCommand    = $ispman->getConf("apacheStartCommand");
     my $sleepSecondsBetweenRestart =
       $ispman->getConf("sleepSecondsBetweenRestart");
 


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/