From 23d5b7802426cfd7b4503e7da88aaebd7369b964 Mon Sep 17 00:00:00 2001 From: Othmar Gsenger Date: Sat, 15 Jan 2011 20:20:26 +0000 Subject: chacnged user to use complete environment added config support to remove and cancel --- cancel.pl | 2 +- enqueue.pl | 2 +- groups.pl | 2 +- local/menu.pm | 2 +- local/user.pm | 3 ++- mydl.pl | 2 +- read.pl | 2 +- remove.pl | 2 +- 8 files changed, 9 insertions(+), 8 deletions(-) diff --git a/cancel.pl b/cancel.pl index 75df86a..6ba7918 100755 --- a/cancel.pl +++ b/cancel.pl @@ -8,7 +8,7 @@ use local::db; use local::user; use File::Path qw(remove_tree); -my $user = new local::user($ENV{REMOTE_USER}); +my $user = new local::user(%ENV); my $del_id = param('id'); my ($download) = local::db::download->retrieve($del_id) or die 'Error in cancel'; diff --git a/enqueue.pl b/enqueue.pl index 7faa226..27c13ae 100755 --- a/enqueue.pl +++ b/enqueue.pl @@ -7,7 +7,7 @@ use local::nzbget; use utf8; use local::user; -my $user = new local::user($ENV{REMOTE_USER}); +my $user = new local::user(%ENV); my $nzbget = new local::nzbget; die "Kein name angegeben" if not param('name'); diff --git a/groups.pl b/groups.pl index cd7623c..0cceceb 100755 --- a/groups.pl +++ b/groups.pl @@ -7,7 +7,7 @@ use local::nzbget; use local::db; use local::user; use utf8; -my $user = new local::user($ENV{REMOTE_USER}); +my $user = new local::user(%ENV); use CGI::Ajax; diff --git a/local/menu.pm b/local/menu.pm index 62d5947..d5078ff 100644 --- a/local/menu.pm +++ b/local/menu.pm @@ -31,7 +31,7 @@ sub start_html my ($title)=@_; my $active = $self->{REQUEST_URI}; my $html= CGI::start_html(-style=>{'src'=>'/style.css'},-title=>$title); - my $user = new local::user($ENV{REMOTE_USER}); + my $user = new local::user(%ENV); $html.= table({class=>'nohigh'},Tr({class=>'nohigh'},td({style=>'font-weight: bold'},[$config::config{page_name} ]),td({class=>'login',align=>'right'},[''.b('Angemeldet als: ').$user->get_name.'']))); $html.= CGI::start_div({class=>'bodydiv'}); my @elements; diff --git a/local/user.pm b/local/user.pm index 5b727ba..3700139 100644 --- a/local/user.pm +++ b/local/user.pm @@ -10,7 +10,8 @@ sub new my $class = ref($invocant) || $invocant; # my $self = $class->SUPER::new(@_); my $self=bless {}, $class; - ($self->{name})=@_; + my %ENV=@_; + ($self->{name})=$ENV{REMOTE_USER}; my @user = local::db::owner->search(name => $self->{name}); if (not @user) { diff --git a/mydl.pl b/mydl.pl index db51573..d698b8a 100755 --- a/mydl.pl +++ b/mydl.pl @@ -6,7 +6,7 @@ use utf8; use local::nzbget; use local::db; use local::user; -my $user = new local::user($ENV{REMOTE_USER}); +my $user = new local::user(%ENV); print header; diff --git a/read.pl b/read.pl index fd4ad50..45a428c 100755 --- a/read.pl +++ b/read.pl @@ -6,7 +6,7 @@ use utf8; use local::db; use local::user; use config; -my $user = new local::user($ENV{REMOTE_USER}); +my $user = new local::user(%ENV); my $dl = local::db::download->retrieve(param('id')) or die "Ungültige download id"; diff --git a/remove.pl b/remove.pl index 1b369bb..122543b 100755 --- a/remove.pl +++ b/remove.pl @@ -8,7 +8,7 @@ use local::user; use File::Path qw(remove_tree); use $config; -my $user = new local::user($ENV{REMOTE_USER}); +my $user = new local::user(%ENV); my $del_id = param('id'); my ($dl) = local::db::download->retrieve($del_id) or die 'Error in cancel'; -- cgit v1.2.3