ispman/lib/ISPMan/ApacheMan Acls.pm,1.6,1.7

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

Modified Files:
	Acls.pm 
Log Message:
removed all those nasty ^Ms

Folks! Try to avoid windows editors when editing ispman files



Index: Acls.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/ISPMan/ApacheMan/Acls.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Acls.pm	13 Jan 2004 16:08:50 -0000	1.6
+++ Acls.pm	21 Feb 2004 21:31:32 -0000	1.7
@@ -8,17 +8,17 @@
 @ISA = qw(ISPMan Exporter AutoLoader);
 @EXPORT = qw(
 getAclsBranchDN
-getAclDN
+getAclDN
 AclExists
 getAcls
-addAcl
+addAcl
 add_acl
-addVhostAcl
-updateAcl
-update_acl
+addVhostAcl
+updateAcl
+update_acl
 updateVhostAcl
-deleteAcl
-deleteVhostAcl
+deleteAcl
+deleteVhostAcl
 delete_acl
 
 );
@@ -42,12 +42,12 @@
 	return $dn;
 }
 
-sub AclExists {
-	my $self=shift;
+sub AclExists {
+	my $self=shift;
 	my ($domain, $vhost, $url)=@_;
 	my $dn=$self->getAclDN($domain, $vhost, $url);
-	return $self->entryExists($dn);
-}
+	return $self->entryExists($dn);
+}
 
 
 sub getAcls {
@@ -60,12 +60,12 @@
 }
 
 
-sub addACL {
-	goto("add_acl");
-}
-
-sub addVhostAcl {
-	my $self=shift;
+sub addACL {
+	goto("add_acl");
+}
+
+sub addVhostAcl {
+	my $self=shift;
     my $r=shift;
 	if ($self->AclExists($r->param('newIspmanVhostAclLocation'))) {
       $r->param("errors", "An ACL for this location already exists.");
@@ -77,8 +77,8 @@
    $r->param("mode", "editVhost");
    $r->param("section", "acls");
    $self->editVhost($r);
-	
-}
+	
+}
 
 sub add_acl {
    my $self=shift;
@@ -90,8 +90,8 @@
    $self->addVhostProcess($r->param("ispmanDomain"), $r->param("ispmanVhostName"), "ModifyVirtualHost", $r->param("ispmanVhostName"));
 }
 
-
-
+
+
 sub updateAcl { #used by CCP. Should be obseleted and instead delete_acl should be used with domain, vhost and url as params
    my $self=shift;
    my $r=shift;
@@ -102,22 +102,22 @@
 	});
    $self->addVhostProcess($r->param("ispmanDomain"), $r->param("ispmanVhostName"), "ModifyVirtualHost", $r->param("ispmanVhostName"));
 }
-
 
-sub updateVhostAcl { # used by the admin panel
+
+sub updateVhostAcl { # used by the admin panel
    my $self=shift;
-   my $r=shift;
-   $self->update_acl($r->param('ispmanDomain'), $r->param('ispmanVhostName'), $r->param('ispmanVhostAclLocation'), $r->param('ispmanVhostAclAllowUser'));
-   $r->delete("ispmanVhostAclLocation");
+   my $r=shift;
+   $self->update_acl($r->param('ispmanDomain'), $r->param('ispmanVhostName'), $r->param('ispmanVhostAclLocation'), $r->param('ispmanVhostAclAllowUser'));
+   $r->delete("ispmanVhostAclLocation");
    $r->param("mode", "editVhost");
    $r->param("section", "acls");
    $self->editVhost($r);
-}
-
+}
+
 sub update_acl{
    my $self=shift;
-   my ($domain, $vhost, $url, @users)=@_;
-   my $aclDN=$self->getAclDN($domain, $vhost, $url);
+   my ($domain, $vhost, $url, @users)=@_;
+   my $aclDN=$self->getAclDN($domain, $vhost, $url);
    $self->updateEntryWithData($aclDN, {
       'ispmanVhostAclLocation' => $url,
       'ispmanVhostAclAllowUser' => $self->as_arrayref(@users)
@@ -128,9 +128,9 @@
 
 sub deleteVhostAcl {
    my $self=shift;
-   my $r=shift;
-   $self->delete_acl($r->param('ispmanDomain'), $r->param('ispmanVhostName'), $r->param('ispmanVhostAclLocation'));
-   $r->delete("ispmanVhostAclLocation");
+   my $r=shift;
+   $self->delete_acl($r->param('ispmanDomain'), $r->param('ispmanVhostName'), $r->param('ispmanVhostAclLocation'));
+   $r->delete("ispmanVhostAclLocation");
    $r->param("mode", "editVhost");
    $r->param("section", "acls");
    $self->editVhost($r);
@@ -148,14 +148,14 @@
 
 
 }
-sub delete_acl {
-    my $self=shift;
-    my ($domain, $vhost, $url)=@_;
-    my $aclDN=$self->getAclDN($domain, $vhost, $url);
+sub delete_acl {
+    my $self=shift;
+    my ($domain, $vhost, $url)=@_;
+    my $aclDN=$self->getAclDN($domain, $vhost, $url);
    if ($self->deleteEntry($aclDN)){
       $self->addVhostProcess($domain,$vhost, "ModifyVirtualHost", $vhost);
    }
-}
+}
 
 
 



-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click