restore original design

new template fields
new design changes
2025-05-23 12:12:09 +00:00 · 2025-05-21 07:42:04 +00:00 · 2025-05-19 06:11:42 +00:00 · 2025-05-16 08:52:20 +00:00 · 2025-05-13 07:10:42 +00:00 · 2025-05-07 16:17:50 +00:00
7 changed files with 479 additions and 76 deletions
--- a/13
+++ b/13
@@ -71,15 +71,10 @@ RUN apk --no-cache add php${PHP_VERSION} \
 COPY nginx.conf /etc/nginx/nginx.conf

 RUN mkdir -p /usr/share/nginx/html
-COPY index.html    /usr/share/nginx/html
-COPY scan.html   /usr/share/nginx/html
-COPY manage.html   /usr/share/nginx/html
-COPY scan.php   /usr/share/nginx/html
-COPY letsencrypt_log.php   /usr/share/nginx/html
-COPY functions.php   /usr/share/nginx/html
-COPY install.html  /usr/share/nginx/html
-COPY install.php   /usr/share/nginx/html
-COPY installer.css /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
 RUN chown -R nginx:nginx /usr/share/nginx/html

 RUN mkdir -p /usr/share/nginx/html/shared
--- a/common.js
+++ b/common.js
@@ -155,27 +155,35 @@ function get_updates() {
  });
 }

-function check_upgrade() {
-  var url  = 'scan.php?op=check_upgrade';
+function check_upgrade(service) {
+  var url  = 'scan.php?op=check_upgrade&service='+service;
  jQuery.get(url, function(data) {
-        console.log('check_upgrade: '+data);
-      if (data=="WAIT" || data=="") {
-        setTimeout(check_upgrade, 1000);
+        console.log('check_upgrade '+service+': '+data);
+      if (data!="") {
+              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 +266,28 @@ function confirm_uninstall(additional) {
  });
 }

+function request_letsencrypt(domain) {
+  var url  = 'scan.php?op=request_letsencrypt&domain='+domain;
+  jQuery.get(url, function(data) {
+      console.log('letsencrypt '+domain);
+      if (data!="") {
+          jQuery("#letsencrypt").html(data);
+      }
+      setTimeout(check_letsencrypt, 2000, domain);
+  });
+}
+
+function check_letsencrypt(domain) {
+  var url  = 'scan.php?op=check_letsencrypt&domain='+domain;
+  jQuery.get(url, function(data) {
+      console.log('check_letsencrypt '+domain);
+      if (data!="") {
+          jQuery("#letsencrypt").html(data);
+      }
+      //setTimeout(check_letsencrypt, 1500, domain);
+  });
+}
+
 function check_deployment(additional) {
  var url  = 'scan.php?op=check_deployment&additional='+additional;
  jQuery.get(url, function(data) {
@@ -328,6 +358,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');
+		jQuery('#vpn').html('Loading...');
+		save_vpn();
+	});
+	</script>
+        `;
+	jQuery("#vpn").html(proxy_html);
+}
+
 function check_containers() {
  var url  = 'scan.php?op=check_containers';
  jQuery.get(url, function(data) {
@@ -353,7 +438,6 @@ jQuery(document).ready(function(){

 	get_repositories();
 	get_system();
-	get_services();
 	check_vpn();

 	jQuery('#deployments_btn').click(function() {
@@ -362,6 +446,7 @@ jQuery(document).ready(function(){
 	});

 	jQuery('#services_btn').click(function() {
+		get_services();
 		jQuery('#deployments').hide();
 		jQuery('#services').toggle();
 	});
--- a/functions.php
+++ b/functions.php
@@ -148,7 +148,7 @@ function show_service_update($name, $update, $uptodate, $error) {
 	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><a href=\"javascript:void(0)\" onclick=\"upgrade('{$name}')\">UPDATE</a></td></tr>";
 		}
 	}

@@ -156,7 +156,7 @@ function show_service_update($name, $update, $uptodate, $error) {
 	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><a href=\"javacript:void(0)\" onclick=\"upgrade('{$name}')\">FORCE UPDATE</a></td></tr>";
 		}
 	}

@@ -165,7 +165,7 @@ 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><a href=\"javascript:void(0)\" onclick=\"upgrade('{$name}')\">TRY UPDATE</a></td></tr>";
                }
        }

@@ -305,6 +305,18 @@ function check_files($dir,$key) {
 	return $result;
 }

+function show_letsencrypt($letsencrypt, $domain) {
+	if (!empty($letsencrypt[$domain])) {
+		echo "LETSENCRYPT: ".$letsencrypt[$domain]["status"]." - ".$letsencrypt[$domain]["date"];
+		echo " - <a href=\"letsencrypt_log.php?domain={$domain}\" target=\"_blank\">LOG</a>";
+		if (date("Y-m-d",time()-60*24*3600)>substr($letsencrypt[$domain]["date"],0,10) || $letsencrypt[$domain]["status"]=="failed") {
+			echo " - <a href=\"#\" onclick=\"request_letsencrypt('{$domain}')\">Request new certificate</a>";
+		}
+		echo "<br><br>";
+	}
+	else echo "LETSENCRYPT in progress for {$domain}.<script>check_letsencrypt('{$domain}')</script>";
+}
+
 function check_letsencrypt() {

 	global $SHARED_DIR;
@@ -314,8 +326,7 @@ function check_letsencrypt() {
 		$json_data = file_get_contents($input_file);
 		$data = json_decode($json_data,true);
 		if ($data === null) {
-			echo "JSON read error...";
-			// TODO json error
+			return "ERROR";
 		}
 		else {
                        foreach ($data as $domain => $domain_data) {
--- a/installer.css
+++ b/installer.css
@@ -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;
+    }
--- a/manage.html
+++ b/manage.html
@@ -8,7 +8,7 @@
 <!-- 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=5" rel="stylesheet">
+<link href="installer.css?t=6" rel="stylesheet">
 </head>
 <body id="manage" class="text-center">
 <div class="container-fluid">
@@ -24,6 +24,8 @@
 </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>
@@ -150,6 +152,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"></script>
+<script src="common.js?t=3"></script>
 </body>
 </html>
--- a/manage2.html
+++ b/manage2.html
@@ -3,7 +3,7 @@
 <head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Control Panel</title>
+    <title>Safebox</title>
    <style>
        :root {
            --bg-color: #ffffff;
@@ -32,6 +32,13 @@
            justify-content: space-between;
            padding: 10px 20px;
        }
+	table {border: 1px solid orange; width:100%;}
+	table th {padding-left: 20px; text-align: left; color: orange; width: 25%;}
+	table td {padding-left: 20px; text-align:left; width: 25%;}
+
+	label {text-align: left !important;}
+	a, a:hover, a:visited {color: orange}
+
        .profile {
            display: flex;
            flex-direction: column;
@@ -46,6 +53,13 @@
            object-fit: cover;
            border-radius: 50%;
        }
+        .settings {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            font-weight: bold;
+            gap: 5px;
+        }
        .logo {
            display: flex;
            flex-direction: column;
@@ -63,6 +77,7 @@
            margin: 0;
            padding: 0;
            font-size: 24px;
+	    color: var(--text-color);
        }
        .toggle {
            cursor: pointer;
@@ -101,6 +116,22 @@
            cursor: pointer;
            color: var(--text-color);
        }
+        .buttons button.active, .buttons button:hover {
+		color: orange;
+            	border: 1px solid orange;
+        }
+        .container {
+		clear:both;
+		float:none;
+        }
+        .leftside {
+		float:left;
+		width:20%;
+        }
+        .rightside {
+		float:right;
+		width:80%;
+        }
        .my-apps {
            flex: 1;
            background-color: var(--app-bg);
@@ -197,7 +228,7 @@
            padding: 30px;
            border-radius: 15px;
            width: 80%;
-            text-align: center;
+            text-align: left;
            position: relative;
            animation: fadeIn 0.3s ease;
        }
@@ -234,7 +265,9 @@
        }

        .input-group input {
-            padding: 10px;
+            margin-top: 5px;
+            margin-bottom: 5px;
+            padding: 5px;
            border: 1px solid var(--button-border);
            border-radius: 10px;
            background: none;
@@ -335,6 +368,58 @@
            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");
        }

+    .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;
+    }
+
        @media (max-width: 768px) {
            header {
                flex-direction: column;
@@ -386,40 +471,71 @@
            }
        }
    </style>
-<!-- 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=5" rel="stylesheet">
 </head>
 <body>

-<header>
-    <div class="profile" id="profileSection">
-        <img src="image.png" alt="Profilkép">
-        <div>Pro</div>
-    </div>
+<div class="container">
+<div class="leftside">
    <div class="logo">
        <img src="image.png" alt="Logo">
-        <div><h1>Control Panel</h1></div>
+        <div>
+		<h1>Safebox</h1>
+	</div>
+    </div>
+    <div class="profile" id="profileSection">
+	<!--<img src="image.png" alt="Profilkép">-->
+        <div id="vpnBtn">Pro</div>
+    </div>
+    <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="buttons">
+	 	<button id="servicesBtn">Services</button>
+	</div>
+    	<div class="settings">Settings</div>
+	<div class="buttons">
+		<button id="updatesBtn">Updates</button>
+	</div>
+	<div class="buttons">
+		<button id="repositoriesBtn">Repositories</button>
+	</div>
+	<div class="buttons">
+		<button id="systemservicesBtn">System services</button>
+	</div>
+	<br>
+	<br>
+		<div style="text-align:center;">
+		<a href="manage.html" id="refresh_btn">REFRESH</a>
+		<br>
+		<br>
+		<a href="manage2.html" id="old_btn">OLD DESIGN</a>
+		</div>
 </div>
-    <div class="toggle" id="themeToggle"></div>
-</header>

+<div class="rightside">
 	<div class="buttons">
 	    <button id="myAppsBtn">My Apps</button>
 	    <button id="installAppsBtn">Install Apps</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>
+</div>
+
 <div id="popup" class="popup hidden">
  <div class="popup-content">
    <span class="close">&times;</span>
+    <div class="input-group">
    <div id="popupText" class="deployment">Load app template here</div>
    </div>
  </div>
+</div>
 <footer>
    <div class="footer-links">
        <a href="#">Help</a>
@@ -433,7 +549,7 @@
    </div>

    <div class="footer-social">
-        <a href="#">GitHub</a>
+        <a href="#">Discord</a>
        <a href="#">X</a>
    </div>
 </footer>
@@ -449,6 +565,8 @@
        }
        toggle.classList.toggle('active');
    });
+    // default dark
+    document.documentElement.setAttribute('data-theme', 'dark');
 </script>

 <script>
@@ -463,6 +581,12 @@
    const diskBtn = document.getElementById('diskBtn');
    const monitorBtn = document.getElementById('monitorBtn');

+    const vpnBtn = document.getElementById('vpnBtn');
+    const servicesBtn = document.getElementById('servicesBtn');
+    const updatesBtn = document.getElementById('updatesBtn');
+    const repositoriesBtn = document.getElementById('repositoriesBtn');
+    const systemservicesBtn = document.getElementById('systemservicesBtn');
+
    const myAppsContainer = document.getElementById('myAppsContainer');
    const popup = document.getElementById('popup');
    const popupText = document.getElementById('popupText');
@@ -530,12 +654,89 @@
        }
    }

-    myAppsBtn.addEventListener('click', () => renderApps(false));
-    installAppsBtn.addEventListener('click', () => renderApps(true));
+    function renderVPN() {
+        myAppsContainer.innerHTML = `
+            <div id="vpn">
+	    Loading...
+            </div>
+        `;
+	get_proxy_html();
+    }
+
+    function renderServices() {
+        myAppsContainer.innerHTML = `
+            <div id="services">
+	    Loading...
+            </div>
+        `;
+	get_services();
+    }
+
+    function renderUpdates() {
+        myAppsContainer.innerHTML = `
+            <div id="updates">
+	    Looking for updates... Please wait...
+            </div>
+        `;
+	get_updates();
+    }
+
+    function renderRepositories() {
+        myAppsContainer.innerHTML = `
+        <div class="input-group">
+	<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>
+	</div>
+        `;
+    }
+
+    function renderSystemServices() {
+        myAppsContainer.innerHTML = `
+            <div id="system">
+	    Loading...
+            </div>
+        `;
+	get_system();
+    }
+
+	function activate(btn) {
+		myAppsBtn.classList.remove('active');
+		installAppsBtn.classList.remove('active');
+		btn.classList.add('active');
+	}
+
+    myAppsBtn.addEventListener('click', () => {renderApps(false); activate(myAppsBtn);});
+    installAppsBtn.addEventListener('click', () => {renderApps(true); activate(installAppsBtn);});
    backupBtn.addEventListener('click', () => renderText('Backup'));
    diskBtn.addEventListener('click', () => renderText('Disk Management'));
    monitorBtn.addEventListener('click', () => renderText('Monitor'));

+    vpnBtn.addEventListener('click', () => renderVPN());
+    servicesBtn.addEventListener('click', () => renderServices());
+    updatesBtn.addEventListener('click', () => renderUpdates());
+    repositoriesBtn.addEventListener('click', () => renderRepositories());
+    systemservicesBtn.addEventListener('click', () => renderSystemServices());
+
    closeBtn.addEventListener('click', () => {
        popup.classList.add('hidden');
    });
@@ -562,6 +763,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=3"></script>
+<script src="common.js?t=7"></script>
 </body>
 </html>
--- a/scan.php
+++ b/scan.php
@@ -179,36 +179,48 @@ switch ($_GET["op"]) {
 					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">';
 						if ($reinstall) {
 							//var_dump($template);
                                                        $letsencrypt = check_letsencrypt();
-							if (empty($letsencrypt)) echo "LETSENCRYPT in progress...";
+							if (empty($letsencrypt)) echo "LETSENCRYPT file doesn't exists...";
+							elseif ($letsencrypt=="ERROR") echo "LETSENCRYPT file: read JSON error...";
 							else {
+								$domain = "";
 								foreach ($template->fields as $field) {
-									if ($field->key=="DOMAIN") {
-										if (!empty($letsencrypt[$field->value])) {
-											echo "LETSENCRYPT: ".$letsencrypt[$field->value]["status"]." - ".$letsencrypt[$field->value]["date"];
-											echo " - <a href=\"letsencrypt_log.php?domain={$field->value}\" target=\"_blank\">LOG</a><br><br>";
-										}
-										else echo "LETSENCRYPT in progress for {$field->value}.";
-									}
+									if ($field->key=="DOMAIN") $domain = $field->value;
 								}
+								if (!empty($domain)) show_letsencrypt($letsencrypt, $domain);
 							}
 						}
+						echo '</div>';
+						if (!empty($template->icon)) echo "<div class=\"row\"><img src=\"".$template->icon."\"></div>";
+						if (!empty($template->description)) echo "<div class=\"row\"><label>".$template->description."</label></div>";
 						foreach ($template->fields as $field) {
+							if (!empty($field->title)) echo "<div class=\"row\"><b>".$field->title."</b></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}\">";
 							}
 							else {
-							echo "<div class=\"row\"><div class=\"mb-3\"><label>".$field->description."</label>
+								echo "<div class=\"row\">";
+								echo "<div>
+									<label>".$field->description."</label>
 									<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>";
+									</div>";
+								if (!empty($field->info)) echo "
+									<div class=\"info-container\">
+									  <span class=\"info-icon\">i</span>
+									  <div class=\"tooltip\">{$field->info}</div>
+									</div>
+								";
+								echo "</div>";
+								if (!empty($field->details)) echo "<div class=\"row\"><i>".$field->details."</i></div>";
 							}
 						}


                                                echo "
-                                                <div class=\"row\">
+                                                <div class=\"row buttons\">
                                                <div class=\"mb-3\">
                                                <button class=\"btn btn-lg btn-primary btn-block\" type=\"submit\" id=\"deploy_{$template->name}_btn\">".($reinstall ? "Reinstall" : "Install")."</button>
                                                </div>";
@@ -264,6 +276,23 @@ switch ($_GET["op"]) {
 			else echo ""; // no deployment, finished
 		}
 	break;
+	case "request_letsencrypt":
+		$domain = $_GET["domain"];
+		$arr = array($domain => array("date" => date("Y-m-d H:i:s"), "status" => "requested"));
+		$json = json_encode($arr, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT);
+
+		if (set_output("request_letsencrypt",$json)) echo "LETSENCRYPT in progress for {$domain}.<br><br>";
+		else echo "ERROR";
+	break;
+	case "check_letsencrypt":
+		$domain = $_GET["domain"];
+		$letsencrypt = check_letsencrypt();
+		if (empty($letsencrypt)) echo "LETSENCRYPT file doesn't exists...";
+		elseif ($letsencrypt=="ERROR") echo "LETSENCRYPT file: read JSON error...";
+		else {
+			show_letsencrypt($letsencrypt, $domain);
+		}
+	break;
 	case "redeploy":
 	case "deploy":
 		if ($key=check_deploy($_GET["additional"])) { 
@@ -364,23 +393,51 @@ switch ($_GET["op"]) {
                echo $text;
        break;
        case "check_upgrade":
-                $arr = check_response("upgrade");
-                if (!empty($arr)) {
+                $arr = check_deploy($_GET["service"]);
+                if (!empty($arr)) { // deployment in progress
                        foreach ($arr as $key=>$data) {
-                                if ($key=="upgrade") {
-                                        var_dump($arr);
-                                        //remove_response("$key");
+                                if ($key=="deploy-".$_GET["service"]) {
+                                        if ($data["STATUS"]=="1") {
+                                                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":
+                if ($key=check_deploy($_GET["service"])) {
+                        $text="Deploy/uninstall of {$_GET["service"]} has started. Please wait...";
+                }
+                else {
+                        //$text="Deploy/uninstall of {$_GET["service"]} in progress... Please wait...";
+
 			$arr = array("NAME" => $_GET["service"], "ACTION" => "upgrade");
 			$json = json_encode($arr, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT);

-                if (set_output("upgrade",$json)) echo "OK";
-                else echo "ERROR";
+			if (set_output("upgrade",$json)) $text = "OK";
+			else $text = "ERROR";
+                }
+                echo $text;
        break;
 	case "repositories":
 		$arr = array("STATUS" => 0);
Author	SHA1	Message	Date
laci	f5b93f5d39	restore original design All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2025-05-23 12:12:09 +00:00
laci	5dacc36836	new template fields All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2025-05-21 07:42:04 +00:00
laci	453f84f0e3	new design changes Some checks reported errors continuous-integration/drone/push Build encountered an error Details	2025-05-19 06:11:42 +00:00
laci	6af1e18298	upgrade changes All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2025-05-16 08:52:20 +00:00
laci	2b0415fcb1	new design first version All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2025-05-13 07:10:42 +00:00
laci	4fb0051f95	letsencrypt rename All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-07 16:17:50 +00:00
laci	b40558e056	letsencrypt2-> All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2025-05-07 11:34:13 +00:00
laci	6a7451de83	letsencrypt request All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2025-05-07 11:09:37 +00:00