ispman/tasks DeleteVirtualHostDirectories_task.pl,1.1,1.2 deleteDomainDirectories_task.pl,1.1,1.2 deleteHomeDirectory_task.pl,1.1,1.2

Update of /cvsroot/ispman/ispman/tasks
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17937/tasks

Modified Files:
	DeleteVirtualHostDirectories_task.pl 
	deleteDomainDirectories_task.pl deleteHomeDirectory_task.pl 
Log Message:
those regexps were a bit too tight for ispman dirs (usually containing "-" and ".")

Index: deleteHomeDirectory_task.pl
===================================================================
RCS file: /cvsroot/ispman/ispman/tasks/deleteHomeDirectory_task.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- deleteHomeDirectory_task.pl	30 Dec 2004 04:32:27 -0000	1.1
+++ deleteHomeDirectory_task.pl	13 Jan 2005 20:14:04 -0000	1.2
@@ -13,7 +13,7 @@
       return 0;
    }
 
-   unless ($params->{"homeDirectory"}=~m!^/\w+\d*?/\w+\d*/!){
+   unless ($params->{"homeDirectory"}=~m!^/[\w.-]+?/[\w.-]+/!){
       print "Home directory too shallow. Too afraid to delete it\n";
       return 0;
    }

Index: DeleteVirtualHostDirectories_task.pl
===================================================================
RCS file: /cvsroot/ispman/ispman/tasks/DeleteVirtualHostDirectories_task.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DeleteVirtualHostDirectories_task.pl	30 Dec 2004 04:16:30 -0000	1.1
+++ DeleteVirtualHostDirectories_task.pl	13 Jan 2005 20:14:03 -0000	1.2
@@ -10,7 +10,7 @@
       return 0;
    }
 
-   unless ($params->{"homeDirectory"}=~m!^/\w+\d*?/\w+\d*/!){
+   unless ($params->{"homeDirectory"}=~m!^/[\w.-]+?/[\w.-]+/!){
       print "Home directory too shallow. Too afraid to delete it\n";
       return 0;
    }

Index: deleteDomainDirectories_task.pl
===================================================================
RCS file: /cvsroot/ispman/ispman/tasks/deleteDomainDirectories_task.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- deleteDomainDirectories_task.pl	30 Dec 2004 04:15:43 -0000	1.1
+++ deleteDomainDirectories_task.pl	13 Jan 2005 20:14:03 -0000	1.2
@@ -13,7 +13,7 @@
       return 0;
    }
 
-   unless ($params->{"homeDirectory"}=~m!^/\w+\d*?/\w+\d*/!){
+   unless ($params->{"homeDirectory"}=~m!^/[\w.-]+?/[\w.-]+/!){
       print "Home directory too shallow. Too afraid to delete it\n";
       return 0;
    }



-------------------------------------------------------
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