From: Dietmar Maurer Date: Thu, 6 Apr 2017 05:25:16 +0000 (+0200) Subject: correctly use PMG::RESTEnvironment->get() X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=f1c292608c9b84aa3716eaec087185398e2d373f;p=pmg-api.git correctly use PMG::RESTEnvironment->get() --- diff --git a/PMG/API2/AccessControl.pm b/PMG/API2/AccessControl.pm index 6223c54..0f583fe 100644 --- a/PMG/API2/AccessControl.pm +++ b/PMG/API2/AccessControl.pm @@ -140,7 +140,7 @@ __PACKAGE__->register_method ({ my $username = $param->{username}; $username .= "\@$param->{realm}" if $param->{realm}; - my $rpcenv = PMG::RESTEnvironment::get(); + my $rpcenv = PMG::RESTEnvironment->get(); my $res; eval { @@ -186,7 +186,7 @@ __PACKAGE__->register_method ({ code => sub { my ($param) = @_; - my $rpcenv = PMG::RESTEnvironment::get(); + my $rpcenv = PMG::RESTEnvironment->get(); my $authuser = $rpcenv->get_user(); my ($userid, $ruid, $realm) = PMG::Utils::verify_username($param->{userid}); diff --git a/PMG/API2/ClamAV.pm b/PMG/API2/ClamAV.pm index ad31180..d16a38b 100644 --- a/PMG/API2/ClamAV.pm +++ b/PMG/API2/ClamAV.pm @@ -92,7 +92,7 @@ __PACKAGE__->register_method({ code => sub { my ($param) = @_; - my $rpcenv = PMG::RESTEnvironment::get(); + my $rpcenv = PMG::RESTEnvironment->get(); my $authuser = $rpcenv->get_user(); my $realcmd = sub { diff --git a/PMG/API2/Network.pm b/PMG/API2/Network.pm index abc6c09..6d6eebe 100644 --- a/PMG/API2/Network.pm +++ b/PMG/API2/Network.pm @@ -182,7 +182,7 @@ __PACKAGE__->register_method({ code => sub { my ($param) = @_; - my $restenv = PMG::RESTEnvironment::get(); + my $restenv = PMG::RESTEnvironment->get(); my $tmp = PVE::INotify::read_file('interfaces', 1); my $config = $tmp->{data}; diff --git a/PMG/API2/Nodes.pm b/PMG/API2/Nodes.pm index 780c1f3..a5df5e3 100644 --- a/PMG/API2/Nodes.pm +++ b/PMG/API2/Nodes.pm @@ -181,7 +181,7 @@ __PACKAGE__->register_method({ code => sub { my ($param) = @_; - my $restenv = PMG::RESTEnvironment::get(); + my $restenv = PMG::RESTEnvironment->get(); my $service = $param->{service}; if ($service && $service eq 'postfix') { diff --git a/PMG/API2/Postfix.pm b/PMG/API2/Postfix.pm index ab5e959..2dd94e1 100644 --- a/PMG/API2/Postfix.pm +++ b/PMG/API2/Postfix.pm @@ -174,7 +174,7 @@ __PACKAGE__->register_method ({ code => sub { my ($param) = @_; - my $restenv = PMG::RESTEnvironment::get(); + my $restenv = PMG::RESTEnvironment->get(); my ($count, $res) = PMG::Postfix::mailq( $param->{queue}, $param->{filter}, $param->{start}, $param->{limit}); diff --git a/PMG/API2/Services.pm b/PMG/API2/Services.pm index 2e78e59..ec2d1a8 100644 --- a/PMG/API2/Services.pm +++ b/PMG/API2/Services.pm @@ -222,7 +222,7 @@ __PACKAGE__->register_method ({ code => sub { my ($param) = @_; - my $restenv = PMG::RESTEnvironment::get(); + my $restenv = PMG::RESTEnvironment->get(); my $user = $restenv->get_user(); @@ -258,7 +258,7 @@ __PACKAGE__->register_method ({ code => sub { my ($param) = @_; - my $restenv = PMG::RESTEnvironment::get(); + my $restenv = PMG::RESTEnvironment->get(); my $user = $restenv->get_user(); @@ -294,7 +294,7 @@ __PACKAGE__->register_method ({ code => sub { my ($param) = @_; - my $restenv = PMG::RESTEnvironment::get(); + my $restenv = PMG::RESTEnvironment->get(); my $user = $restenv->get_user(); @@ -330,7 +330,7 @@ __PACKAGE__->register_method ({ code => sub { my ($param) = @_; - my $restenv = PMG::RESTEnvironment::get(); + my $restenv = PMG::RESTEnvironment->get(); my $user = $restenv->get_user(); diff --git a/PMG/API2/Tasks.pm b/PMG/API2/Tasks.pm index 81ff8ca..917baff 100644 --- a/PMG/API2/Tasks.pm +++ b/PMG/API2/Tasks.pm @@ -57,7 +57,7 @@ __PACKAGE__->register_method({ code => sub { my ($param) = @_; - my $restenv = PMG::RESTEnvironment::get(); + my $restenv = PMG::RESTEnvironment->get(); my $res = []; @@ -161,7 +161,7 @@ __PACKAGE__->register_method({ raise_param_exc({ upid => "unable to parse worker upid" }) if !$task; raise_param_exc({ upid => "no such task" }) if ! -f $filename; - my $restenv = PMG::RESTEnvironment::get(); + my $restenv = PMG::RESTEnvironment->get(); PMG::RESTEnvironment->check_worker($param->{upid}, 1); return undef; @@ -215,7 +215,7 @@ __PACKAGE__->register_method({ my $lines = []; - my $restenv = PMG::RESTEnvironment::get(); + my $restenv = PMG::RESTEnvironment->get(); my $fh = IO::File->new($filename, "r"); raise_param_exc({ upid => "no such task - unable to open file - $!" }) if !$fh;