ispman/lib/ISPMan/ApacheMan Acls.pm,1.8,1.9 Aliases.pm,1.9,1.10 Redirects.pm,1.3,1.4

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

Modified Files:
	Acls.pm Aliases.pm Redirects.pm 
Log Message:
respecting naming convention. replacing more process paramters with named parameters

Index: Aliases.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/ISPMan/ApacheMan/Aliases.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Aliases.pm	15 Jul 2004 08:13:08 -0000	1.9
+++ Aliases.pm	30 Dec 2004 01:47:14 -0000	1.10
@@ -85,7 +85,7 @@
 
         }
     );
-    $self->addVhostProcess( $domain, $vhost, "ModifyVirtualHost", $vhost );
+    $self->addVhostProcess( $domain, $vhost, "ModifyVirtualHost", "ispmanVhostName=$vhost" );
     if ( $self->checkDomainType( $domain, "primary" ) ) {
         $self->newDNSRecord( $domain, "cNAMERecord", $alias, $vhost,
             { txTRecord => "ispmanVirtualHostAlias:$vhost.$domain" } );
@@ -122,7 +122,7 @@
     my $dn = $self->getAliasDN( $domain, $vhost, $alias );
 
     $self->updateEntryWithData( $dn,, { 'ispmanVhostServerAlias' => $alias } );
-    $self->addVhostProcess( $domain, $vhost, "ModifyVirtualHost", $vhost );
+    $self->addVhostProcess( $domain, $vhost, "ModifyVirtualHost", "ispmanVhostName=$vhost" );
 }
 
 sub deleteAlias {
@@ -142,7 +142,7 @@
     my ( $domain, $vhost, $alias ) = @_;
     my $dn = $self->getAliasDN( $domain, $vhost, $alias );
     if ( $self->deleteEntry($dn) ) {
-        $self->addVhostProcess( $domain, $vhost, "ModifyVirtualHost", $vhost );
+        $self->addVhostProcess( $domain, $vhost, "ModifyVirtualHost", "ispmanVhostName=$vhost" );
     }
     $self->deleteDNSRecord( $domain, "cNAMERecord", $alias, $vhost,
         { txTRecord => "ispmanVirtualHostAlias:$vhost.$domain" } );

Index: Redirects.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/ISPMan/ApacheMan/Redirects.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Redirects.pm	30 May 2004 23:35:37 -0000	1.3
+++ Redirects.pm	30 Dec 2004 01:47:14 -0000	1.4
@@ -89,7 +89,7 @@
 
         }
     );
-    $self->addVhostProcess( $domain, $vhost, "ModifyVirtualHost", $vhost );
+    $self->addVhostProcess( $domain, $vhost, "ModifyVirtualHost", "ispmanVhostName=$vhost" );
 }
 
 sub updateRedirect {
@@ -135,7 +135,7 @@
             'ispmanVhostRedirectLocation' => $ispmanVhostRedirectLocation
         }
     );
-    $self->addVhostProcess( $domain, $vhost, "ModifyVirtualHost", $vhost );
+    $self->addVhostProcess( $domain, $vhost, "ModifyVirtualHost", "ispmanVhostName=$vhost" );
 }
 
 sub deleteRedirect {
@@ -155,7 +155,7 @@
     my ( $domain, $vhost, $url ) = @_;
     my $dn = $self->getRedirectionDN( $domain, $vhost, $url );
     if ( $self->deleteEntry($dn) ) {
-        $self->addVhostProcess( $domain, $vhost, "ModifyVirtualHost", $vhost );
+        $self->addVhostProcess( $domain, $vhost, "ModifyVirtualHost", "ispmanVhostName=$vhost" );
     }
 
 }

Index: Acls.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/ISPMan/ApacheMan/Acls.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Acls.pm	30 May 2004 23:35:37 -0000	1.8
+++ Acls.pm	30 Dec 2004 01:47:14 -0000	1.9
@@ -93,7 +93,7 @@
     $self->addDataFromLdif( "templates/acl.vhost.ldif.template", $r );
     $self->addVhostProcess(
         $r->param("ispmanDomain"), $r->param("ispmanVhostName"),
-        "ModifyVirtualHost",       $r->param("ispmanVhostName")
+        "ModifyVirtualHost",       "ispmanVhostName=". $r->param("ispmanVhostName")
     );
 }
 
@@ -112,7 +112,7 @@
     );
     $self->addVhostProcess(
         $r->param("ispmanDomain"), $r->param("ispmanVhostName"),
-        "ModifyVirtualHost",       $r->param("ispmanVhostName")
+        "ModifyVirtualHost",       "ispmanVhostName=". $r->param("ispmanVhostName")
     );
 }
 
@@ -142,7 +142,7 @@
             'ispmanVhostAclAllowUser' => $self->as_arrayref(@users)
         }
     );
-    $self->addVhostProcess( $domain, $vhost, "ModifyVirtualHost", $vhost );
+    $self->addVhostProcess( $domain, $vhost, "ModifyVirtualHost", "ispmanVhostName=$vhost" );
 }
 
 sub deleteVhostAcl {
@@ -168,7 +168,7 @@
     if ( $self->deleteEntry( $r->param('dn') ) ) {
         $self->addVhostProcess(
             $r->param("ispmanDomain"), $r->param("ispmanVhostName"),
-            "ModifyVirtualHost",       $r->param("ispmanVhostName")
+            "ModifyVirtualHost",       "ispmanVhostName="  . $r->param("ispmanVhostName")
         );
     }
 
@@ -179,7 +179,7 @@
     my ( $domain, $vhost, $url ) = @_;
     my $aclDN = $self->getAclDN( $domain, $vhost, $url );
     if ( $self->deleteEntry($aclDN) ) {
-        $self->addVhostProcess( $domain, $vhost, "ModifyVirtualHost", $vhost );
+        $self->addVhostProcess( $domain, $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