save vpn fix, type select in template

portal->pro
2025-08-28 13:59:51 +00:00 · 2025-08-26 16:07:08 +00:00 · 2025-08-26 16:06:06 +00:00 · 2025-08-15 13:58:27 +00:00 · 2025-08-15 13:49:33 +00:00 · 2025-08-15 13:41:15 +00:00
16 changed files with 242 additions and 117 deletions
--- a/common.js
+++ b/common.js
@@ -106,20 +106,14 @@ function add_repository() {
  });
 }

-function check_vpn() {
+function check_vpn(service) {
  var url = 'scan.php?op=check_vpn';
-  jQuery.get(url, function(data) {
+  jQuery.ajax({
+    url: url,
+    method: 'GET',
+    success: function(data) {
        console.log('check_vpn: '+data);
-        if (data=="1") { // save_vpn has finished or VPN ON
-	  const vpn_div = document.getElementById("vpn");
-	  console.log('vpn_div: '+vpn_div);
-	  if (vpn_div) {
-	  	vpn_div.innerHTML = 'VPN start process has finished';
-		setTimeout(function() {
-			document.getElementById('installAppsBtn').click();
-		}, 2000);
-	  }
-	  else {
+        if (data=="1") { // VPN ON
 		$('#pro_off').hide();
 		$('#pro_on').show();
 		$('#vpn_off').hide();
@@ -127,7 +121,6 @@ function check_vpn() {
 		//document.getElementById('vpnToggle').checked = true;
 		//document.querySelector(".switch-label").textContent = "ON";
 	}
-	}
 	else if (data=="2") {
 		$('#pro_off').hide();
 		$('#pro_on').show();
@@ -141,6 +134,36 @@ function check_vpn() {
 		$('#pro_off').show();
        }
        setTimeout(check_vpn, 10000);
+    },
+    error: function(xhr, status, error) {
+      console.warn('check_vpn error: ' + status + ' - ' + error);
+      setTimeout(check_vpn, 10000, service);
+    }
+  });
+}
+
+function check_save_vpn(service) {
+  var url = 'scan.php?op=check_vpn';
+  jQuery.ajax({
+    url: url,
+    method: 'GET',
+    success: function(data) {
+        console.log('check_save_vpn: '+data);
+        if (data=="1") { // save_vpn has finished or VPN ON
+	  const vpn_div = document.getElementById("vpn");
+	  if (vpn_div) {
+	  	vpn_div.innerHTML = '<div class="loading">VPN start process has finished</div>';
+		setTimeout(function() {
+			document.getElementById('installAppsBtn').click();
+		}, 2000);
+	  }
+	}
+	else setTimeout(check_save_vpn, 1000);
+    },
+    error: function(xhr, status, error) {
+      console.warn('check_save_vpn error: ' + status + ' - ' + error);
+      setTimeout(check_save_vpn, 1000);
+    }
  });
 }

@@ -150,7 +173,7 @@ function save_vpn() {
  jQuery.get(url, function(data) {
 	console.log('save_vpn: '+data);
 	  if (data=="OK") {
-		check_vpn();
+		check_save_vpn();
 	  }
 	//get_vpn();
  });
@@ -182,21 +205,26 @@ function get_updates() {

 function check_upgrade(service) {
  var url = 'scan.php?op=check_upgrade&service=' + service;
-  jQuery.get(url, function(data) {
+  jQuery.ajax({
+    url: url,
+    method: 'GET',
+    success: function(data) {
      console.log('check_upgrade ' + service + ': ' + data);
-      if (data!="") {
+      if (data !== "") {
        jQuery("#status_" + service).html(data);
      }
-      if (data!="OK") {
+      if (data !== "OK") {
        setTimeout(check_upgrade, 1000, service);
-      }
-      else {
+      } else {
        console.log('upgrade end: ' + service);
        jQuery("#status_" + service).html('Upgrade has finished');
-	  //get_updates();
+      }
+    },
+    error: function(xhr, status, error) {
+      console.warn('check_upgrade error: ' + status + ' - ' + error);
+      setTimeout(check_upgrade, 5000, service);
    }
  });
-
 }

 function upgrade(service) {
@@ -261,13 +289,13 @@ function check_uninstall(additional) {
        console.log('check_uninstall '+additional+': '+data);
      if (data!="") {
              jQuery("#"+additional).html(data);
-	      jQuery("#popupText").html(data); // manage2
+	      jQuery("#popupText").html('<div class="loading">'+data+'</div>'); // manage2
      }
      if (data!="OK") {
              setTimeout(check_uninstall, 1000, additional);
      }
      else {
-	  jQuery("#popupText").html('Uninstall has finished'); // manage2
+	  jQuery("#popupText").html('<div class="loading">Uninstall has finished</div>'); // manage2
 	  jQuery("#"+additional).html('Uninstall has finished');
 	  get_deployments();
      }
@@ -279,7 +307,7 @@ function uninstall(additional) {
  jQuery("div.deployment").each(function(index) {
        $(this).html('');
  });
-	data = '<form action="#" method="post"><div class="row">YOU ARE GOING TO UNINSTALL '+additional.toUpperCase()+'.<br>ARE YOU SURE? IF YES, PLEASE CLICK ON THE BUTTON BELOW.<br><br></div><div class="row"><div class="mb-3"><button class="save-button" type="button" onclick="confirm_uninstall(\''+additional+'\')">Uninstall</button></div></div></form>';
+	data = '<div class="confirm"><form action="#" method="post"><div class="row">You are going to uninstall '+additional.toUpperCase()+'.<br>Are you sure? If you click on Uninstall button below then all your data will be deleted.<br><br></div><div class="row buttons"><div class="mb-3"><button class="btn" type="button" onclick="confirm_uninstall(\''+additional+'\')">Uninstall</button></div><div class="mb-3" style="margin-left:200px;float:"><button class="btn" onclick="reinstall(\''+additional+'\',\''+additional+'\')">Cancel</button></div></div></form></div>';
 	jQuery("#"+additional).html(data);
 	jQuery("#popupText").html(data); // manage2
 }
@@ -292,7 +320,7 @@ function confirm_uninstall(additional) {
        console.log('uninstall '+additional+': '+data);
          if (data!="") {
                jQuery("#"+additional).html(data);
-	        jQuery("#popupText").html(data); // manage2
+	        jQuery("#popupText").html('<div class="loading">'+data+'</div>'); // manage2
                setTimeout(check_uninstall, 1000, additional);
          }
  });
@@ -366,7 +394,7 @@ function deploy(additional) {
 	console.log('deploy '+additional+': '+data);
 	  if (data!="") {
 	        jQuery("#"+additional).html(data);
-	        jQuery("#popupText").html(data); // manage2
+	        jQuery("#popupText").html('<div class="loading">'+data+'</div>'); // manage2
      		setTimeout(check_deployment, 1000, additional);
 	  }
  });
@@ -385,7 +413,7 @@ function redeploy(additional) {
 	console.log('redeploy '+additional+': '+data);
 	  if (data!="") {
 	        jQuery("#"+additional).html(data);
-		jQuery("#popupText").html(data); // manage2
+		jQuery("#popupText").html('<div class="loading">'+data+'</div>'); // manage2
      		setTimeout(check_deployment, 1000, additional);
 	  }
  });
@@ -420,7 +448,7 @@ function get_proxy_html() {
 		<div class="row">
 			<label for="vpn_domain">Please add domain url to download the VPN hash from:</label>
 		    <div class="input-container">
-				<input type="text" class="form-control" name="VPN_DOMAIN" id="vpn_domain" value="https://portal.safebox.network" size="40">
+				<input type="text" class="form-control" name="VPN_DOMAIN" id="vpn_domain" value="https://pro.safebox.network" size="40">
 		    </div>
 		</div>
 		</div>
--- a/img/grey-box-text.svg
+++ b/img/grey-box-text.svg
--- a/img/grey-box.svg
+++ b/img/grey-box.svg
@@ -0,0 +1,4 @@
+<svg width="194" height="218" viewBox="0 0 194 218" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M155.225 217H21C9.9543 217 1 208.046 1 197V21C1 9.95431 9.9543 1 21 1H173C184.046 1 193 9.95429 193 21V154.883C193 159.071 191.686 163.152 189.242 166.553L178.982 180.833C176.539 184.234 175.225 188.316 175.225 192.503V197C175.225 208.046 166.27 217 155.225 217Z" stroke="#4A4F5A"/>
+<path d="M22.8795 23.0077C23.2979 23.0077 23.7203 23.0077 24.1388 23.0077C24.1701 23.0153 24.2014 23.0307 24.2366 23.0307C24.9914 23.0997 25.7149 23.28 26.4111 23.5677C29.3874 24.7951 31.0534 27.6756 30.9987 30.3951C30.9791 31.3923 30.8149 32.3551 30.3964 33.2564C29.2896 35.6575 27.4123 37.1151 24.7724 37.6214C24.5064 37.6712 24.2327 37.6981 23.9628 37.7326H23.0554C23.0242 37.7249 22.989 37.7134 22.9577 37.7096C22.1403 37.6559 21.3463 37.4833 20.5954 37.1534C18.1393 36.0795 16.6414 34.2422 16.1173 31.6493C16.0626 31.3885 16.0391 31.12 16 30.8553C16 30.5293 16 30.2033 16 29.8773C16.0078 29.8351 16.0235 29.7929 16.0274 29.7507C16.0939 28.9452 16.2816 28.1704 16.6218 27.4378C17.6974 25.1288 19.5003 23.6981 22.019 23.1419C22.3045 23.0805 22.5939 23.046 22.8795 23V23.0077ZM25.9848 32.5315C26.1882 31.0855 26.1921 29.651 25.9848 28.2164H21.0022C20.7988 29.6586 20.7949 31.0932 21.0022 32.5315H25.9848ZM26.8765 32.52C26.9078 32.5277 26.9195 32.5315 26.9352 32.5315C27.8386 32.5315 28.7381 32.5315 29.6416 32.5315C29.6846 32.5315 29.7472 32.474 29.7628 32.4279C30.2243 31.0663 30.2243 29.7008 29.7824 28.3353C29.7511 28.2356 29.7042 28.2011 29.5986 28.2049C28.7342 28.2088 27.8738 28.2049 27.0095 28.2049C26.9664 28.2049 26.9273 28.2088 26.8765 28.2126C27.0681 29.6548 27.0681 31.0816 26.8765 32.5162V32.52ZM20.1144 32.5277C19.9227 31.0893 19.9227 29.6548 20.1144 28.2164C20.0792 28.2126 20.0557 28.2049 20.0322 28.2049C19.1444 28.2049 18.2566 28.2049 17.3689 28.2049C17.2789 28.2049 17.2554 28.2433 17.232 28.3162C16.7822 29.6816 16.7822 31.0471 17.232 32.4126C17.2672 32.5123 17.3141 32.5392 17.4158 32.5392C18.2684 32.5392 19.1249 32.5392 19.9775 32.5392C20.0205 32.5392 20.0635 32.5353 20.1183 32.5315L20.1144 32.5277ZM25.8166 27.3342C25.7931 27.2269 25.7697 27.1271 25.7462 27.0312C25.5389 26.2334 25.2652 25.4663 24.7919 24.7759C24.5886 24.4805 24.3539 24.2121 24.0332 24.0279C23.7008 23.8362 23.3605 23.817 23.0163 23.9896C22.6643 24.1699 22.4101 24.4537 22.195 24.7682C21.6749 25.5277 21.3933 26.3792 21.1821 27.2614C21.1782 27.2805 21.1821 27.3074 21.186 27.3304H25.8166V27.3342ZM21.1821 33.4099C21.1821 33.4444 21.1821 33.4636 21.1821 33.4827C21.3659 34.2575 21.6162 35.0132 22.0229 35.7074C22.242 36.0795 22.5001 36.4208 22.8677 36.6663C23.2706 36.9348 23.7242 36.931 24.1271 36.6625C24.4008 36.4784 24.612 36.2367 24.7958 35.9682C25.2652 35.2778 25.5389 34.5107 25.7462 33.7129C25.7697 33.617 25.7931 33.5211 25.8166 33.4137H21.1821V33.4099ZM29.3209 27.3342C28.9845 26.2027 26.634 24.2888 25.4412 24.1737C26.1217 25.1326 26.4698 26.2142 26.7201 27.3342H29.3209ZM21.5419 24.1814C20.2552 24.3847 17.8695 26.3408 17.6856 27.3381H20.2669C20.5172 26.2219 20.8614 25.1479 21.5419 24.1814ZM26.7201 33.406C26.4737 34.5184 26.1256 35.5923 25.4372 36.5742C26.5323 36.2329 27.4475 35.6806 28.2219 34.9058C28.6638 34.4647 29.0315 33.9737 29.3287 33.4099H26.7161L26.7201 33.406ZM20.2669 33.4137H17.6778C18.2097 34.6871 20.3569 36.4285 21.5262 36.5436C20.8653 35.5962 20.5172 34.5299 20.2669 33.4137Z" fill="#7C7D81"/>
+</svg>
--- a/img/logo.svg
+++ b/img/logo.svg
--- a/img/off.svg
+++ b/img/off.svg
@@ -0,0 +1,5 @@
+<svg width="59" height="30" viewBox="0 0 59 30" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="0.25" width="34.2881" height="29.75" rx="8" fill="#7C7D81"/>
+<path d="M8 0.5H50.375C54.5171 0.5 57.875 3.85786 57.875 8V21.75C57.875 25.8921 54.5171 29.25 50.375 29.25H8C3.85786 29.25 0.5 25.8921 0.5 21.75V8C0.5 3.85786 3.85786 0.5 8 0.5Z" stroke="#7C7D81"/>
+<path d="M12.9929 19.182C10.8229 19.182 9.50694 17.712 9.50694 15.276C9.50694 12.742 10.8649 11.342 12.9929 11.342C15.1629 11.342 16.4789 12.84 16.4789 15.276C16.4789 17.796 15.1209 19.182 12.9929 19.182ZM12.9929 17.922C14.2669 17.922 14.9529 16.998 14.9529 15.276C14.9529 13.568 14.2529 12.602 12.9929 12.602C11.7329 12.602 11.0329 13.54 11.0329 15.276C11.0329 16.97 11.7329 17.922 12.9929 17.922ZM17.0973 12.7V11.538H18.1053V11.146C18.1053 9.522 18.7913 8.738 20.1913 8.738C20.5693 8.738 20.8633 8.808 21.0173 8.878V9.886H20.8773C19.8413 9.886 19.5893 10.306 19.5893 11.16V11.538H21.0173V12.7H19.5893V19H18.1053V12.7H17.0973ZM21.1032 12.7V11.538H22.1112V11.146C22.1112 9.522 22.7972 8.738 24.1972 8.738C24.5752 8.738 24.8692 8.808 25.0232 8.878V9.886H24.8832C23.8472 9.886 23.5952 10.306 23.5952 11.16V11.538H25.0232V12.7H23.5952V19H22.1112V12.7H21.1032Z" fill="#101010"/>
+</svg>
--- a/img/on.svg
+++ b/img/on.svg
@@ -0,0 +1,5 @@
+<svg width="59" height="30" viewBox="0 0 59 30" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="24.25" width="34.2881" height="29.75" rx="8" fill="#FFB806"/>
+<path d="M8 0.5H50.375C54.5171 0.5 57.875 3.85786 57.875 8V21.75C57.875 25.8921 54.5171 29.25 50.375 29.25H8C3.85786 29.25 0.5 25.8921 0.5 21.75V8C0.5 3.85786 3.85786 0.5 8 0.5Z" stroke="#7C7D81"/>
+<path d="M36.9519 19.182C34.7819 19.182 33.4659 17.712 33.4659 15.276C33.4659 12.742 34.8239 11.342 36.9519 11.342C39.1219 11.342 40.4379 12.84 40.4379 15.276C40.4379 17.796 39.0799 19.182 36.9519 19.182ZM36.9519 17.922C38.2259 17.922 38.9119 16.998 38.9119 15.276C38.9119 13.568 38.2119 12.602 36.9519 12.602C35.6919 12.602 34.9919 13.54 34.9919 15.276C34.9919 16.97 35.6919 17.922 36.9519 17.922ZM41.8963 19V11.538H43.3943V12.532C43.8983 11.734 44.6823 11.342 45.6483 11.342C47.2023 11.342 48.1683 12.252 48.1683 14.016V19H46.6843V14.324C46.6843 13.246 46.2083 12.588 45.1863 12.588C44.0663 12.588 43.3943 13.582 43.3943 14.618V19H41.8963Z" fill="#101010"/>
+</svg>
--- a/img/upgrade.svg
+++ b/img/upgrade.svg
@@ -0,0 +1,19 @@
+<svg width="175" height="60" viewBox="0 0 175 60" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1247_210)">
+<rect x="16.5" y="14.5" width="158" height="45" rx="7.5" fill="white"/>
+<rect x="16.5" y="14.5" width="158" height="45" rx="7.5" stroke="#101010"/>
+<path d="M44 26C35.1903 26 28 33.1903 28 42C28 50.8097 35.1903 58 44 58C52.8097 58 60 50.8097 60 42C60 33.1903 52.8097 26 44 26ZM32.4696 42C32.4696 38.6964 33.8947 35.6518 36.1619 33.579C37.0688 32.7369 38.6235 32.996 39.2713 34.0972L43.2874 41.0284C43.6761 41.6761 43.6761 42.4534 43.2874 43.1012L39.2713 50.0324C38.6235 51.1984 37.0688 51.3927 36.0972 50.4858C33.8947 48.2834 32.4696 45.3037 32.4696 42ZM48.7287 49.9028L44.7126 42.9717C44.3239 42.3239 44.3239 41.5466 44.7126 40.8988L48.7287 33.9676C49.3765 32.8664 50.8664 32.6073 51.8381 33.4494C54.1053 35.5223 55.5304 38.5668 55.5304 41.8704C55.5304 45.1741 54.1053 48.2186 51.8381 50.2915C50.8664 51.3279 49.3765 51.0688 48.7287 49.9028Z" fill="white"/>
+<rect x="8.5" y="7.5" width="158" height="45" rx="7.5" fill="white"/>
+<rect x="8.5" y="7.5" width="158" height="45" rx="7.5" stroke="#101010"/>
+<path d="M36 19C27.1903 19 20 26.1903 20 35C20 43.8097 27.1903 51 36 51C44.8097 51 52 43.8097 52 35C52 26.1903 44.8097 19 36 19ZM24.4696 35C24.4696 31.6964 25.8947 28.6518 28.1619 26.579C29.0688 25.7369 30.6235 25.996 31.2713 27.0972L35.2874 34.0284C35.6761 34.6761 35.6761 35.4534 35.2874 36.1012L31.2713 43.0324C30.6235 44.1984 29.0688 44.3927 28.0972 43.4858C25.8947 41.2834 24.4696 38.3037 24.4696 35ZM40.7287 42.9028L36.7126 35.9717C36.3239 35.3239 36.3239 34.5466 36.7126 33.8988L40.7287 26.9676C41.3765 25.8664 42.8664 25.6073 43.8381 26.4494C46.1053 28.5223 47.5304 31.5668 47.5304 34.8704C47.5304 38.1741 46.1053 41.2186 43.8381 43.2915C42.8664 44.3279 41.3765 44.0688 40.7287 42.9028Z" fill="white"/>
+<rect x="0.5" y="0.5" width="158" height="45" rx="7.5" fill="white"/>
+<rect x="0.5" y="0.5" width="158" height="45" rx="7.5" stroke="black"/>
+<path d="M143.172 31.1716L131 18.9997L133 17L145.172 29.1705L145.172 18.4439L148 18.4439L148 34L132.444 34L132.444 31.1716L143.172 31.1716Z" fill="#101010"/>
+</g>
+<path d="M23.4148 25.856C23.4148 28.576 21.6868 30.24 18.8868 30.24C16.0868 30.24 14.3588 28.576 14.3588 25.856V19.12H16.5188V25.856C16.5188 27.504 17.3988 28.496 18.8868 28.496C20.3908 28.496 21.2708 27.504 21.2708 25.856V19.12H23.4148V25.856ZM27.3904 33.52H25.3424V21.424H27.3904V22.4C27.9344 21.616 28.7024 21.184 29.6464 21.184C31.8864 21.184 33.2624 22.896 33.2624 25.696C33.2624 28.608 31.8544 30.24 29.6464 30.24C28.7024 30.24 27.9184 29.84 27.3904 29.072V33.52ZM29.2784 22.88C28.0464 22.88 27.3904 23.872 27.3904 25.696C27.3904 27.52 28.0784 28.544 29.2784 28.544C30.4944 28.544 31.1504 27.536 31.1504 25.696C31.1504 23.888 30.4784 22.88 29.2784 22.88ZM37.8687 30.032C35.6927 30.032 34.3487 28.352 34.3487 25.616C34.3487 22.768 35.7247 21.184 37.8687 21.184C38.8927 21.184 39.6927 21.568 40.2207 22.288V21.424H42.2687V30.272C42.2687 32.592 40.6687 33.776 38.5407 33.776C36.4287 33.776 34.8927 32.8 34.5887 30.768H36.6527C36.7807 31.68 37.5167 32.16 38.5087 32.16C39.5327 32.16 40.2207 31.664 40.2207 30.304V28.864C39.6607 29.632 38.8607 30.032 37.8687 30.032ZM38.3327 28.336C39.5647 28.336 40.2207 27.376 40.2207 25.616C40.2207 23.872 39.5327 22.88 38.3327 22.88C37.1167 22.88 36.4607 23.84 36.4607 25.616C36.4607 27.36 37.1167 28.336 38.3327 28.336ZM44.1549 30V21.424H46.2029V22.672C46.7629 21.648 47.6269 21.184 48.5549 21.184C48.9069 21.184 49.2269 21.28 49.3869 21.424V23.2C49.1149 23.12 48.8109 23.088 48.4429 23.088C46.8909 23.088 46.2029 24.016 46.2029 25.44V30H44.1549ZM52.3577 24.24H50.2937C50.5657 22.336 51.9577 21.184 54.1177 21.184C56.5017 21.184 57.7177 22.592 57.7177 24.576V27.904C57.7177 28.96 57.8137 29.552 57.9737 30H55.8457C55.7337 29.712 55.6857 29.296 55.6697 28.832C54.9657 29.824 53.9097 30.24 52.8857 30.24C51.2057 30.24 50.0057 29.408 50.0057 27.76C50.0057 26.592 50.6617 25.712 51.9737 25.28C53.1097 24.896 54.2137 24.8 55.6537 24.784V24.576C55.6537 23.472 55.1257 22.88 53.9897 22.88C53.0137 22.88 52.4857 23.424 52.3577 24.24ZM52.0697 27.648C52.0697 28.304 52.5817 28.72 53.4137 28.72C54.6777 28.72 55.6537 27.696 55.6537 26.416V26.048C52.7417 26.096 52.0697 26.784 52.0697 27.648ZM62.8866 30.24C60.6466 30.24 59.2706 28.528 59.2706 25.728C59.2706 22.816 60.6786 21.184 62.8866 21.184C63.8306 21.184 64.6146 21.584 65.1426 22.352V18.48H67.1906V30H65.1426V29.024C64.5986 29.808 63.8306 30.24 62.8866 30.24ZM63.2546 28.544C64.4866 28.544 65.1426 27.552 65.1426 25.728C65.1426 23.904 64.4546 22.88 63.2546 22.88C62.0386 22.88 61.3826 23.888 61.3826 25.728C61.3826 27.536 62.0546 28.544 63.2546 28.544ZM76.8852 27.2C76.4212 29.184 74.8852 30.24 72.8372 30.24C70.2452 30.24 68.6612 28.528 68.6612 25.728C68.6612 22.816 70.2612 21.184 72.7572 21.184C75.2692 21.184 76.8212 22.88 76.8212 25.648V26.128H70.7732C70.8692 27.696 71.5892 28.56 72.8372 28.56C73.7972 28.56 74.4532 28.112 74.7252 27.2H76.8852ZM72.7572 22.864C71.6692 22.864 71.0132 23.552 70.8212 24.848H74.6772C74.4852 23.568 73.8292 22.864 72.7572 22.864ZM81.5642 30V19.12H83.8362L87.8682 25.584L88.6202 27.072L88.5402 19.12H90.6842V30H88.4282L84.3962 23.552L83.6282 22.032L83.7242 30H81.5642ZM96.4294 30.24C93.8854 30.24 92.3174 28.528 92.3174 25.728C92.3174 22.816 93.9334 21.184 96.4294 21.184C98.9574 21.184 100.525 22.912 100.525 25.728C100.525 28.608 98.9094 30.24 96.4294 30.24ZM96.4294 28.544C97.7254 28.544 98.4134 27.552 98.4134 25.728C98.4134 23.904 97.7094 22.88 96.4294 22.88C95.1174 22.88 94.4294 23.888 94.4294 25.728C94.4294 27.536 95.1334 28.544 96.4294 28.544ZM109.505 30L107.953 24.256L107.793 23.248L107.601 24.256L106.065 30H103.521L101.137 21.424H103.329L104.705 27.472L104.913 28.512L105.153 27.472L106.801 21.424H108.929L110.577 27.472L110.785 28.48L110.977 27.472L112.369 21.424H114.465L112.065 30H109.505Z" fill="#101214"/>
+<defs>
+<clipPath id="clip0_1247_210">
+<rect width="175" height="60" fill="white"/>
+</clipPath>
+</defs>
+</svg>
--- a/index.html
+++ b/index.html
@@ -3,21 +3,26 @@
 <head>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
+<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
+<meta http-equiv="Pragma" content="no-cache" />
+<meta http-equiv="Expires" content="0" />
 <title>Safebox installer</title>
 <style>
-body, html {
+html, body {
    margin: 0;
    padding: 0;
    height: 100%;
+    overflow: hidden;
 }
 iframe {
-    width: 100%;
-    height: 100%;
+    display: block;
+    width: 100vw;
+    height: 100vh;
    border: none;
 }
 </style>
 </head>
 <body>
-    <iframe src="scan.html"></iframe>
+    <iframe src="scan.html?t=1"></iframe>
 </body>
 </html>
--- a/install.html
+++ b/install.html
@@ -3,13 +3,16 @@
 <head>
 <meta charset="UTF-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
+<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
+<meta http-equiv="Pragma" content="no-cache" />
+<meta http-equiv="Expires" content="0" />
 <title>Safebox - INSTALLER TOOL</title>
 <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Switzer:ital,wght@0,300;0,400;0,500;0,600;1,400&display=swap"/>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css"/>
 <link rel="stylesheet" href="style.css?t=1" />
 </head>
 <body id="installer">
-  <div class="main" >
+  <div class="main" style="max-width:1000px;margin:0px auto;">
    <div id="myAppsContainer">
 	      <div class="logo">
 		<img src="/img/logo.svg" alt="Safebox"/>
@@ -62,13 +65,7 @@
 		</select>
 	</div>
 </div>
-<div id="div_vpn" class="hidden">
-	<div class="input-row">
-		<label for="vpn_domain">Please add domain url to download the VPN hash from:</label>
-		<div class="input-container">
-			<input type="text" class="form-control" name="VPN_DOMAIN" id="vpn_domain" value="https://portal.safebox.network" placeholder="https://portal.safebox.network" size="40">
-		</div>
-	</div>
+<div id="div_vpn1" class="hidden">
 	<div class="input-row">
 		<label for="vpn_pass">Please type in the generated VPN passkey (8 digits):</label>
 		<div class="input-container">
@@ -81,12 +78,6 @@
 			<input type="email" class="form-control" name="LETSENCRYPT_MAIL" id="letsencrypt_mail" value="">
 		</div>
 	</div>
-	<div class="input-row">
-		<label for="letsencrypt_servername">Please add letsencrypt server name (default is letsencrypt but you can add zerossl too):</label>
-		<div class="input-container">
-			<input type="text" class="form-control" name="LETSENCRYPT_SERVERNAME" id="letsencrypt_servername" value="letsencrypt" placeholder="letsencrypt">
-	   	</div>
-	</div>
 </div>
 <div class="input-row">
 	<label for="diagnostic">Diagnostic mode enable?</label>
@@ -105,6 +96,20 @@
 		</div>
 <!-- advanced settings -->
 <div id="advanced_div" style="display:none">
+	<div id="div_vpn2" class="hidden">
+		<div class="input-row">
+			<label for="vpn_domain">Please add domain url to download the VPN hash from:</label>
+			<div class="input-container">
+				<input type="text" class="form-control" name="VPN_DOMAIN" id="vpn_domain" value="https://pro.safebox.network" placeholder="https://pro.safebox.network" size="40">
+			</div>
+		</div>
+		<div class="input-row">
+			<label for="letsencrypt_servername">Please add letsencrypt server name (default is letsencrypt but you can add zerossl too):</label>
+			<div class="input-container">
+				<input type="text" class="form-control" name="LETSENCRYPT_SERVERNAME" id="letsencrypt_servername" value="letsencrypt" placeholder="letsencrypt">
+			</div>
+		</div>
+	</div>
 	<div class="input-row">
 		<label for="registry">Please fill in the docker registry name (default:safebox):</label>
 		<div class="input-container">
@@ -196,8 +201,14 @@ jQuery(document).ready(function(){
 		else jQuery('#div_user_auth').hide();
 	});
 	jQuery('select#vpn').click(function() {
-		if (jQuery(this).val()=='yes') jQuery('#div_vpn').show();
-		else jQuery('#div_vpn').hide();
+		if (jQuery(this).val()=='yes') {
+			jQuery('#div_vpn1').show();
+			jQuery('#div_vpn2').show();
+		}
+		else {
+			jQuery('#div_vpn1').hide();
+			jQuery('#div_vpn2').hide();
+		}
 	});
 	jQuery('select#discovery').click(function() {
 		if (jQuery(this).val()=='yes') jQuery('#div_discover').show();
--- a/install.js
+++ b/install.js
@@ -59,12 +59,12 @@ function simulateLoading(duration = 3000) {

 function redirectToInstall() {
 	setProgress(100);
-	window.location.href = 'install.html';
+	window.location.href = 'install.html?t='+Date.now();
 }

 function redirectToManage() {
 	setProgress(100);
-	window.location.href = 'manage.html';
+	window.location.href = 'manage.html?t='+Date.now();
 }

 function start_system() {
--- a/install.php
+++ b/install.php
@@ -95,7 +95,7 @@ echo "<pre>".$output."</pre>";
 <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="install.js?t=6"></script>
+<script src="install.js?t=7"></script>
 <script>
 const progressBar = document.getElementById('progressBar');
 const progressText = document.getElementById('progressText');
--- a/manage.html
+++ b/manage.html
@@ -3,10 +3,13 @@
 <head>
 <meta charset="UTF-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
+<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
+<meta http-equiv="Pragma" content="no-cache" />
+<meta http-equiv="Expires" content="0" />
 <title>Safebox</title>
 <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Switzer:ital,wght@0,300;0,400;0,500;0,600;1,400&display=swap"/>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css"/>
-  <link rel="stylesheet" href="style.css?t=11" />
+<link rel="stylesheet" href="style.css?t=16" />
 </head>
 <body>
  <div class="sidebar">
@@ -42,14 +45,14 @@
 		</div>
 		      <p>Enjoy benefits and unlock more feature such as remote access, geo-redundant backups etc. <br><br>
 		      <a href="" class="details">Read details</a><br><br>
-			<img src="/img/upgrade.png" alt="Upgrade now" width="80%" id="vpnBtn" style="cursor:pointer"/>	
+			<img src="/img/upgrade.svg" alt="Upgrade now" width="80%" id="upgradeBtn" style="cursor:pointer"/>	
 		      </p>
 	    </div>
 	</div>
 	<div id="pro_on" class="hidden">
 	    <div class="grey-box">
 		<div class="vpn-text" id="vpnBtn" >
-		  <img src="/img/globe.png" data-src="/img/globe.png" data-hover="/img/globe.png" alt="VPN"/>
+		  <!--<img src="/img/globe.png" data-src="/img/globe.png" data-hover="/img/globe.png" alt="VPN"/>-->
 		  <span>Remote access</span>
 		</div>
 		      <p>It allows you to connect your installed apps to a custom domain (your own or one registered through us), so you can securely log in from any browser, anywhere in the world.
@@ -61,8 +64,8 @@
 			      <span class="slider-text"><span class="switch-label">OFF</span></span>
 			    </label>
 -->
-				<span id="vpn_on" class="hidden"><img src="/img/on.png" alt="on" /></span>
-				<span id="vpn_ff" class="hidden"><img src="/img/off.png" alt="off" /></span>
+				<span id="vpn_on" class="hidden"><img src="/img/on.svg" alt="on" /></span>
+				<span id="vpn_off" class="hidden"><img src="/img/off.svg" alt="off" /></span>
 			</div>
 	    </div>
 	</div>
@@ -95,6 +98,7 @@
    const settingsBtn = document.getElementById('settingsBtn');

    const vpnBtn = document.getElementById('vpnBtn');
+    const upgradeBtn = document.getElementById('upgradeBtn');

    const myAppsContainer = document.getElementById('myAppsContainer');
    const popup = document.getElementById('popup');
@@ -188,6 +192,7 @@
 	      <h1>Monitor</h1>
 	      <button id="updatesBtn"><i class="fas fa-bell"></i> Notification</button>
 	    </div>
+	    <label>Under development...</label><br>
        	<img src="/img/monitor.jpg" alt="Under development..." width="1000" />
        `;
    }
@@ -356,6 +361,7 @@
    	settingsBtn.addEventListener('click', () => {renderSettings(); activate(settingsBtn)});

 	vpnBtn.addEventListener('click', () => renderVPN());
+	upgradeBtn.addEventListener('click', () => renderVPN());

 //	renderApps(true);

@@ -384,6 +390,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=41"></script>
+<script src="common.js?t=57"></script>
 </body>
 </html>
--- a/scan.html
+++ b/scan.html
@@ -3,6 +3,9 @@
 <head>
 <meta charset="UTF-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
+<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
+<meta http-equiv="Pragma" content="no-cache" />
+<meta http-equiv="Expires" content="0" />
 <title>Safebox - INSTALLER TOOL</title>
 <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Switzer:ital,wght@0,300;0,400;0,500;0,600;1,400&display=swap"/>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css"/>
@@ -37,7 +40,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="install.js?t=6"></script>
+<script src="install.js?t=7"></script>
 <script>
 const progressBar = document.getElementById('progressBar');
 const progressText = document.getElementById('progressText');
--- a/scan.php
+++ b/scan.php
@@ -227,9 +227,21 @@ switch ($_GET["op"]) {
 							}
 							else {
 								echo "<div class=\"row\">";
-								echo "<label>".$field->description."</label>
-								<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\">
+								echo "<label>".$field->description."</label>";
+								if ($field->type=="select") {
+									echo "<div class=\"input-container\">
+										<select ".($field->required=="true" ? "required" : "")." name=\"{$field->key}\" id=\"{$template->name}_{$field->key}\" class=\"additional_{$template->name}\">";
+									$values = explode(",",$field->value);
+									foreach ($values as $value) {
+										$v_arr = explode(":",$value);
+										if (empty($v_arr[1])) $v_arr[1] = $v_arr[0];
+										echo "<option value=\"{$v_arr[0]}\">{$v_arr[1]}</option>";
+									}
+									echo "	</select>
+									</div>";
+								}
+								else echo "<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>";
+								echo "<div class=\"info-container\">
 								";
 								if (!empty($field->info)) echo "
 									  <span class=\"info-icon\">i</span>
@@ -268,7 +280,7 @@ switch ($_GET["op"]) {
 						}
 						echo "<div class=\"mb-3\" style=\"margin-left:200px;float:\">
 						<button class=\"btn btn-lg btn-primary btn-block\" type=\"button\" id=\"cancel_{$template->name}_btn\">Cancel</button>
-						</div>"; // buttons
+						</div>";
                                                echo "
                                                </div>
 						</form>
@@ -297,7 +309,7 @@ switch ($_GET["op"]) {
 						";
 					}
 					elseif ($data["STATUS"]=="2") { // deploy
-						echo "Install has finished.";
+						echo '<div class="loading">Install has finished.</div>';
 						echo "<script>get_deployments();</script>";
 					}
 					remove_response("$key");
@@ -314,7 +326,7 @@ switch ($_GET["op"]) {
 							echo "";
 						}
 						elseif ($data["STATUS"]=="2") { 
-							echo "Install has finished.";
+							echo '<div class="loading">Install has finished.';
 							echo "<script>get_deployments();</script>";
 							remove_response("$key"); // remove from output if finished so reinstall can start
 						}
@@ -361,23 +373,25 @@ switch ($_GET["op"]) {
 						continue; // do NOT regenerate values
 					}

-					if (intval($field_arr[3])==0) $len = 10; // default length
-					else $len = $field_arr[3];
+					$gen_arr = explode("|",$field_arr[1]);

-					if ($field_arr[1]=="openssl") {
-						if ($field_arr[2]=="hex") $command = "openssl rand -hex $len";
-						elseif ($field_arr[2]=="base64") $command = "openssl rand -base64 $len";
+					if (intval($gen_arr[2])==0) $len = 10; // default length
+					else $len = $gen_arr[2];
+
+					if ($gen_arr[0]=="openssl") {
+						if ($gen_arr[1]=="hex") $command = "openssl rand -hex $len";
+						elseif ($gen_arr[1]=="base64") $command = "openssl rand -base64 $len";
 						else $command = "openssl rand $len"; // raw
 						$output = shell_exec($command);
 						if ($output === null) $output = "OPENSSL_ERROR";
 					}
 					else {
-						if ($field_arr[1]=="random") $base = rand(100000,999999);
-						elseif ($field_arr[1]=="time") $base = time();
-						elseif ($field_arr[1]!="") $base = $field_arr[1]; // fix string
+						if ($gen_arr[0]=="random") $base = rand(100000,999999);
+						elseif ($gen_arr[0]=="time") $base = time();
+						elseif ($gen_arr[0]!="") $base = $gen_arr[0]; // fix string
 						else $base = rand(100000,999999); // default

-						if (in_array($field_arr[2],$algos)) $base = hash($field_arr[2],$base);
+						if (in_array($gen_arr[1],$algos)) $base = hash($gen_arr[1],$base);
 						else $base = hash("md5",$base); // default alg

 						$output = substr($base,0,$len);
@@ -385,11 +399,13 @@ switch ($_GET["op"]) {
 					$fields["$field_key"] = $output;
 				}
 			}
+			//var_dump($fields); exit; // TEMP - test generated values
+
 			$payload = base64_encode(json_encode($fields, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT));
 			$arr = array("NAME" => $_GET["additional"], "ACTION" => $_GET["op"], "PAYLOAD" => $payload);
 			$json = json_encode($arr, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT);
-			if (set_output("deployment",$json)) echo "OK";
-			else echo "ERROR";
+			if (set_output("deployment",$json)) echo "";
+			else $text .= " - ERROR";
 		}
 		echo $text;
 	break;
@@ -422,14 +438,15 @@ switch ($_GET["op"]) {
                        if (!empty($arr)) {
                                $data = $arr[$key];
                                if ($data["STATUS"]=="1") {
-                                        echo "Uninstall in progress... Please wait... ".date("Y-m-d H:i:s");
+                                        //echo "Uninstall in progress... Please wait... ".date("Y-m-d H:i:s");
+					echo "Uninstall in progress... ";
                                }
                                elseif ($data["STATUS"]=="2") {
                                        echo "OK";
                                        remove_response("$key");
                                }
                        }
-                        else echo "Uninstall in progress... Please wait...";
+                        else echo "Uninstall in progress...";
                }
        break;
        case "uninstall":
@@ -437,12 +454,12 @@ switch ($_GET["op"]) {
                        $text="Deploy/uninstall process has already started.<br>Please wait and do not start a new one...";
                }
                else {
-                        $text="Uninstall in progress... Please wait...";
+                        $text="Uninstall in progress...";
                        $arr = array("NAME" => $_GET["additional"], "ACTION" => "uninstall");
                        $json = json_encode($arr, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT);

-                        if (set_output("deployment",$json)) echo "OK";
-                        else echo "ERROR";
+                        if (set_output("deployment",$json)) echo "";
+                        else $text .= " - ERROR";
                }
                echo $text;
        break;
@@ -497,9 +514,10 @@ switch ($_GET["op"]) {
 		$arr = check_response("version");
 		if (!empty($arr)) {
 			$data = $arr["version"];
-			echo $data["VERSION"];
+			echo "Framework version: ".$data["VERSION"]."\n";
 		}
-		else echo "Version not found";
+		else echo "Framework version not found\n";
+		echo "Frontend version: ".file_get_contents("version.html");
 	break;
 	case "repositories":
 		$arr = array("STATUS" => 0);
--- a/style.css
+++ b/style.css
@@ -131,6 +131,16 @@
 	margin-top:300px;
    }

+    .confirm {
+	border: 2px solid #41464f;
+	border-radius: 10px;
+	margin-top:250px;
+	padding: 20px;
+	font-size: 16px;
+	color: #999;
+	line-height: 1.5;
+    }
+
    .menu {
      display: flex;
      flex-direction: column;
@@ -330,7 +340,7 @@
 }

    .grey-box {
-      background-image: url('img/grey-box.png');
+      background-image: url('img/grey-box.svg');
      background-repeat: no-repeat;
 /*     border: 2px solid #41464f;  */
      border-radius: 20px 20px 0px 20px;
@@ -351,6 +361,7 @@
 	font-size: 16px;
 	color: var(--highlight-color);
 	cursor: pointer;
+	padding: 3px 0px 0px 20px;
 }

    .main {
--- a/version.html
+++ b/version.html
@@ -0,0 +1 @@
+1.1.19
Author	SHA1	Message	Date
hael	930d02f3f4	save vpn fix, type select in template All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2025-08-28 13:59:51 +00:00
hael	0a799c9bec	portal->pro All checks were successful continuous-integration/drone/push Build is passing Details	2025-08-26 16:07:08 +00:00
hael	19ed89732e	portal->pro All checks were successful continuous-integration/drone/push Build is passing Details	2025-08-26 16:06:06 +00:00
hael	e34cfc5192	svg All checks were successful continuous-integration/drone/tag Build is passing Details	2025-08-15 13:58:27 +00:00
hael	cb4926b8a6	new svg images All checks were successful continuous-integration/drone/push Build is passing Details	2025-08-15 13:49:33 +00:00
hael	04b9a595ac	img replace	2025-08-15 13:41:15 +00:00
hael	b93e4884ba	Upload files to "img"	2025-08-15 13:28:00 +00:00
hael	1b23a7537d	Upload files to "img" Some checks reported errors continuous-integration/drone/push Build was killed Details	2025-08-15 13:23:52 +00:00
hael	bdb02f798d	layout Some checks reported errors continuous-integration/drone/push Build was killed Details	2025-08-15 13:17:10 +00:00
hael	41284bd0f2	openssl rand hex	2025-08-14 16:40:27 +00:00
hael	ea9e3d8e5b	Update version.html All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2025-08-08 08:59:01 +00:00
hael	5a7b2fc8be	check_upgrade, check_vpn All checks were successful continuous-integration/drone/push Build is passing Details	2025-08-08 08:29:21 +00:00
hael	f08d9c7833	version.html All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2025-08-07 12:54:44 +00:00
hael	c4a9272444	install width All checks were successful continuous-integration/drone/push Build is passing Details	2025-08-07 12:43:56 +00:00
hael	9b4bc15e80	uninstall	2025-08-07 12:36:37 +00:00
hael	cb07365020	version mod All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2025-08-07 10:37:41 +00:00
hael	46cf0f1f4e	vpn_ff fix All checks were successful continuous-integration/drone/push Build is passing Details	2025-08-07 10:19:13 +00:00
hael	5a0d96b6c6	upgradeBtn All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2025-08-07 10:12:22 +00:00
hael	c0c8a43c77	version changes	2025-08-07 10:10:20 +00:00
hael	a91c21ecfd	cache-control All checks were successful continuous-integration/drone/push Build is passing Details	2025-08-07 09:58:59 +00:00
hael	49f466f298	index double scroll fix	2025-08-07 09:49:15 +00:00