ispman/lib/ISPMan ApacheMan.pm,1.76,1.77 DomainMan.pm,1.80,1.81

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

Modified Files:
	ApacheMan.pm DomainMan.pm 
Log Message:
respecting naming convention. replacing more process paramters with named parameters

Index: ApacheMan.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/ISPMan/ApacheMan.pm,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- ApacheMan.pm	30 Dec 2004 01:37:20 -0000	1.76
+++ ApacheMan.pm	30 Dec 2004 01:47:13 -0000	1.77
@@ -166,7 +166,7 @@
     my $dn = $self->getVhostDN( $domain, $vhost );
     $self->updateEntryWithData( $dn,
         { 'FTPStatus' => 'disabled', 'ispmanStatus' => "suspended" } );
-    $self->addVhostProcess( $domain, $vhost, "ModifyVirtualHost", "vhost=$vhost" );
+    $self->addVhostProcess( $domain, $vhost, "ModifyVirtualHost", "ispmanVhostName=$vhost" );
 
     return 1;
 }
@@ -177,7 +177,7 @@
     my $dn = $self->getVhostDN( $domain, $vhost );
     $self->updateEntryWithData( $dn,
         { 'FTPStatus' => 'enabled', 'ispmanStatus' => "active" } );
-    $self->addVhostProcess( $domain, $vhost, "ModifyVirtualHost", "vhost=$vhost" );
+    $self->addVhostProcess( $domain, $vhost, "ModifyVirtualHost", "ispmanVhostName=$vhost" );
 
     return 1;
 }
@@ -230,7 +230,7 @@
     if ( $self->{'ldap'}->updateEntryWithData( $dn, $data ) ) {
         $self->addVhostProcess(
             $r->param("ispmanDomain"), $r->param("ispmanVhostName"),
-            "ModifyVirtualHost",       "vhost=" . $r->param("ispmanVhostName")
+            "ModifyVirtualHost",       "ispmanVhostName=" . $r->param("ispmanVhostName")
         );
     }
 
@@ -406,7 +406,7 @@
     # add process for each webhost
     for (@webhosts) {
         $self->addProcessToHost( $r->param("ispmanDomain"),
-            $_, "AddVirtualHost", "vhost=" . $r->param("ispmanVhostName") );
+            $_, "AddVirtualHost", "ispmanVhostName=" . $r->param("ispmanVhostName") );
     }
 
     # add process for vhost directory creation
@@ -452,7 +452,7 @@
 
         $self->addVhostProcess(
             $ispmanDomain,       $ispmanVhostName,
-            "DeleteVirtualHost", "vhost=$ispmanVhostName"
+            "DeleteVirtualHost", "ispmanVhostName=$ispmanVhostName"
         );
 
         # Delete the A Record from DNS for this vhost

Index: DomainMan.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/ISPMan/DomainMan.pm,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- DomainMan.pm	30 Dec 2004 01:26:32 -0000	1.80
+++ DomainMan.pm	30 Dec 2004 01:47:13 -0000	1.81
@@ -286,7 +286,7 @@
         for my $vhost ( keys %$vhosts ) {
             $self->addVhostProcess(
                 $r->param("ispmanReplicaMaster"), $vhost,
-                "ModifyVirtualHost",              "vhost=$vhost"
+                "ModifyVirtualHost",              "ispmanVhostName=$vhost"
             );
         }
     } else {
@@ -445,7 +445,7 @@
           $self->getApacheVhosts( $domain_info->{"ispmanReplicaMaster"} );
         for my $vhost ( keys %$vhosts ) {
             $self->addVhostProcess( $domain_info->{"ispmanReplicaMaster"},
-                $vhost, "ModifyVirtualHost", "vhost=$vhost" );
+                $vhost, "ModifyVirtualHost", "ispmanVhostName=$vhost" );
         }
 
     }
@@ -643,7 +643,7 @@
                 for my $vhost ( keys %$vhosts ) {
                     $self->addVhostProcess(
                         $domain_info->{"ispmanReplicaMaster"},
-                        $vhost, "ModifyVirtualHost", "vhost=$vhost" );
+                        $vhost, "ModifyVirtualHost", "ispmanVhostName=$vhost" );
                 }
 
                 # Update ServerAliases for vhosts of new MasterDomain
@@ -652,7 +652,7 @@
                 for my $vhost ( keys %$vhosts ) {
                     $self->addVhostProcess(
                         $r->param("ispmanReplicaMaster"), $vhost,
-                        "ModifyVirtualHost",              "vhost=$vhost"
+                        "ModifyVirtualHost",              "ispmanVhostName=$vhost"
                     );
                 }
 



-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt