From 7dbc5ef48f5cce2c006330c04f4aeabd69b869ac Mon Sep 17 00:00:00 2001
From: Othmar Gsenger <otti@wirdorange.org>
Date: Sun, 16 Jan 2011 14:52:59 +0000
Subject: bugfixes

---
 cancel.pl | 5 +++--
 remove.pl | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cancel.pl b/cancel.pl
index 7b8546c..613612e 100755
--- a/cancel.pl
+++ b/cancel.pl
@@ -6,7 +6,8 @@ use CGI::Carp 'fatalsToBrowser';
 use local::nzbget;
 use local::db;
 use local::user;
-use File::Path qw(remove_tree);
+use File::Path;
+use config;
 
 my $user = new local::user(%ENV);
 my $del_id = param('id');
@@ -23,7 +24,7 @@ foreach my $value ( @$row)
   {
     my $status = $cli->send_request('editqueue','GroupDelete',0,"",[$value->{LastID}->value]) or die "Can't connect to nzbget"; 
     sleep 1;
-    remove_tree($basedir.'/'.$dl->category->name.'/'.$dl->download_id);
+    File::Path::rmtree($basedir.'/'.$dl->category->name.'/'.$dl->download_id);
     $user->obj->quota_used($user->obj->quota_used - $dl->size);
     $user->obj->update;
     my @seens = local::db::seen->search(download=>$del_id);
diff --git a/remove.pl b/remove.pl
index 122543b..fe690ed 100755
--- a/remove.pl
+++ b/remove.pl
@@ -5,8 +5,8 @@ use CGI qw(:standard);
 use CGI::Carp 'fatalsToBrowser';
 use local::db;
 use local::user;
-use File::Path qw(remove_tree);
-use $config;
+use File::Path;
+use config;
 
 my $user = new local::user(%ENV);
 my $del_id = param('id');
@@ -15,7 +15,7 @@ my ($dl) = local::db::download->retrieve($del_id) or die 'Error in cancel';
 die "Not allowed" if not $dl->owner->owner_id() eq $user->get_id();
 
 my $basedir = $config::config{files_dir} or die 'Missing files_dir in config';
-remove_tree($basedir.'/'.$dl->category->name.'/'.$dl->download_id);
+File::Path::rmtree($basedir.'/'.$dl->category->name.'/'.$dl->download_id);
 $user->obj->quota_used($user->obj->quota_used - $dl->size);
 $user->obj->update;
 my @seens = local::db::seen->search(download=>$del_id);
-- 
cgit v1.2.3