From f16342f37e9a5cbbe9e0dcd6efc0a18b7217c059 Mon Sep 17 00:00:00 2001
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Sat, 22 Apr 2023 09:47:29 +0200
Subject: [PATCH] proxy: cleanup getting index method

- 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>
---
 PVE/Service/pveproxy.pm | 37 ++++++++++---------------------------
 1 file changed, 10 insertions(+), 27 deletions(-)

diff --git a/PVE/Service/pveproxy.pm b/PVE/Service/pveproxy.pm
index 566dc21b..62344021 100755
--- a/PVE/Service/pveproxy.pm
+++ b/PVE/Service/pveproxy.pm
@@ -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);