logo

common.js

@@ -113,23 +113,13 @@ function check_vpn(service) {
     method: 'GET',
     success: function(data) {
         console.log('check_vpn: '+data);
-        if (data=="1") { // save_vpn has finished or VPN ON
+        if (data=="1") { // 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 {
 		$('#pro_off').hide();
 		$('#pro_on').show();
 		$('#vpn_off').hide();
 		$('#vpn_on').show();
 		//document.getElementById('vpnToggle').checked = true;
 		//document.querySelector(".switch-label").textContent = "ON";
-	  }
 	}
 	else if (data=="2") {
 		$('#pro_off').hide();
@@ -152,13 +142,38 @@ function check_vpn(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);
+    }
+  });
+}
+
 function save_vpn() {
   var url  = 'scan.php?op=save_vpn&vpn_domain='+jQuery('#vpn_domain').val()+'&vpn_pass='+jQuery('#vpn_pass').val()+'&letsencrypt_mail='+jQuery('#letsencrypt_mail').val()+'&letsencrypt_servername='+jQuery('#letsencrypt_servername').val();
 
   jQuery.get(url, function(data) {
 	console.log('save_vpn: '+data);
 	  if (data=="OK") {
-		check_vpn();
+		check_save_vpn();
 	  }
 	//get_vpn();
   });
@@ -433,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>

img/safebox_orange_white.svg

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 1530.1 487.8">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #fff;
+      }
+
+      .cls-2 {
+        fill: #fdb814;
+      }
+    </style>
+  </defs>
+  <!-- Generator: Adobe Illustrator 28.7.5, SVG Export Plug-In . SVG Version: 1.2.0 Build 176)  -->
+  <g>
+    <g id="Layer_1">
+      <polygon class="cls-2" points="302.7 133.7 377.7 188.4 386.3 58.7 57.2 59.3 62.8 150.9 310 325.7 221.7 392.1 108.3 309.5 106.3 268.7 221.7 349.3 253.9 326.1 65.8 194 75.4 330.7 221.1 437.9 369 328.7 374.3 230.5 238 132 168.6 131.3 337.2 250.1 335.2 293.6 101.6 131.3 99.3 96.8 345.1 97.5 343.8 132.7 302.7 133.7"/>
+      <g>
+        <path class="cls-1" d="M592.8,238c-29.4-13.8-61.8-19.9-90.8-33.7-13.4-6.1-36.7-19.9-36.7-36.7,0-44.1,83.9-54.9,115-54.9s66.6-.4,66.6,15.1-29,39.8-29,64.8,3.9,16,12.1,16,.5,0,.7,0h0c13.5-1.4,67.3-8.8,72.5-20.2,3-6.7-8.2-15.1-13.9-17.7-3.4-1.6-6.9-2.7-10.4-3.7,1.8-2.3,3.4-4.4,4.4-5.9,7.3-11.2,12.5-24.6,12.5-38,0-54-68.7-56.6-107.2-56.6s-105.9,9.5-141.8,45.4c-13.8,13.8-23.8,33.3-23.8,53.2s17.7,50.1,39.8,64.8c40.6,26.4,92.5,27.7,132.3,54.5,9.9,6.5,21.6,16.9,21.6,29.4,0,25.5-32.9,39.3-54,39.3s-35.4-5.2-49.3-16c-3-2.2-15.1-15.6-16.9-15.6-4.3,0-3.9,4.3-3.9,7.3,0,6.1,4.8,14.3,7.8,19,15.6,21.2,45.8,32.9,71.3,32.9,38.9,0,80.8-27.7,80.8-69.6s-31.1-59.7-59.7-73.1Z"/>
+        <path class="cls-1" d="M811.7,304.2c0-21,5.6-42.1,5.6-63.1s-24.6-27-39.3-27-6.7.4-7.1,3.6c-11.1,4.8-38.9,107.1-57.5,107.1s-7.9-16.3-7.9-20.6c0-42.1,24.6-78.2,61.9-96.4,6.3-3.2,24.6-6.3,24.6-15.5,0-13.5-23-18.3-33.3-18.3-59.1,0-92.8,71.8-92.8,123s13.1,66.7,44.8,66.7,55.5-48.8,62.7-79.7c.4,21.4,2.4,73,33.7,73s13.1-4,13.1-11.1-1.6-7.1-3.2-10.3c-4-9.9-5.2-20.6-5.2-31.3ZM809.3,256.6c0-13.1-2-28.6-13.5-37.3,8.7,5.2,13.9,17.5,13.9,27.4s0,6.7-.4,9.9Z"/>
+        <path class="cls-1" d="M958.2,242.2c0-7.3-12.1-10.4-17.7-10.4-29,0-51.9,26.4-80.8,30.3,0-14.3.4-28.5.9-42.8,1.3,7.3,6.1,20.7,15.1,20.7s15.6-12.1,19-18.6c15.1-28.1,28.5-57.9,31.6-89.9,0-2.6.4-5.6.4-8.2,0-28.5-16-59.2-48-59.2-61.8,0-59.2,130.1-59.2,174.6s6.9,193.7,40.2,193.7,5.2-.9,7.8-2.2c33.3-16,54-53.2,54-89.5s-4.8-35-14.3-50.1c10.4-6.9,51-35.9,51-48.4ZM877,115.6c0-.4.4-.4.9-.4h1.3l.4,1.3v.4c0,24.6-12.5,47.1-17.3,70.9.9-13.4,6.1-63.1,14.7-72.2ZM844.6,273.8c.2,1.1.2,3.9.2,6.7l-.2-6.7ZM861.9,396.1c-.9-29-1.7-57.9-2.2-86.9,12.1,9.1,19.5,23.8,19.5,38.5s-10.4,33.7-17.3,48.4Z"/>
+        <path class="cls-1" d="M1052.3,269.1c-8.2,0-24.9,36.6-51.4,36.6s-11.3-3.1-15.6-8.2c4.3-1.2,7.4-4.3,10.5-7.4,26.9-26.1,52.6-59.2,52.6-99s-17.1-43.6-41.7-43.6c-47.9,0-67.8,76.4-67.8,113.4s17.9,76,56.9,76,61.6-30.4,61.6-59.6-.8-8.2-5.1-8.2ZM991.9,203.2c2.3-4.3,8.2-15.6,13.6-15.6s2.7,3.5,2.7,5.5c0,28.4-23,50.7-32.7,76.4,0-23.8,3.5-46,16.4-66.2Z"/>
+        <path class="cls-1" d="M1473.8,316.8c-6.5-4.8-14.7-5.6-20.7-10.8-10.4-8.6-21.6-25.5-27.7-37.6,12.1-19,24.6-38.9,39.3-56.2,7.3-8.6,12.5-16.4,12.5-27.7s-8.2-38.5-18.6-38.5-45.4,58.4-51.9,69.6c-5.2-21.2-12.1-59.2-40.6-59.2s-32,11.2-32,22.9,2.2,2.6,3.5,3.5c8.2,5.2,13.4,13.8,17.3,22.9.8,2,1.6,4,2.4,6-6.9,3.7-14.8,7.7-23.8,12,0-.6-.6-3.7-1.9-9.3-1.2-5.6-3.2-11.2-5.8-16.9-2.6-5.7-6-9.7-10-11.8-2.8-1.2-5.7-1.9-8.8-1.9h-1.9l.9-.5c-2.8-5.3-6.1-9-10-11.1-3.9-2.2-8-3.2-12.3-3.2-7.4,0-14.4,1.8-21.1,5.3-6.6,3.6-11.1,6.7-13.2,9.5-13,10.4-22.9,22.1-29.8,34.9.2-3,.3-6,.3-8.9,0-28.1-14.7-72.6-48.8-72.6s-62.7,60.5-70.5,96c-.4-9.1-.4-18.2-.4-27.2,0-32.9,5.6-65.7,5.6-98.1s-17.7-42.8-41.1-42.8-9.1,3-9.1,9.1c0,12.5,1.7,25.5,1.7,38.5v46.7c0,45.4.9,120.6,28.1,158.6-1.7,1.7-3,3.9-3,6.5,0,14.7,25.1,19.5,35.9,19.5,40.9,0,70.6-31,87-68,.1,19.5,4.6,36.5,13.4,51,9,14.7,20.5,22,34.8,22s15.3-2.6,23.6-7.9c8.3-5.3,17-13.7,26-25.5,9.6-13.6,16.5-25.8,20.6-36.6,4.2-10.8,6.8-19.2,7.9-25.3,1.1-6,1.6-9.2,1.6-9.5.9,0,4.7-1.5,11.4-4.6,5.3-2.5,11.6-5.9,18.7-10.1,4.3,12.9,8.5,25.9,14.7,38.2-7.3,13.4-35,62.7-35,75.6s2.6,8.6,6.9,8.6c13.8,0,43.2-35,51-45.8,13,16.4,32.4,32.9,54.5,32.9s21.6-4.3,21.6-14.7-1.3-5.6-3.5-7.3ZM1107,308.4l-1.3-12.1c12.5-6.5,42.4-116.7,62.2-116.7s9.1,17.7,9.1,22.9c0,44.1-28.5,89.5-70,105.9ZM1284.2,294.6c-10.7,11.1-19.7,16.7-27.1,16.7s-8.6-2.2-10.9-6.7c-2.3-4.5-3.5-10.3-3.5-17.4,0-10.8,2.6-23.2,7.9-37.1,5.2-13.9,13.1-25.6,23.6-35.2-1.2,1.2-1.9,3.6-1.9,7s.8,7.3,2.5,11.8c1.7,4.5,4.6,8.4,8.8,11.8,4.2,3.4,10.1,5.1,17.8,5.1l5.6-.5c-4.6,18.5-12.3,33.4-22.9,44.5ZM1303.9,231.1c-4,0-6.9-1.2-8.6-3.7-1.7-2.5-2.5-5.2-2.5-8.3.9-9.3,3.4-13.9,7.4-13.9s3.6,1.9,5.3,5.6c1.7,3.7,3.2,10.2,4.4,19.5l-6,.9ZM1394.3,296l-3,4.8,3-5.2v.4ZM1387.3,299.9c1.7-2.2,3-4.8,4.8-7.3v.4c-1.3,2.2-3,4.8-4.8,6.9ZM1395.1,237.2c-1.7-4.3-3-8.2-4.3-12.1,1.3,3.9,3,7.8,4.3,11.2v.9ZM1408.1,265.8l.4.9-.4.9-.4-.9.4-.9ZM1406.8,267.9l.4-.9.4.9-.4.9-.4-.9ZM1407.7,269.2l.4-.9.4.9h-.9ZM1409.4,267.5l-.4.9-.4-.9h.9ZM1409.4,272.2l-.4-.9.4-.9.4.9-.4.9ZM1409.4,265.3l-.4-1.3.4-.4.4.9-.4.9ZM1417.2,249.8c3.5-6.1,6.9-12.1,10.4-18.2l-10.4,19v-.9ZM1417.2,281.8c2.6,4.8,5.2,9.1,8.2,13.4-3-4.3-5.6-8.6-8.6-13l.4-.4ZM1416.3,283.5v-.4c4.3,6.5,8.6,13,13.4,19-5.2-6.1-9.5-12.1-13.4-18.6Z"/>
+      </g>
+    </g>
+  </g>
+</svg>

install.html

@@ -9,14 +9,13 @@
 <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" />
+<link rel="stylesheet" href="style.css?t=17" />
 </head>
 <body id="installer">
   <div class="main" style="max-width:1000px;margin:0px auto;">
     <div id="myAppsContainer">
 	      <div class="logo">
-		<img src="/img/logo.svg" alt="Safebox"/>
+        	<img src="/img/safebox_orange_white.svg" alt="Safebox"/>
-		<span>Safebox</span>
 	      </div>
 		<h3 style="text-align:center">No any previous deployed environment has found</h3>
 		<div class="main-header">
@@ -100,7 +99,7 @@
 		<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">
+				<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">

install.php

@@ -69,14 +69,13 @@ echo "<pre>".$output."</pre>";
   <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=4" />
+  <link rel="stylesheet" href="style.css?t=17" />
 </head>
 <body id="install" class="text-center">
   <div class="main">
     <div id="myAppsContainer">
 	<div class="logo" style="margin:100px 0px 20px 0px;">
-		<img src="/img/logo.svg" alt="Safebox"/>
+        	<img src="/img/safebox_orange_white.svg" alt="Safebox"/>
-		<span>Safebox</span>
 	</div>
 	<div class="progress-box">
 		<div class="progress-title"><?php echo $header_text?></div>

manage.html

@@ -9,14 +9,13 @@
 <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=16" />
+<link rel="stylesheet" href="style.css?t=17" />
 </head>
 <body>
   <div class="sidebar">
     <div class="sidebar-top">
       <div id="logo" class="logo">
-        <img src="/img/logo.svg" alt="Safebox"/>
+        <img src="/img/safebox_orange_white.svg" alt="Safebox"/>
-        <span>Safebox</span>
       </div>
       <div class="menu">
 <!--
@@ -390,6 +389,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=53"></script>
+<script src="common.js?t=57"></script>
 </body>
 </html>

scan.html

@@ -9,14 +9,13 @@
 <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=4" />
+<link rel="stylesheet" href="style.css?t=17" />
 </head>
 <body id="scan" class="text-center">
   <div class="main">
     <div id="myAppsContainer">
 	<div class="logo" style="margin:100px 0px 20px 0px;">
-		<img src="/img/logo.svg" alt="Safebox"/>
+        	<img src="/img/safebox_orange_white.svg" alt="Safebox"/>
-		<span>Safebox</span>
 	</div>
 	<div class="progress-box">
 		<div class="progress-title">Scanning your device</div>

scan.php

@@ -227,9 +227,21 @@ switch ($_GET["op"]) {
 							}
 							else {
 								echo "<div class=\"row\">";
-								echo "<label>".$field->description."</label>
+								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>
+								if ($field->type=="select") {
-								<div class=\"info-container\">
+									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>

style.css

@@ -123,7 +123,7 @@
     }
 
     .logo img {
-      height: 30px;
+      height: 40px;
     }
 
     .loading {

version.html

@@ -1 +1 @@
-1.1.18
+1.1.19