ispman/lib http.lib,1.65,1.66

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

Modified Files:
	http.lib 
Log Message:
added ispmanVhostFeature
removed some obsolete stuff

Index: http.lib
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/http.lib,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- http.lib	18 Feb 2007 13:57:45 -0000	1.65
+++ http.lib	11 Jun 2007 10:14:48 -0000	1.66
@@ -110,20 +110,6 @@
     ### delete this vhost from hash if it already exists
     delete $vhostHash->{$ispmanDomain}{$ispmanVhostName};
 
-    ### remove some options that we are adding in the interface but there
-    ### is no logic for it.
-    ### in future there should be some code to map each Option to its correct
-    ### parameters.
-    ### Example: ExecPHP could add AddType x-httpd-php .php etc
-
-    my $_ispmanVhostDocumentRootOption =
-      $ispman->as_hashref( $vhostInfo->{'ispmanVhostDocumentRootOption'} );
-    delete $_ispmanVhostDocumentRootOption->{'ExecPHP'};
-    delete $_ispmanVhostDocumentRootOption->{'AllowFrontPage'};
-    delete $_ispmanVhostDocumentRootOption->{'AllowApacheASP'};
-
-    $vhostInfo->{'ispmanVhostDocumentRootOption'} =
-      [ keys %$_ispmanVhostDocumentRootOption ];
 
     $vhostHash->{$ispmanDomain}{$ispmanVhostName} = {
         servername             => "$vhost.$ispmanDomain",
@@ -136,6 +122,7 @@
         ispmanVhostIpAddress   => $vhostInfo->{'ispmanVhostIpAddress'},
         ispmanVhostExtraConf   =>
           HTML::Entities::decode( $vhostInfo->{'ispmanVhostExtraConf'} ),
+        ispmanVhostFeature     => $ispman->as_hashref($vhostInfo->{'ispmanVhostFeature'}),
         ispmanVhostDocumentRootOption =>
           $vhostInfo->{'ispmanVhostDocumentRootOption'},
         ispmanVhostScriptDirOption =>
@@ -420,14 +407,6 @@
             $vhostHash->{$domain}{$vh}{'apacheAuthLdapModule'} =
               $ispman->getConf("apacheAuthLdapModule");
 
-            if ( $vhostHash->{$domain}{$vh}{'ispmanVhostStats'} eq "enable" ) {
-                $vhostHash->{$domain}{$vh}{'statalias'} =
-                  "Alias /stats $vhostHash->{$domain}{$vh}{'statdir'}";
-            }
-            else {
-                $vhostHash->{$domain}{$vh}{'statalias'} = "";
-            }
-
             ### Suspended
             if ( $vhostHash->{$domain}{$vh}{'ispmanStatus'} eq "suspended" ) {
                 print "Status of this vhost is ",


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/