[vhffs-dev] [395] Webdir is now fully deleted on webgroup deletion

[subversion@xxxxxxxxx]

Revision: 395
Author:   beuss
Date:     2007-01-11 19:58:22 +0000 (Thu, 11 Jan 2007)

Log Message:
-----------
Webdir is now fully deleted on webgroup deletion

Modified Paths:
--------------
    branches/vhffs_4.1/vhffs-api/src/Vhffs/Robots/Web.pm


Modified: branches/vhffs_4.1/vhffs-api/src/Vhffs/Robots/Web.pm
===================================================================
--- branches/vhffs_4.1/vhffs-api/src/Vhffs/Robots/Web.pm	2007-01-10 08:10:00 UTC (rev 394)
+++ branches/vhffs_4.1/vhffs-api/src/Vhffs/Robots/Web.pm	2007-01-11 19:58:22 UTC (rev 395)
@@ -126,21 +126,15 @@
 		my $group = $web->get_group;
 		if(Vhffs::Robots::unlink_to_group( $group,$web->get_servername.Vhffs::Constants::WEB_SUFFIX,$main) < 0)
 		{
-			$web->add_history( "Can't unlink the webdirectory to the specified group");
+			$web->add_history( "Can't unlink the webdirectory from the specified group");
 		}
 		else
 		{
-			$web->add_history( "Webdir is now unlinked to the group directory");
+			$web->add_history( "Webdir is now unlinked from the group directory");
 		}
 
+        system("rm -rf '$webdir' 2> /dev/null");
 
-		$dir = $webdir . "/htdocs";
-		system("rm -rf $dir 2>/dev/null");
-		$dir = $webdir . "/php-include";
-		system("rm -rf $dir 2>/dev/null");
-		$dir = $webdir . "/tmp";
-		system("rm -rf $dir 2>/dev/null");
-
 		$web->add_history( "Webdir is now erased.");
 		$web->delete;	
 	}