ispman/lib/ISPMan ApacheMan.pm,1.75,1.76
Atif Ghaffar <[email protected]>
| Newsgroups | gmane.comp.isp.ispman.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/ispman/ispman/lib/ISPMan
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20008
Modified Files:
ApacheMan.pm
Log Message:
Passing Process parameters by name as in URL
Index: ApacheMan.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/ISPMan/ApacheMan.pm,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- ApacheMan.pm 22 Aug 2004 19:36:12 -0000 1.75
+++ ApacheMan.pm 30 Dec 2004 01:37:20 -0000 1.76
@@ -166,7 +166,7 @@
my $dn = $self->getVhostDN( $domain, $vhost );
$self->updateEntryWithData( $dn,
{ 'FTPStatus' => 'disabled', 'ispmanStatus' => "suspended" } );
- $self->addVhostProcess( $domain, $vhost, "ModifyVirtualHost", $vhost );
+ $self->addVhostProcess( $domain, $vhost, "ModifyVirtualHost", "vhost=$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 );
+ $self->addVhostProcess( $domain, $vhost, "ModifyVirtualHost", "vhost=$vhost" );
return 1;
}
@@ -230,7 +230,7 @@
if ( $self->{'ldap'}->updateEntryWithData( $dn, $data ) ) {
$self->addVhostProcess(
$r->param("ispmanDomain"), $r->param("ispmanVhostName"),
- "ModifyVirtualHost", $r->param("ispmanVhostName")
+ "ModifyVirtualHost", "vhost=" . $r->param("ispmanVhostName")
);
}
@@ -406,7 +406,7 @@
# add process for each webhost
for (@webhosts) {
$self->addProcessToHost( $r->param("ispmanDomain"),
- $_, "AddVirtualHost", $r->param("ispmanVhostName") );
+ $_, "AddVirtualHost", "vhost=" . $r->param("ispmanVhostName") );
}
# add process for vhost directory creation
@@ -414,17 +414,7 @@
$r->param("ispmanDomain"),
$r->param("ispmanVhostName"),
"AddVirtualHostDirectories",
- join ",",
- (
- $r->param("ispmanVhostName"),
- $vhost_info->{'homeDirectory'},
- $vhost_info->{"ispmanVhostDocumentRoot"},
- $vhost_info->{"ispmanVhostScriptDir"},
- $vhost_info->{'uidNumber'},
- $vhost_info->{'gidNumber'},
- $vhost_info->{"ispmanVhostLogdir"},
- $vhost_info->{"ispmanVhostStatdir"}
- )
+ join "&", map {"$_=$vhost_info->{$_}"} ("ispmanVhostName", "homeDirectory", "ispmanVhostDocumentRoot", "ispmanVhostScriptDir", "uidNumber", "gidNumber", "ispmanVhostLogdir", "ispmanVhostStatdir")
);
return 1;
}
@@ -457,20 +447,12 @@
$ispmanDomain,
$ispmanVhostName,
"DeleteVirtualHostDirectories",
- join ",",
- (
- $ispmanVhostName,
- $vhostInfo->{'homeDirectory'},
- $vhostInfo->{"ispmanVhostDocumentRoot"},
- $vhostInfo->{"ispmanVhostScriptDir"},
- $vhostInfo->{"ispmanVhostLogdir"},
- $vhostInfo->{"ispmanVhostStatdir"}
- )
+ join "&", map {"$_=$vhostInfo->{$_}"} qw (ispmanVhostName homeDirectory ispmanVhostDocumentRoot ispmanVhostScriptDir ispmanVhostLogdir ispmanVhostStatdir)
);
$self->addVhostProcess(
$ispmanDomain, $ispmanVhostName,
- "DeleteVirtualHost", $ispmanVhostName
+ "DeleteVirtualHost", "vhost=$ispmanVhostName"
);
# Delete the A Record from DNS for this 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