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

proxy: cleanup getting index method

Browse Source 
- improve variable definition/use locality
- avoid some if's for some (mostly boolean) assignments, just use an
  expression

As long as we don't go overboard with code golfing it to extremely
terse, shorter code is always more readable, especially if
definition/use happens not dozens of lines apart.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2023-04-22 09:47:29 +02:00
parent 919cfa29e1
commit f16342f37e
1 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
PVE/Service/pveproxy.pm
View File

@ -191,7 +191,7 @@ sub get_index {
my $lang;
my $username;
my $token = 'null';
my $theme = "";
my $theme = "auto";
if (my $cookie = $r->header('Cookie')) {
if (my $newlang = ($cookie =~ /(?:^|\s)PVELangCookie=([^;]*)/)[0]) {
@ -214,42 +214,22 @@ sub get_index {
}
}
if ($theme eq "") {
$theme = "auto"
}
if (!$lang) {
my $dc_conf = PVE::Cluster::cfs_read_file('datacenter.cfg');
$lang = $dc_conf->{language} // 'en';
}
$username = '' if !$username;
my $mobile = is_phone($r->header('User-Agent')) ? 1 : 0;
if (defined($args->{mobile})) {
$mobile = $args->{mobile} ? 1 : 0;
}
my $mobile = is_phone($r->header('User-Agent')) && (!defined($args->{mobile}) || $args->{mobile});
my $novnc = defined($args->{console}) && $args->{novnc};
my $xtermjs = defined($args->{console}) && $args->{xtermjs};
my $page = '';
my $template = Template->new({ABSOLUTE => 1});
my $langfile = 0;
if (-f "$basedirs->{i18n}/pve-lang-$lang.js") {
$langfile = 1;
}
my $langfile = -f "$basedirs->{i18n}/pve-lang-$lang.js" ? 1 : 0;
my $version = PVE::pvecfg::version();
my $wtversionraw = PVE::Tools::file_read_firstline("$basedirs->{widgettoolkit}/proxmoxlib.js");
my $wtversion;
if ($wtversionraw =~ m|^// (.*)$|) {
$wtversion = $1;
};
my $wtversion = $wtversionraw =~ m|^// (.*)$| ? $1 : '';
my $debug = $server->{debug};
if (exists $args->{debug}) {
@ -259,7 +239,7 @@ sub get_index {
my $vars = {
lang => $lang,
langfile => $langfile,
username => $username,
username => $username || '',
token => $token,
console => $args->{console},
nodename => $nodename,
@ -280,8 +260,11 @@ sub get_index {
$dir = "$basedirs->{manager}/touch";
}
$template->process("$dir/index.html.tpl", $vars, \$page)
|| die $template->error(), "\n";
my $page = '';
my $template = Template->new({ABSOLUTE => 1});
$template->process("$dir/index.html.tpl", $vars, \$page) || die $template->error(), "\n";
my $headers = HTTP::Headers->new(Content_Type => "text/html; charset=utf-8");
my $resp = HTTP::Response->new(200, "OK", $headers, $page);