subtitle, vpn undefined fix

Dockerfile

@@ -69,12 +69,12 @@ RUN apk --no-cache add php${PHP_VERSION} \
     rm -rf /var/cache/apk/*
 
 COPY nginx.conf /etc/nginx/nginx.conf
-
 RUN mkdir -p /usr/share/nginx/html
 COPY *.html    /usr/share/nginx/html
 COPY *.php   /usr/share/nginx/html
 COPY *.css /usr/share/nginx/html
 COPY *.js /usr/share/nginx/html
+COPY img /usr/share/nginx/html/img
 RUN chown -R nginx:nginx /usr/share/nginx/html
 
 RUN mkdir -p /usr/share/nginx/html/shared

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 = '';
@@ -18,13 +19,14 @@ function check_deployments() {
 		console.log(data[k]);
 		service_name = data[k].name;
 		orig_service_name = data[k].orig_name;
-		content = data[k].content;
+		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> - '+content+' - INSTALLED</div>';
+			html_data += '<div><a href="#" onclick="reinstall(\''+service_name+'\',\''+service_name+'\')">'+orig_service_name+'</a> - '+version+' - INSTALLED</div>';
 		}
 		else {
-			html_data += '<div><a href="#" onclick="load_template(\''+service_name+'\',\''+service_name+'\')">'+orig_service_name+'</a> - '+content+'</div>';
+			html_data += '<div><a href="#" onclick="load_template(\''+service_name+'\',\''+service_name+'\')">'+orig_service_name+'</a> - '+version+'</div>';
 		}
 		html_data += '<div id="'+service_name+'" class="deployment"></div>';
 	}
@@ -109,12 +111,20 @@ function check_vpn() {
   jQuery.get(url, function(data) {
         console.log('check_vpn: '+data);
         if (data=="2") {
+		document.getElementById('vpnToggle').checked = true;
+  		document.querySelector(".switch-label").textContent = "ON";
           $('#vpn_off').hide();
           $('#vpn_on').show();
+          $('#pro_off').hide();
+          $('#pro_on').show();
         }
         else {
+		document.getElementById('vpnToggle').checked = false;
+  		document.querySelector(".switch-label").textContent = "OFF";
           $('#vpn_on').hide();
           $('#vpn_off').show();
+          $('#pro_on').hide();
+          $('#pro_off').show();
         }
         setTimeout(check_vpn, 10000);
   });
@@ -155,27 +165,35 @@ function get_updates() {
   });
 }
 
-function check_upgrade() {
+function check_upgrade(service) {
-  var url  = 'scan.php?op=check_upgrade';
+  var url  = 'scan.php?op=check_upgrade&service='+service;
   jQuery.get(url, function(data) {
-        console.log('check_upgrade: '+data);
+        console.log('check_upgrade '+service+': '+data);
-      if (data=="WAIT" || data=="") {
+      if (data!="") {
-        setTimeout(check_upgrade, 1000);
+              jQuery("#status_"+service).html(data);
+      }
+      if (data!="OK") {
+              setTimeout(check_upgrade, 1000, service);
       }
       else {
-              // TODO
+          console.log('upgrade end: '+service);
+	  jQuery("#status_"+service).html('Upgrade has finished');
+	  //get_updates();
       }
   });
+
 }
 
 function upgrade(service) {
   var url  = 'scan.php?op=upgrade&service='+service;
+  jQuery("#status_"+service).html('Upgrade has started');
   console.log('upgrade start: '+service);
   jQuery.get(url, function(data) {
-        console.log('upgrade end: '+service);
+          console.log('check_upgrade '+service+': '+data);
           if (data=="OK") {
-                setTimeout(check_upgrade, 1000);
+                setTimeout(check_upgrade, 1000, service);
           }
+	  else jQuery("#status_"+service).html(data);
   });
 }
 
@@ -258,6 +276,25 @@ function confirm_uninstall(additional) {
   });
 }
 
+function update_deployment(additional) {
+  //jQuery("#"+additional).html('Loading...');
+  pars = '';
+  jQuery('input.additional_'+additional).each(function(index) {
+	console.log('Field ' + $(this).attr('name') + ': ' + $(this).val());
+	//pars += '&'+$(this).attr('id') + '=' + $(this).val();
+	pars += '&'+$(this).attr('name') + '=' + $(this).val();
+  });
+  //console.log(pars);
+  var url  = 'scan.php?op=edit&additional='+additional+pars;
+  jQuery.get(url, function(data) {
+        console.log('edit '+additional+': '+data);
+          if (data!="") {
+                jQuery("#"+additional).html(data);
+                setTimeout(check_deployment, 1000, additional);
+          }
+  });
+}
+
 function request_letsencrypt(domain) {
   var url  = 'scan.php?op=request_letsencrypt&domain='+domain;
   jQuery.get(url, function(data) {
@@ -350,6 +387,61 @@ function get_services() {
   });
 }
 
+function get_proxy_html() {
+        proxy_html = `
+	<fieldset>
+	<legend>Enable proxy</legend>
+        <div class="input-group">
+	<form class="form-install" action="#" method="post" id="save_vpn">
+		<div class="row">
+		    <div class="mb-3">
+				<label for="vpn_domain">Please add domain url to download the VPN hash from (default: https://portal.safebox.network):</label>
+				<input type="text" class="form-control" name="VPN_DOMAIN" id="vpn_domain" value="https://portal.safebox.network">
+				<div class="invalid-feedback">
+				Please enter a valid domain.
+				</div>
+		    </div>
+		</div>
+		<div class="row">
+		    <div class="mb-3">
+				<label for="vpn_pass">Please type in the generated VPN passkey (8 digits):</label>
+				<input type="text" class="form-control" name="VPN_PASS" id="vpn_pass" value="" maxlength="8" size="10">
+		    </div>
+		</div>
+		<div class="row">
+		    <div class="mb-3">
+				<label for="letsencrypt_mail">Please add the letsencrypt mail address:</label>
+				<input type="email" class="form-control" name="LETSENCRYPT_MAIL" id="letsencrypt_mail" value="">
+				<div class="invalid-feedback">
+				Please enter a valid email.
+				</div>
+		    </div>
+		</div>
+		<div class="row">
+		    <div class="mb-3">
+				<label for="letsencrypt_servername">Please add letsencrypt server name (default is letsencrypt but you can add zerossl too):</label>
+				<input type="text" class="form-control" name="LETSENCRYPT_SERVERNAME" id="letsencrypt_servername" value="letsencrypt">
+		    </div>
+		</div>
+		<div class="row buttons">
+		    <div class="mb-3">
+			<button class="btn btn-lg btn-primary btn-block" type="button" id="vpn_save_btn"> Save </button>
+		    </div>
+		</div>
+	</form>
+	</div>
+	</fieldset>
+	<script>
+	jQuery('#vpn_save_btn').click(function() {
+		console.log('vpn save');
+		save_vpn();
+		jQuery('#vpn').html('Loading...');
+	});
+	</script>
+        `;
+	jQuery("#vpn").html(proxy_html);
+}
+
 function check_containers() {
   var url  = 'scan.php?op=check_containers';
   jQuery.get(url, function(data) {

functions.php

@@ -141,23 +141,24 @@ function show_service($name, $containers) {
 }
 
 function show_service_update($name, $update, $uptodate, $error) {
-	$str = '<table id="update_'.$name.'">';
-	$str .= "<tr><th>{$name}</th></tr>";
 
+	$str = "";
 	$update = trim($update);
 	if (!empty($update)) {
 		$arr = explode(" ",$update);
 		foreach ($arr as $container) {
-			$str .= "<tr><td>&nbsp;</td><td>".$container."</td><td>UPDATE AVAILABLE</td><td><a href=\"#\" onclick=\"upgrade('{$name}')\">UPDATE</a></td></tr>";
+			$str .= "<tr><td>&nbsp;</td><td>".$container."</td><td><div id=\"status_".$name."\">UPDATE AVAILABLE</div></td><td>&nbsp;</td></tr>";
 		}
+		$update_str = "<a href=\"javascript:void(0)\" onclick=\"upgrade('{$name}')\">UPDATE</a>";
 	}
 
 	$uptodate = trim($uptodate);
 	if (!empty($uptodate)) {
 		$arr = explode(" ",$uptodate);
 		foreach ($arr as $container) {
-			$str .= "<tr><td>&nbsp;</td><td>".$container."</td><td>Already up to date</td><td><a href=\"#\" onclick=\"upgrade('{$name}')\">FORCE UPDATE</a></td></tr>";
+			$str .= "<tr><td>&nbsp;</td><td>".$container."</td><td><div id=\"status_".$name."\">Already up to date</div></td><td>&nbsp;</td></tr>";
 		}
+		$update_str = "<a href=\"javacript:void(0)\" onclick=\"upgrade('{$name}')\">FORCE UPDATE</a>";
 	}
 
         $error = trim($error);
@@ -165,13 +166,15 @@ function show_service_update($name, $update, $uptodate, $error) {
                 $arr = explode(" ",$error);
                 foreach ($arr as $container) {
                         //$str .= "<tr><td>&nbsp;</td><td>".$container."</td><td>N/A</td><td></td></tr>";
-                        $str .= "<tr><td>&nbsp;</td><td>".$container."</td><td>N/A</td><td><a href=\"#\" onclick=\"upgrade('{$name}')\">TRY UPDATE</a></td></tr>";
+                        $str .= "<tr><td>&nbsp;</td><td>".$container."</td><td><div id=\"status_".$name."\">N/A</div></td><td>&nbsp;</td></tr>";
                 }
+		$update_str = "<a href=\"javascript:void(0)\" onclick=\"upgrade('{$name}')\">TRY UPDATE</a>";
         }
 
-	$str .= '</table>';
+	echo '<table id="update_'.$name.'">';
-
+	echo "<tr><th>{$name}</th><th>&nbsp;</th><th>&nbsp;</th><th>{$update_str}</th></tr>";
 	echo $str;
+	echo '</table>';
 }
 
 // not in use

installer.css

@@ -1,5 +1,5 @@
 .hidden {display:none}
-fieldset {border: 1px solid  #049dff; padding-left: 40px; padding-right: 20px}
+fieldset {border: 1px solid  #049dff; padding-left: 40px; padding-right: 20px; border-radius: 10px; width: 100%}
 legend {width: auto;text-align: left !important; padding: 10px; color: #049dff;}
 fieldset.sub_block {border: 1px solid black; margin:-20px 0px 20px -15px}
 fieldset.sub_block legend {color: black}
@@ -132,3 +132,55 @@ body#scan{
     transform: rotate(135deg);
   }
 }
+
+    .info-container {
+      position: relative;
+      display: inline-block;
+      font-family: Arial, sans-serif;
+    }
+
+    .info-icon {
+      background-color: #007BFF;
+      color: white;
+      border-radius: 50%;
+      padding: 4px 8px;
+      cursor: pointer;
+      font-weight: bold;
+      font-size: 14px;
+      text-align: center;
+      line-height: 1;
+      display: inline-block;
+    }
+
+    .tooltip {
+      visibility: hidden;
+      background-color: #333;
+      color: #fff;
+      text-align: left;
+      border-radius: 4px;
+      padding: 8px;
+      position: absolute;
+      z-index: 1;
+      bottom: 125%; /* above the icon */
+      left: 50%;
+      transform: translateX(-50%);
+      opacity: 0;
+      transition: opacity 0.3s;
+      white-space: nowrap;
+    }
+
+    .tooltip::after {
+      content: "";
+      position: absolute;
+      top: 100%; /* bottom of tooltip */
+      left: 50%;
+      margin-left: -5px;
+      border-width: 5px;
+      border-style: solid;
+      border-color: #333 transparent transparent transparent;
+    }
+
+    .info-container:hover .tooltip {
+      visibility: visible;
+      opacity: 1;
+    }

manage2.html

@@ -39,6 +39,9 @@
 	label {text-align: left !important;}
 	a, a:hover, a:visited {color: orange}
 
+	fieldset {border: 1px solid  #ffffff; padding-left: 20px; padding-right: 20px; border-radius: 10px;}
+	legend {width: auto;text-align: left !important; padding: 10px; color: #ffffff;}
+
         .profile {
             display: flex;
             flex-direction: column;
@@ -101,6 +104,11 @@
         .toggle.active::after {
             transform: translateX(20px);
         }
+        div#themeToggle {
+		position: fixed;
+		top: 10px;
+		right: 10px;
+        }
         .buttons {
             display: flex;
             justify-content: center;
@@ -109,7 +117,8 @@
             cursor: pointer;
         }
         .buttons button {
-            padding: 10px 20px;
+            min-width: 150px;
+            padding: 10px 10px;
             background: none;
             border: 1px solid var(--button-border);
             border-radius: 10px;
@@ -120,17 +129,46 @@
 		color: orange;
             	border: 1px solid orange;
         }
+        .left-buttons {
+            display: flex;
+            justify-content: center;
+            gap: 10px;
+            margin: 20px 0;
+            cursor: pointer;
+        }
+        .left-buttons button {
+            min-width: 120px;
+            padding: 5px 5px;
+            background: none;
+            border: 1px solid var(--button-border);
+            border-radius: 10px;
+            cursor: pointer;
+            color: var(--text-color);
+        }
+        .container-frame {
+		border: 1px solid;
+            	border-radius: 10px;
+		padding: 0px;
+		margin: 5px;
+		height: 98vh;
+        }
         .container {
 		clear:both;
 		float:none;
+		padding-bottom: 10px;
+		margin: 5px;
+		height: 88vh;
         }
         .leftside {
 		float:left;
-		width:20%;
+		width:10%;
         }
         .rightside {
 		float:right;
-		width:80%;
+		width:90%;
+		display: flex;
+		flex-direction: column;
+		height: 88vh;
         }
         .my-apps {
             flex: 1;
@@ -141,12 +179,17 @@
             justify-content: flex-start;
             align-items: flex-start;
             gap: 40px;
-            min-width: 92%;
+            min-width: 96%;
-            max-width: 92%;
+            max-width: 96%;
             margin: 0 auto;
             border-radius: 10px;
             box-sizing: border-box;
         }
+        .my-apps-container {
+            width:100%;
+            display: flex;
+            flex-wrap: wrap;
+        }
         .app {
             display: flex;
             flex-direction: column;
@@ -160,13 +203,21 @@
             object-fit: contain;
             margin-bottom: 10px;
         }
+        .innerDiv {
+            width:100%;
+        }
         footer {
+	    position: fixed;
+	    bottom: 0;
+	    left: 0;
+	    width: 97%;
             display: flex;
             justify-content: space-between;
             align-items: center;
             padding: 20px;
             font-size: 14px;
-        }
+	    z-index: 1000;
+	}
         .footer-links {
             display: flex;
             gap: 15px;
@@ -265,6 +316,7 @@
         }
 
         .input-group input {
+		min-width:260px;
             margin-top: 5px;
             margin-bottom: 5px;
             padding: 5px;
@@ -367,7 +419,69 @@
         [data-theme="dark"] .custom-select {
             background-image: url("data:image/svg+xml;charset=US-ASCII,%3Csvg xmlns='http://www.w3.org/2000/svg' width='14' height='10' viewBox='0 0 14 10'%3E%3Cpolyline points='1 1 7 7 13 1' style='fill:none;stroke:white;stroke-width:2' /%3E%3C/svg%3E");
         }
-        
+
+
+        #popup .input-group {
+            display: block;
+        }
+
+        #popup .row {
+            display: flex;
+        }
+
+	.info-container {
+		position: relative;
+		display: inline-block;
+		font-family: Arial, sans-serif;
+		margin: 5px 0px 0px 5px;
+	}
+
+    .info-icon {
+      background-color: #007BFF;
+      color: white;
+      border-radius: 50%;
+      padding: 4px 8px;
+      cursor: pointer;
+      font-weight: bold;
+      font-size: 14px;
+      text-align: center;
+      line-height: 1;
+      display: inline-block;
+    }
+
+    .tooltip {
+      visibility: hidden;
+      background-color: #333;
+      color: #fff;
+      text-align: left;
+      border-radius: 4px;
+      padding: 8px;
+      position: absolute;
+      z-index: 1;
+      bottom: 125%; /* above the icon */
+      left: 50%;
+      transform: translateX(-50%);
+      opacity: 0;
+      transition: opacity 0.3s;
+      white-space: nowrap;
+    }
+
+    .tooltip::after {
+      content: "";
+      position: absolute;
+      top: 100%; /* bottom of tooltip */
+      left: 50%;
+      margin-left: -5px;
+      border-width: 5px;
+      border-style: solid;
+      border-color: #333 transparent transparent transparent;
+    }
+
+    .info-container:hover .tooltip {
+      visibility: visible;
+      opacity: 1;
+    }
+
         @media (max-width: 768px) {
             header {
                 flex-direction: column;
@@ -422,6 +536,7 @@
 </head>
 <body>
 
+<div class="container-frame">
 <div class="container">
 <div class="leftside">
     <div class="logo">
@@ -434,17 +549,19 @@
 	<!--<img src="image.png" alt="Profilkép">-->
         <div id="vpnBtn">Pro</div>
     </div>
-	<div class="buttons">
+    <div style="text-align:center">
+	Proxy&nbsp;status
+	<span id="vpn_on" class="hidden green"><b>ON</b></span>
+	<span id="vpn_off" class="hidden red"><b>OFF</b></span>
+    </div>
+	<div class="left-buttons">
 	 	<button id="servicesBtn">Services</button>
 	</div>
     	<div class="settings">Settings</div>
-	<div class="buttons">
+	<div class="left-buttons">
-		<button id="updatesBtn">Updates</button>
-	</div>
-	<div class="buttons">
 		<button id="repositoriesBtn">Repositories</button>
 	</div>
-	<div class="buttons">
+	<div class="left-buttons">
 		<button id="systemservicesBtn">System services</button>
 	</div>
 	<br>
@@ -461,13 +578,14 @@
 	<div class="buttons">
 	    <button id="myAppsBtn">My Apps</button>
 	    <button id="installAppsBtn">Install Apps</button>
+	    <button id="updatesBtn">Updates</button>
 	    <button id="backupBtn">Backup</button>
 	    <button id="diskBtn">Disk Management</button>
 	    <button id="monitorBtn">Monitor</button>
 	    <div class="toggle" id="themeToggle"></div>
 	</div>
 
-	<div class="my-apps" id="myAppsContainer"></div>
+	<div class="my-apps"><div id="myAppsContainer" class="my-apps-container"></div></div>
 </div>
 </div>
 
@@ -488,7 +606,8 @@
 
     <div class="footer-center">
         <p>Want to access your services remotely?</p>
-        <p><strong><a href="#">Go Pro!</a></strong></p>
+        <p class="hidden" id="pro_off"><strong><a href="#">Get Pro!</a></strong></p>
+        <p class="hidden" id="pro_on"><strong><a href="#">Pro settings</a></strong></p>
     </div>
 
     <div class="footer-social">
@@ -497,6 +616,8 @@
     </div>
 </footer>
 
+</div>
+
 <script>
     const toggle = document.getElementById('themeToggle');
     toggle.addEventListener('click', () => {
@@ -543,10 +664,10 @@
 		    const appDiv = document.createElement('div');
 		    appDiv.className = 'app';
 		    appDiv.innerHTML = `
-			<img src="${app.image}" alt="${app.name}" title="${app.orig_name}">${app.orig_name}
+			<img src="${app.image}" alt="${app.name}" title="${app.orig_name} ${app.version}">${app.orig_name}
 		    `;
 		    appDiv.addEventListener('click', () => {
-			popupText.textContent = `You clicked on ${app.name}!`;
+			    popupText.textContent = `You clicked on ${app.name} ${app.version}!`;
 			if (app.installed=='true') reinstall(app.name, 'popupText');
 			else load_template(app.name,'popupText');
 			popup.classList.remove('hidden');
@@ -599,53 +720,16 @@
 
     function renderVPN() {
         myAppsContainer.innerHTML = `
-	<fieldset>
+            <div id="vpn" class="innerDiv">
-	<legend>Enable proxy</legend>
+	    Loading...
-	<form class="form-install" action="#" method="post" id="save_vpn">
+            </div>
-		<div class="row">
-		    <div class="mb-3">
-				<label for="vpn_domain">Please add domain url to download the VPN hash from (default: https://portal.safebox.network):</label>
-				<input type="text" class="form-control" name="VPN_DOMAIN" id="vpn_domain" value="https://portal.safebox.network">
-				<div class="invalid-feedback">
-				Please enter a valid domain.
-				</div>
-		    </div>
-		</div>
-		<div class="row">
-		    <div class="mb-3">
-				<label for="vpn_pass">Please type in the generated VPN passkey (8 digits):</label>
-				<input type="text" class="form-control" name="VPN_PASS" id="vpn_pass" value="" maxlength="8" size="10">
-		    </div>
-		</div>
-		<div class="row">
-		    <div class="mb-3">
-				<label for="letsencrypt_mail">Please add the letsencrypt mail address:</label>
-				<input type="email" class="form-control" name="LETSENCRYPT_MAIL" id="letsencrypt_mail" value="">
-				<div class="invalid-feedback">
-				Please enter a valid email.
-				</div>
-		    </div>
-		</div>
-		<div class="row">
-		    <div class="mb-3">
-				<label for="letsencrypt_servername">Please add letsencrypt server name (default is letsencrypt but you can add zerossl too):</label>
-				<input type="text" class="form-control" name="LETSENCRYPT_SERVERNAME" id="letsencrypt_servername" value="letsencrypt">
-		    </div>
-		</div>
-		<div class="row">
-		    <div class="mb-3">
-			<button class="btn btn-lg btn-primary btn-block" type="submit" id="vpn_save_btn"> Save </button> &nbsp;
-			<button class="btn btn-lg btn-primary btn-block" type="button" id="vpn_cancel_btn"> Cancel </button>
-		    </div>
-		</div>
-	</form>
-	</fieldset>
         `;
+	get_proxy_html();
     }
 
     function renderServices() {
         myAppsContainer.innerHTML = `
-            <div id="services">
+            <div id="services" class="innerDiv">
 	    Loading...
             </div>
         `;
@@ -654,7 +738,7 @@
 
     function renderUpdates() {
         myAppsContainer.innerHTML = `
-            <div id="updates">
+            <div id="updates" class="innerDiv">
 	    Looking for updates... Please wait...
             </div>
         `;
@@ -743,6 +827,6 @@
 <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=4"></script>
+<script src="common.js?t=9"></script>
 </body>
 </html>

manage_old.html

@@ -0,0 +1,157 @@
+<!doctype html>
+<html lang="en">
+<head>
+<!-- Required meta tags -->
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+<title>INSTALLER TOOL</title>
+<!-- Bootstrap CSS -->
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.2.1/dist/css/bootstrap.min.css" integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
+<!-- Custom styles for this template -->
+<link href="installer.css?t=7" rel="stylesheet">
+</head>
+<body id="manage" class="text-center">
+<div class="container-fluid">
+<div class="col-md-12">
+
+<h1>Found deployed environment</h1>
+
+<div style="text-align:left;float:left;width:33%">
+	<a href="javascript:void()" id="vpn_btn">VPN</a>
+        Status:
+	<span id="vpn_on" class="hidden green"><b>ON</b></span>
+	<span id="vpn_off" class="hidden red"><b>OFF</b></span>
+</div>
+<div style="text-align:center;float:left;width:34%">
+        <a href="manage.html" id="refresh_btn">REFRESH</a>
+        /
+	<a href="manage2.html" id="new_btn">NEW DESIGN</a>
+</div>
+<div style="text-align:right;float:right">
+	<a href="javascript:void()" id="settings_btn">SETTINGS</a>
+</div>
+<div style="float:none;clear:both"/>
+
+<div id="vpn" class="hidden">
+	<fieldset>
+	<legend>Enable proxy</legend>
+	<form class="form-install" action="#" method="post" id="save_vpn">
+		<div class="row">
+		    <div class="mb-3">
+				<label for="vpn_domain">Please add domain url to download the VPN hash from (default: https://portal.safebox.network):</label>
+				<input type="text" class="form-control" name="VPN_DOMAIN" id="vpn_domain" value="https://portal.safebox.network">
+				<div class="invalid-feedback">
+				Please enter a valid domain.
+				</div>
+		    </div>
+		</div>
+		<div class="row">
+		    <div class="mb-3">
+				<label for="vpn_pass">Please type in the generated VPN passkey (8 digits):</label>
+				<input type="text" class="form-control" name="VPN_PASS" id="vpn_pass" value="" maxlength="8" size="10">
+		    </div>
+		</div>
+		<div class="row">
+		    <div class="mb-3">
+				<label for="letsencrypt_mail">Please add the letsencrypt mail address:</label>
+				<input type="email" class="form-control" name="LETSENCRYPT_MAIL" id="letsencrypt_mail" value="">
+				<div class="invalid-feedback">
+				Please enter a valid email.
+				</div>
+		    </div>
+		</div>
+		<div class="row">
+		    <div class="mb-3">
+				<label for="letsencrypt_servername">Please add letsencrypt server name (default is letsencrypt but you can add zerossl too):</label>
+				<input type="text" class="form-control" name="LETSENCRYPT_SERVERNAME" id="letsencrypt_servername" value="letsencrypt">
+		    </div>
+		</div>
+		<div class="row">
+		    <div class="mb-3">
+			<button class="btn btn-lg btn-primary btn-block" type="submit" id="vpn_save_btn"> Save </button> &nbsp;
+			<button class="btn btn-lg btn-primary btn-block" type="button" id="vpn_cancel_btn"> Cancel </button>
+		    </div>
+		</div>
+	</form>
+	</fieldset>
+	<br>
+</div>
+
+<div id="settings" class="hidden">
+	<fieldset>
+	<legend>Repositories</legend>
+		<div id="repositories" style="text-align:left">Loading...</div>
+
+		<hr>
+		<form class="form-install" action="#" method="post" id="add_repo">
+		<div class="row">
+		    <div class="mb-3" style="text-align:left">
+			<label for="registry">Please add a new GIT repository URL: </label>
+			<input type="registry" class="form-control" name="repository" id="repository" size="100" value="" required>
+			<div class="invalid-feedback">
+			Please enter a valid repository url.
+			</div>
+		    </div>
+		</div>
+		<div class="row">
+		    <div class="mb-3">
+			<button class="btn btn-lg btn-primary btn-block" type="submit" id="repo_add_btn"> Add </button>
+		    </div>
+		</div>
+		</form>
+	</fieldset>
+
+	<fieldset>
+	<legend>System services</legend>
+	<div id="system" style="text-align:left">Loading...</div>
+	</fieldset>
+	
+	<fieldset>
+	<legend>Updates</legend>
+	<div style="text-align:left">
+		<a href="javascript:void()" id="update_btn">Search for updates</a>
+	</div>
+	<div id="updates" style="text-align:left">
+	</div>
+	</fieldset>
+	<br>
+</div>
+
+<div id="default">
+
+	<fieldset>
+	<legend><a href="javascript:void()" id="deployments_btn">Deployments</a></legend>
+	<div id="deployments" style="text-align:left">Loading...</div>
+	</fieldset>
+
+	<fieldset>
+	<legend><a href="javascript:void()" id="services_btn">Services</a></legend>
+	<div id="services" style="text-align:left;display:none;">Loading...</div>
+	</fieldset>
+
+	<fieldset>
+	<legend>Disk management</legend>
+	</fieldset>
+
+	<fieldset>
+	<legend>Monitor</legend>
+	</fieldset>
+
+</div>
+
+</div>
+</div>
+<br>
+<br>
+<script>
+    // apps array beállítása common.js-ben
+    const apps = []; // GLOBAL VARIABLE
+</script>
+<!-- Optional JavaScript -->
+<!-- jQuery first, then Popper.js, then Bootstrap JS -->
+<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=5"></script>
+</body>
+</html>

scan.php

@@ -144,12 +144,16 @@ switch ($_GET["op"]) {
 						else {
 							foreach ($data["DEPLOYMENTS"] as $service_name => $content) {
                                                                 $orig_service_name = $service_name;
-                                                                $service_name = strtolower($service_name);
+								$service_name = strtolower($service_name);
-                                                                //echo base64_decode($content);
+								$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": "image.png", "content": "'.$content.'", "installed": "'.$installed.'"}';
+								$deployments .= '{"name": "'.$service_name.'", "orig_name": "'.$orig_service_name.'", "image": "'.$icon.'", "version": "'.$version.'", "subtitle": "'.$subtitle.'", "installed": "'.$installed.'"}';
 							}
 							if (!empty($deployments)) $deployments = "[{$deployments}]";
 						}
@@ -178,13 +182,29 @@ switch ($_GET["op"]) {
 				if ($key=="deployment") {
 					if ($data["STATUS"]=="0") { // ask
 						$template = json_decode(base64_decode($data["TEMPLATE"]));
-						echo "<fieldset><form action=\"#\" method=\"post\" id=\"deploy_{$template->name}_form\"><br>";
+
-						echo '<div id="letsencrypt">';
+						echo '
+						<div class="app-details">
+							<div class="header-block">
+							  <div class="logo-and-text">
+							    <div class="applogo">
+								<img src="'.$template->icon.'">
+							    </div>
+							    <div class="text-content">
+							      <h1 class="title">'.$template->name.'</h1>
+							      <h2 class="subtitle">'.$template->subtitle.'</h2>
+							      <p class="description">'.$template->description.'</p>
+							    </div>
+							  </div>
+							  <button id="updatesBtn" class="notification-btn"><i class="fas fa-bell"></i> Notification</button>
+							</div>
+						';
 						if ($reinstall) {
+							echo '<div id="letsencrypt">';
 							//var_dump($template);
                                                         $letsencrypt = check_letsencrypt();
-							if (empty($letsencrypt)) echo "LETSENCRYPT file doesn't exists...";
+							if (empty($letsencrypt)) echo "LETSENCRYPT file doesn't exists...<br><br>";
-							elseif ($letsencrypt=="ERROR") echo "LETSENCRYPT file: read JSON error...";
+							elseif ($letsencrypt=="ERROR") echo "LETSENCRYPT file: read JSON error...<br><br>";
 							else {
 								$domain = "";
 								foreach ($template->fields as $field) {
@@ -192,23 +212,47 @@ switch ($_GET["op"]) {
 								}
 								if (!empty($domain)) show_letsencrypt($letsencrypt, $domain);
 							}
+							echo '</div>';
 						}
-						echo '</div>';
+						echo "<form action=\"#\" method=\"post\" id=\"deploy_{$template->name}_form\">";
+						echo "<div class=\"app-fields\">";
 						foreach ($template->fields as $field) {
+							echo "<div class=\"app-field ".($field->advanced ? "advanced" : "")."\">";
+							if (!empty($field->title)) echo "<div class=\"row\"><h3>".$field->title."</h3></div>";
 							if (isset($field->generated)) {
-								echo "<input type=\"hidden\" value=\"generated:{$field->generated}\" name=\"{$field->key}\" id=\"{$template->name}_{$field->key}\" class=\"additional_{$template->name}\">";
+								echo "<input type=\"hidden\" value=\"generated:{$field->generated}:{$field->value}\" name=\"{$field->key}\" id=\"{$template->name}_{$field->key}\" class=\"additional_{$template->name}\">";
 							}
 							else {
-							echo "<div class=\"row\"><div class=\"mb-3\"><label>".$field->description."</label>
+								echo "<div class=\"row\">";
-								<input ".($field->required=="true" ? "required" : "")." type=\"".(!empty($field->type) ? $field->type : "text")."\" value=\"{$field->value}\" name=\"{$field->key}\" id=\"{$template->name}_{$field->key}\" class=\"additional_{$template->name}\">
+								echo "<label>".$field->description."</label>
-							</div></div>";
+								<div class=\"input-container\"><input ".($field->required=="true" ? "required" : "")." type=\"".(!empty($field->type) ? $field->type : "text")."\" value=\"{$field->value}\" name=\"{$field->key}\" id=\"{$template->name}_{$field->key}\" class=\"additional_{$template->name}\"></div>
+								<div class=\"info-container\">
+								";
+								if (!empty($field->info)) echo "
+									  <span class=\"info-icon\">i</span>
+									  <div class=\"tooltip\">{$field->info}</div>
+								";
+								echo "</div>";
+								echo "</div>";
+								if (!empty($field->details)) echo "<div class=\"row\"><i>".$field->details."</i></div>";
 							}
+							echo "</div>";
 						}
+						echo "</div>";
 
-
+                                                echo "<div class=\"row buttons\">";
-                                                echo "
+						echo "
-                                                <div class=\"row buttons\">
+						<div class=\"mb-3\">
-                                                <div class=\"mb-3\">
+						<button class=\"btn btn-lg btn-primary btn-block\" type=\"button\" id=\"more_{$template->name}_btn\">More</button>
+						</div>";
+						if ($reinstall) {
+							echo "
+                                                	<div class=\"mb-3\" style=\"margin-left:30px;\">
+							<button class=\"btn btn-lg btn-primary btn-block\" type=\"submit\" id=\"update_{$template->name}_btn\" onclick=\"update_deployment('{$template->name}')\">Update</button>
+							</div>";
+						}
+						echo "
+                                                <div class=\"mb-3\" style=\"margin-left:30px;\">
                                                 <button class=\"btn btn-lg btn-primary btn-block\" type=\"submit\" id=\"deploy_{$template->name}_btn\">".($reinstall ? "Reinstall" : "Install")."</button>
                                                 </div>";
 						if ($reinstall) {
@@ -217,20 +261,30 @@ switch ($_GET["op"]) {
 							<button class=\"btn btn-lg btn-primary btn-block\" type=\"button\" id=\"uninstall_{$template->name}_btn\" onclick=\"uninstall('{$template->name}')\">Uninstall</button>
 							</div>";
 						}
-						echo "<div class=\"mb-3\" style=\"margin-left:30px;\">
+						echo "<div class=\"mb-3\" style=\"margin-left:230px;float:\">
 						<button class=\"btn btn-lg btn-primary btn-block\" type=\"button\" id=\"cancel_{$template->name}_btn\">Cancel</button>
-						</div>";
+						</div>"; // buttons
                                                 echo "
                                                 </div>
-                                                </form></fieldset>
+						</form>
+						</div>
 <script>
+        jQuery('.advanced').each(function() {
+                jQuery(this).hide();
+        });
+        jQuery('#more_{$template->name}_btn').click(function() {
+		jQuery('.advanced').each(function() {
+			jQuery(this).toggle();
+		});
+        });
 	jQuery('#deploy_{$template->name}_form').submit(function() {
 		".($reinstall ? "redeploy" : "deploy")."('{$template->name}');
 		return false;
 	});
         jQuery('#cancel_{$template->name}_btn').click(function() {
-                $('div#{$template->name}').html('');
+                jQuery('div#{$template->name}').html('');
-    		document.getElementById('popup').classList.add('hidden'); // manage2 
+    		document.getElementById('myAppsContainer').classList.remove('hidden'); // manage3
+    		document.getElementById('popup').classList.add('hidden'); // manage2
         });
 </script>
 						";
@@ -280,6 +334,7 @@ switch ($_GET["op"]) {
 			show_letsencrypt($letsencrypt, $domain);
 		}
 	break;
+	case "edit": // update deployment after edit
 	case "redeploy":
 	case "deploy":
 		if ($key=check_deploy($_GET["additional"])) { 
@@ -294,6 +349,11 @@ switch ($_GET["op"]) {
 			foreach ($fields as $field_key => $field_value) {
 				$field_arr = explode(":",$field_value);
 				if ($field_arr[0]=="generated") {
+					if ($_GET["op"]=="edit") {
+						$fields[$field_key] = $field_arr[2]; // replace with previously stored value
+						continue; // do NOT regenerate values
+					}
+
 					if (intval($field_arr[3])==0) $len = 10; // default length
 					else $len = $field_arr[3];
 
@@ -380,23 +440,51 @@ switch ($_GET["op"]) {
                 echo $text;
         break;
         case "check_upgrade":
-                $arr = check_response("upgrade");
+                $arr = check_deploy($_GET["service"]);
-                if (!empty($arr)) {
+                if (!empty($arr)) { // deployment in progress
                         foreach ($arr as $key=>$data) {
-                                if ($key=="upgrade") {
+                                if ($key=="deploy-".$_GET["service"]) {
-                                        var_dump($arr);
+                                        if ($data["STATUS"]=="1") {
-                                        //remove_response("$key");
+                                                echo "Install in progress... You can't uninstall while in progress...";
+                                        }
+                                        elseif ($data["STATUS"]=="2") {
+                                                echo "Install has finished... You can upgrade now.";
+						//echo "<script>get_deployments();</script>";
+                                                remove_response("$key");
+                                        }
                                 }
                         }
                 }
-                else echo "WAIT";
+		else { // no upgrade in progress -> upgrade
+                        $key = "upgrade-".$_GET["service"];
+                        $arr = check_response($key);
+                        if (!empty($arr)) {
+                                $data = $arr[$key];
+                                if ($data["STATUS"]=="1") {
+                                        echo "Upgrade in progress... Please wait... ".date("Y-m-d H:i:s");
+                                }
+                                elseif ($data["STATUS"]=="2") {
+                                        echo "OK";
+                                        remove_response("$key");
+                                }
+                        }
+                        else echo "Upgrade in progress... Please wait...";
+                }
         break;
         case "upgrade":
-                $arr = array("NAME" => $_GET["service"], "ACTION" => "upgrade");
+                if ($key=check_deploy($_GET["service"])) {
-                $json = json_encode($arr, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT);
+                        $text="Deploy/uninstall of {$_GET["service"]} has started. Please wait...";
+                }
+                else {
+                        //$text="Deploy/uninstall of {$_GET["service"]} in progress... Please wait...";
 
-                if (set_output("upgrade",$json)) echo "OK";
+			$arr = array("NAME" => $_GET["service"], "ACTION" => "upgrade");
-                else echo "ERROR";
+			$json = json_encode($arr, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT);
+
+			if (set_output("upgrade",$json)) $text = "OK";
+			else $text = "ERROR";
+                }
+                echo $text;
         break;
 	case "repositories":
 		$arr = array("STATUS" => 0);