From 6566a32f6a9f4245747a14b8a4c3794fa4a869a5 Mon Sep 17 00:00:00 2001
From: laci <laci@sse.hu>
Date: Mon, 21 Jul 2025 11:21:11 +0000
Subject: [PATCH] subtitle, vpn undefined fix

---
 common.js   | 5 +++--
 manage.html | 5 +++--
 scan.php    | 6 ++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/common.js b/common.js
index b28a758..8eeef64 100644
--- a/common.js
+++ b/common.js
@@ -10,6 +10,7 @@ function check_deployments() {
 	apps.length = 0; // reset
 	apps.push(...JSON.parse(data)); // push each element
 	console.log(apps);
+	document.getElementById('installAppsBtn').click();
 
 	// manage
 	html_data = '';
@@ -19,6 +20,7 @@ function check_deployments() {
 		service_name = data[k].name;
 		orig_service_name = data[k].orig_name;
 		version = data[k].version;
+		subtitle = data[k].subtitle;
 		installed = data[k].installed;
 		if (installed=='true') {
 			html_data += '<div><a href="#" onclick="reinstall(\''+service_name+'\',\''+service_name+'\')">'+orig_service_name+'</a> - '+version+' - INSTALLED</div>';
@@ -29,7 +31,6 @@ function check_deployments() {
 		html_data += '<div id="'+service_name+'" class="deployment"></div>';
 	}
 	jQuery("#deployments").html(html_data);
-	document.getElementById('installAppsBtn').click();
 
       }
   });
@@ -433,8 +434,8 @@ function get_proxy_html() {
 	<script>
 	jQuery('#vpn_save_btn').click(function() {
 		console.log('vpn save');
-		jQuery('#vpn').html('Loading...');
 		save_vpn();
+		jQuery('#vpn').html('Loading...');
 	});
 	</script>
         `;
diff --git a/manage.html b/manage.html
index 52d8703..2164a92 100644
--- a/manage.html
+++ b/manage.html
@@ -684,6 +684,7 @@
   </div>
   <div class="main" >
     <div id="myAppsContainer">
+	    Loading applications...
     </div>
     <div id="popup" class="popup hidden">
 	<div class="popup-content">
@@ -743,7 +744,7 @@
 		    else more = 'More';
 		    appDiv.innerHTML = `
 			<div class="app-img"><img src="${app.image}" alt="${app.name}" title="${app.orig_name} ${app.version}"></div>
-			<div class="app-label">${app.name} ${app.version}</div>
+			<div class="app-label">${app.subtitle}</div>
 			<div class="app-name">${app.orig_name}</div>
 			<button class="more-btn">${more}</button>
 		    `;
@@ -973,7 +974,7 @@
 <script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/popper.js@1.14.6/dist/umd/popper.min.js" integrity="sha384-wHAiFfRlMFy6i5SRaxvfOCifBUQy1xHdJ/yoi7FRNXMRBu5WHdZYu1hA6ZOblgut" crossorigin="anonymous"></script>
 <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.2.1/dist/js/bootstrap.min.js" integrity="sha384-B0UglyR+jN6CkvvICOB2joaf5I4l3gm9GU6Hc1og6Ls7i6U/mkkaduKaBhlAXv9k" crossorigin="anonymous"></script>
-<script src="common.js?t=12"></script>
+<script src="common.js?t=17"></script>
 </body>
 </html>
 
diff --git a/scan.php b/scan.php
index 7c24596..46880d8 100644
--- a/scan.php
+++ b/scan.php
@@ -146,12 +146,14 @@ switch ($_GET["op"]) {
                                                                 $orig_service_name = $service_name;
 								$service_name = strtolower($service_name);
 								$version = $content["version"];
+								$subtitle = $content["subtitle"];
+								if (empty($subtitle) || $subtitle == "null") $subtitle = "";
 								$icon = $content["icon"];
 								if (empty($icon) || $icon == "null") $icon = "img/default_logo.png"; // default icon image
 								if (array_key_exists($service_name,$data["INSTALLED_SERVICES"])) $installed = "true";
 								else $installed = "false";
 								if (!empty($deployments)) $deployments .= ", ";
-								$deployments .= '{"name": "'.$service_name.'", "orig_name": "'.$orig_service_name.'", "image": "'.$icon.'", "version": "'.$version.'", "installed": "'.$installed.'"}';
+								$deployments .= '{"name": "'.$service_name.'", "orig_name": "'.$orig_service_name.'", "image": "'.$icon.'", "version": "'.$version.'", "subtitle": "'.$subtitle.'", "installed": "'.$installed.'"}';
 							}
 							if (!empty($deployments)) $deployments = "[{$deployments}]";
 						}
@@ -190,7 +192,7 @@ switch ($_GET["op"]) {
 							    </div>
 							    <div class="text-content">
 							      <h1 class="title">'.$template->name.'</h1>
-							      <h2 class="subtitle">'.$template->title.'</h2>
+							      <h2 class="subtitle">'.$template->subtitle.'</h2>
 							      <p class="description">'.$template->description.'</p>
 							    </div>
 							  </div>