proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-07-09 18:42:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix typo

Browse Source
This commit is contained in:
Dietmar Maurer 2014-05-02 07:10:29 +02:00
parent 1370ec6145
commit 6fcbe87a35
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
PVE/API2.pm
View File

@ -114,7 +114,7 @@ __PACKAGE__->register_method ({
return $res; return $res;
}}); }});
# register result formaters # register result formatters
my $prepare_response_data = sub { my $prepare_response_data = sub {
my ($format, $res) = @_; my ($format, $res) = @_;
@ -151,7 +151,7 @@ my $prepare_response_data = sub {
$res->{data} = $new; $res->{data} = $new;
}; };
PVE::HTTPServer::register_formater('json', sub { PVE::HTTPServer::register_formatter('json', sub {
my ($res, $data, $param, $path, $auth) = @_; my ($res, $data, $param, $path, $auth) = @_;
my $nocomp = 0; my $nocomp = 0;
@ -166,7 +166,7 @@ PVE::HTTPServer::register_formater('json', sub {
}); });
PVE::HTTPServer::register_formater('extjs', sub { PVE::HTTPServer::register_formatter('extjs', sub {
my ($res, $data, $param, $path, $auth) = @_; my ($res, $data, $param, $path, $auth) = @_;
my $nocomp = 0; my $nocomp = 0;
@ -180,7 +180,7 @@ PVE::HTTPServer::register_formater('extjs', sub {
return ($raw, $ct, $nocomp); return ($raw, $ct, $nocomp);
}); });
PVE::HTTPServer::register_formater('htmljs', sub { PVE::HTTPServer::register_formatter('htmljs', sub {
my ($res, $data, $param, $path, $auth) = @_; my ($res, $data, $param, $path, $auth) = @_;
my $nocomp = 0; my $nocomp = 0;
@ -197,7 +197,7 @@ PVE::HTTPServer::register_formater('htmljs', sub {
}); });
PVE::HTTPServer::register_formater('spiceconfig', sub { PVE::HTTPServer::register_formatter('spiceconfig', sub {
my ($res, $data, $param, $path, $auth) = @_; my ($res, $data, $param, $path, $auth) = @_;
my $nocomp = 0; my $nocomp = 0;
@ -220,7 +220,7 @@ PVE::HTTPServer::register_formater('spiceconfig', sub {
return ($raw, $ct, $nocomp); return ($raw, $ct, $nocomp);
}); });
PVE::HTTPServer::register_formater('png', sub { PVE::HTTPServer::register_formatter('png', sub {
my ($res, $data, $param, $path, $auth) = @_; my ($res, $data, $param, $path, $auth) = @_;
my $nocomp = 1; my $nocomp = 1;
@ -245,7 +245,7 @@ PVE::HTTPServer::register_formater('png', sub {
return ($raw, $ct, $nocomp); return ($raw, $ct, $nocomp);
}); });
PVE::HTTPServer::register_formater('html', sub { PVE::HTTPServer::register_formatter('html', sub {
my ($res, $data, $param, $path, $auth) = @_; my ($res, $data, $param, $path, $auth) = @_;
my $nocomp = 0; my $nocomp = 0;

42
PVE/HTTPServer.pm
View File

@ -55,49 +55,49 @@ sub split_abs_uri {
return wantarray ? ($rel_uri, $format) : $rel_uri; return wantarray ? ($rel_uri, $format) : $rel_uri;
} }
# generic formater support # generic formatter support
my $formater_hash = {}; my $formatter_hash = {};
sub register_formater { sub register_formatter {
my ($format, $func) = @_; my ($format, $func) = @_;
die "formater '$format' already defined" if $formater_hash->{$format}; die "formatter '$format' already defined" if $formatter_hash->{$format};
$formater_hash->{$format} = { $formatter_hash->{$format} = {
func => $func, func => $func,
}; };
} }
sub get_formater { sub get_formatter {
my ($format) = @_; my ($format) = @_;
return undef if !$format; return undef if !$format;
my $info = $formater_hash->{$format}; my $info = $formatter_hash->{$format};
return undef if !$info; return undef if !$info;
return $info->{func}; return $info->{func};
} }
my $login_formater_hash = {}; my $login_formatter_hash = {};
sub register_login_formater { sub register_login_formatter {
my ($format, $func) = @_; my ($format, $func) = @_;
die "login formater '$format' already defined" if $login_formater_hash->{$format}; die "login formatter '$format' already defined" if $login_formatter_hash->{$format};
$login_formater_hash->{$format} = { $login_formatter_hash->{$format} = {
func => $func, func => $func,
}; };
} }
sub get_login_formater { sub get_login_formatter {
my ($format) = @_; my ($format) = @_;
return undef if !$format; return undef if !$format;
my $info = $login_formater_hash->{$format}; my $info = $login_formatter_hash->{$format};
return undef if !$info; return undef if !$info;
return $info->{func}; return $info->{func};
@ -496,9 +496,9 @@ sub handle_api2_request {
my ($rel_uri, $format) = split_abs_uri($path); my ($rel_uri, $format) = split_abs_uri($path);
my $formater = get_formater($format); my $formatter = get_formatter($format);
if (!defined($formater)) { if (!defined($formatter)) {
$self->error($reqstate, HTTP_NOT_IMPLEMENTED, "no such uri $rel_uri, $format"); $self->error($reqstate, HTTP_NOT_IMPLEMENTED, "no such uri $rel_uri, $format");
return; return;
} }
@ -554,13 +554,13 @@ sub handle_api2_request {
$delay = 0 if $delay < 0; $delay = 0 if $delay < 0;
} }
if ($res->{info} && $res->{info}->{formater}) { if ($res->{info} && $res->{info}->{formatter}) {
if (defined(my $func = $res->{info}->{formater}->{$format})) { if (defined(my $func = $res->{info}->{formatter}->{$format})) {
$formater = $func; $formatter = $func;
} }
} }
my ($raw, $ct, $nocomp) = &$formater($res, $res->{data}, $path, $auth); my ($raw, $ct, $nocomp) = &$formatter($res, $res->{data}, $path, $auth);
my $resp; my $resp;
if (ref($raw) && (ref($raw) eq 'HTTP::Response')) { if (ref($raw) && (ref($raw) eq 'HTTP::Response')) {
@ -1014,8 +1014,8 @@ sub unshift_read_header {
if (my $err = $@) { if (my $err = $@) {
# always delay unauthorized calls by 3 seconds # always delay unauthorized calls by 3 seconds
my $delay = 3; my $delay = 3;
if (my $formater = get_login_formater($format)) { if (my $formatter = get_login_formatter($format)) {
my ($raw, $ct, $nocomp) = &$formater($path, $auth); my ($raw, $ct, $nocomp) = &$formatter($path, $auth);
my $resp; my $resp;
if (ref($raw) && (ref($raw) eq 'HTTP::Response')) { if (ref($raw) && (ref($raw) eq 'HTTP::Response')) {
$resp = $raw; $resp = $raw;