test

common.js

@@ -0,0 +1,448 @@
+function check_deployments() {
+  var url  = 'scan.php?op=check_deployments';
+  jQuery.get(url, function(data) {
+      console.log('check_deployments: '+data);
+      if (data=="WAIT" || data=="") {
+	  setTimeout(check_deployments, 1000);
+      }
+      else {
+	// manage2
+	apps.length = 0; // reset
+	apps.push(...JSON.parse(data)); // push each element
+	console.log(apps);
+
+	// manage
+	html_data = '';
+	data = jQuery.parseJSON(data);
+	for (var k in data) {
+		console.log(data[k]);
+		service_name = data[k].name;
+		orig_service_name = data[k].orig_name;
+		content = data[k].content;
+		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>';
+		}
+		else {
+			html_data += '<div><a href="#" onclick="load_template(\''+service_name+'\',\''+service_name+'\')">'+orig_service_name+'</a> - '+content+'</div>';
+		}
+		html_data += '<div id="'+service_name+'" class="deployment"></div>';
+	}
+	jQuery("#deployments").html(html_data);
+
+      }
+  });
+}
+
+function get_deployments() {
+  var url  = 'scan.php?op=deployments';
+  jQuery.get(url, function(data) {
+  	console.log('deployments: '+data);
+	if (data=="OK") {
+      		setTimeout(check_deployments, 1000);
+	}
+	else jQuery("#deployments").html(data);
+  });
+}
+
+function check_system() {
+  var url  = 'scan.php?op=check_system&services=1';
+  jQuery.get(url, function(data) {
+    console.log('check_system: '+data);
+      if (data=="WAIT" || data=="") {
+        setTimeout(check_system, 1000);
+      }
+      else {
+        jQuery("#system").html(data);
+      }
+  });
+}
+
+function get_system() {
+  var url  = 'scan.php?op=system';
+  jQuery.get(url, function(data) {
+    console.log('system: '+data);
+	  if (data=="OK") {
+      		setTimeout(check_system, 1000);
+	  }
+	  else alert(data);
+  });
+}
+
+function check_repositories() {
+  var url  = 'scan.php?op=check_repositories';
+  jQuery.get(url, function(data) {
+      console.log('check_repositories: '+data);
+      if (data=="WAIT" || data=="") {
+		setTimeout(check_repositories, 500);
+      }
+      else {
+		jQuery("#repositories").html(data);
+      }
+  });
+}
+
+function get_repositories() {
+  var url  = 'scan.php?op=repositories';
+  jQuery.get(url, function(data) {
+	console.log('repositories: '+data);
+	if (data=="OK") {
+		setTimeout(check_repositories, 500);
+		get_deployments();
+	}
+	else alert(data);
+  });
+}
+
+function add_repository() {
+  var url  = 'scan.php?op=add_repository&repo='+jQuery('#repository').val();
+  jQuery.get(url, function(data) {
+	console.log('add_repository: '+data);
+	  if (data=="OK") {
+	  }
+	get_repositories();
+  });
+}
+
+function check_vpn() {
+  var url  = 'scan.php?op=check_vpn';
+  jQuery.get(url, function(data) {
+        console.log('check_vpn: '+data);
+        if (data=="2") {
+          $('#vpn_off').hide();
+          $('#vpn_on').show();
+        }
+        else {
+          $('#vpn_on').hide();
+          $('#vpn_off').show();
+        }
+        setTimeout(check_vpn, 10000);
+  });
+}
+
+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") {
+	  }
+	//get_vpn();
+  });
+}
+
+function check_updates() {
+  var url  = 'scan.php?op=check_updates';
+  jQuery.get(url, function(data) {
+	console.log('check_updates: '+data);
+      if (data=="WAIT" || data=="") {
+        setTimeout(check_updates, 1000);
+      }
+      else {
+        jQuery("#updates").html(data);
+      }
+  });
+}
+
+function get_updates() {
+  var url  = 'scan.php?op=updates';
+  jQuery.get(url, function(data) {
+	console.log('updates: '+data);
+	  if (data=="ERROR") {
+        	jQuery("#updates").html('Searching for updates is in progress...');
+	  }
+      	setTimeout(check_updates, 1000);
+  });
+}
+
+function check_upgrade() {
+  var url  = 'scan.php?op=check_upgrade';
+  jQuery.get(url, function(data) {
+        console.log('check_upgrade: '+data);
+      if (data=="WAIT" || data=="") {
+        setTimeout(check_upgrade, 1000);
+      }
+      else {
+              // TODO
+      }
+  });
+}
+
+function upgrade(service) {
+  var url  = 'scan.php?op=upgrade&service='+service;
+  console.log('upgrade start: '+service);
+  jQuery.get(url, function(data) {
+        console.log('upgrade end: '+service);
+          if (data=="OK") {
+                setTimeout(check_upgrade, 1000);
+          }
+  });
+}
+
+function load_template(additional, block) {
+
+  jQuery("div.deployment").each(function(index) {
+        $(this).html('');
+  });
+  jQuery("#"+block).html('Loading '+additional+' template...');
+  var url  = 'scan.php?op=deployment&additional='+additional;
+  jQuery.get(url, function(data) {
+	console.log('load_template: '+data);
+	  if (data=="OK") {
+      		setTimeout(check_deployment, 1000, additional);
+	  }
+  });
+}
+
+function check_reinstall(additional) {
+  var url  = 'scan.php?op=check_reinstall';
+  jQuery.get(url, function(data) {
+	console.log('check_reinstall: '+data);
+      if (data!="") {
+	      jQuery("#"+additional).html(data);
+	      jQuery("#popupText").html(data); // manage2
+      }
+      else setTimeout(check_reinstall, 1000, additional);
+  });
+}
+
+function reinstall(additional, block) {
+  jQuery("div.deployment").each(function(index) {
+        $(this).html('');
+  });
+  jQuery("#"+block).html('Loading '+additional+' template...');
+  var url  = 'scan.php?op=reinstall&additional='+additional;
+  jQuery.get(url, function(data) {
+	console.log('reinstall '+additional+': '+data);
+	  if (data=="OK") {
+      		setTimeout(check_reinstall, 1000, additional);
+	  }
+  });
+}
+
+function check_uninstall(additional) {
+  var url  = 'scan.php?op=check_uninstall&additional='+additional;
+  jQuery.get(url, function(data) {
+        console.log('check_uninstall '+additional+': '+data);
+      if (data!="") {
+              jQuery("#"+additional).html(data);
+      }
+      if (data!="OK") {
+              setTimeout(check_uninstall, 1000, additional);
+      }
+      else {
+	  jQuery("#"+additional).html('Uninstall has finished');
+	  get_deployments();
+      }
+  });
+}
+
+function uninstall(additional) {
+
+  jQuery("div.deployment").each(function(index) {
+        $(this).html('');
+  });
+	data = '<fieldset><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="btn btn-lg btn-primary btn-block" type="button" onclick="confirm_uninstall(\''+additional+'\')">Uninstall</button></div></div></form></fieldset>';
+	jQuery("#"+additional).html(data);
+}
+
+function confirm_uninstall(additional) {
+  jQuery("#"+additional).html('Loading...');
+  var url  = 'scan.php?op=uninstall&additional='+additional;
+  jQuery.get(url, function(data) {
+        console.log('uninstall '+additional+': '+data);
+          if (data!="") {
+                jQuery("#"+additional).html(data);
+                setTimeout(check_uninstall, 1000, additional);
+          }
+  });
+}
+
+function check_deployment(additional) {
+  var url  = 'scan.php?op=check_deployment&additional='+additional;
+  jQuery.get(url, function(data) {
+      console.log('check_deployment '+additional);
+      //console.log('check_deployment data: '+data);
+      if (data!="") {
+	      jQuery("#"+additional).html(data);
+	      jQuery("#popupText").html(data); // manage2
+      }
+      else setTimeout(check_deployment, 1000, additional);
+  });
+}
+
+function deploy(additional) {
+  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=deploy&additional='+additional+pars;
+  jQuery.get(url, function(data) {
+	console.log('deploy '+additional+': '+data);
+	  if (data!="") {
+	        jQuery("#"+additional).html(data);
+      		setTimeout(check_deployment, 1000, additional);
+	  }
+  });
+}
+
+function redeploy(additional) {
+  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=redeploy&additional='+additional+pars;
+  jQuery.get(url, function(data) {
+	console.log('redeploy '+additional+': '+data);
+	  if (data!="") {
+	        jQuery("#"+additional).html(data);
+      		setTimeout(check_deployment, 1000, additional);
+	  }
+  });
+}
+
+function check_services() {
+  var url  = 'scan.php?op=check_services';
+  jQuery.get(url, function(data) {
+	console.log('check_services: '+data);
+      if (data=="WAIT" || data=="") {
+        setTimeout(check_services, 1000);
+      }
+      else {
+	jQuery("#services").html(data);
+      }
+  });
+}
+
+function get_services() {
+  var url  = 'scan.php?op=services';
+  jQuery.get(url, function(data) {
+	console.log('services: '+data);
+  	setTimeout(check_services, 1000);
+  });
+}
+
+function check_containers() {
+  var url  = 'scan.php?op=check_containers';
+  jQuery.get(url, function(data) {
+	console.log('check_containers: '+data);
+      if (data!="") {
+	      jQuery("#containers").html(data);
+      }
+      else setTimeout(check_containers, 1000);
+  });
+}
+
+function get_containers() {
+  var url  = 'scan.php?op=containers';
+  jQuery.get(url, function(data) {
+	console.log('containers: '+data);
+	  if (data=="OK") {
+      		setTimeout(check_containers, 1000);
+	  }
+  });
+}
+
+jQuery(document).ready(function(){
+
+	get_repositories();
+	get_system();
+	get_services();
+	check_vpn();
+
+	jQuery('#deployments_btn').click(function() {
+		jQuery('#services').hide();
+		jQuery('#deployments').toggle();
+	});
+
+	jQuery('#services_btn').click(function() {
+		jQuery('#deployments').hide();
+		jQuery('#services').toggle();
+	});
+
+	jQuery('#settings_btn').click(function() {
+		jQuery('#settings').toggle();
+		jQuery('#default').toggle();
+		jQuery('#vpn').hide();
+	});
+
+	jQuery('#vpn_btn').click(function() {
+		jQuery('#vpn').toggle();
+		jQuery('#settings').hide();
+	});
+
+	jQuery('#vpn_cancel_btn').click(function() {
+		jQuery('#vpn').hide();
+	});
+
+	jQuery('#update_btn').click(function() {
+		jQuery('#updates').html('Looking for updates... Please wait...');
+		get_updates();
+	});
+
+	jQuery('#add_repo').submit(function() {
+		jQuery('#repositories').html('Loading...');
+		add_repository();
+		return false;
+	});
+
+	jQuery('#save_vpn').submit(function() {
+		save_vpn();
+		jQuery('#vpn').html('Loading...');
+		return false;
+	});
+
+	jQuery('select#smarthost').click(function() {
+		if (jQuery(this).val()=='yes') jQuery('#div_smarthost').show();
+		else jQuery('#div_smarthost').hide();
+
+		if (jQuery("#smarthost").val()=='no' && jQuery("#localproxy").val()=='yes') {
+			alert("Warning! Local proxy will not work without smarthost proxy service.");
+		}
+	});
+	jQuery('select#vpn').click(function() {
+		if (jQuery(this).val()=='yes') jQuery('#div_vpn').show();
+		else jQuery('#div_vpn').hide();
+	});
+/*
+	jQuery('select#discovery').click(function() {
+		if (jQuery(this).val()=='yes') jQuery('#div_discover').show();
+		else jQuery('#div_discover').hide();
+	});
+	jQuery('select#additionals').click(function() {
+		if (jQuery(this).val()=='yes') jQuery('#div_additionals').show();
+		else jQuery('#div_additionals').hide();
+	});
+	jQuery('select#nextcloud').click(function() {
+		if (jQuery(this).val()=='Y') jQuery('#div_nextcloud').show();
+		else jQuery('#div_nextcloud').hide();
+	});
+	jQuery('select#bitwarden').click(function() {
+		if (jQuery(this).val()=='Y') jQuery('#div_bitwarden').show();
+		else jQuery('#div_bitwarden').hide();
+	});
+	jQuery('select#bitwarden_smtp').click(function() {
+		if (jQuery(this).val()=='3') jQuery('#div_bitwarden_smtp').show();
+		else jQuery('#div_bitwarden_smtp').hide();
+	});
+	jQuery('select#guacamole').click(function() {
+		if (jQuery(this).val()=='Y') jQuery('#div_guacamole').show();
+		else jQuery('#div_guacamole').hide();
+	});
+	jQuery('select#smtp_server').click(function() {
+		if (jQuery(this).val()=='Y') jQuery('#div_smtp_server').show();
+		else jQuery('#div_smtp_server').hide();
+	});
+	jQuery('select#roundcube').click(function() {
+		if (jQuery(this).val()=='Y') jQuery('#div_roundcube').show();
+		else jQuery('#div_roundcube').hide();
+	});
+*/
+});
+

functions.php

@@ -140,7 +140,7 @@ function show_service($name, $containers) {
 	echo $str;
 }
 
-function show_service_update($name, $update, $uptodate) {
+function show_service_update($name, $update, $uptodate, $error) {
 	$str = '<table id="update_'.$name.'">';
 	$str .= "<tr><th>{$name}</th></tr>";
 
@@ -156,9 +156,19 @@ function show_service_update($name, $update, $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></td></tr>";
+			$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>";
 		}
 	}
+
+        $error = trim($error);
+        if (!empty($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 .= '</table>';
 
 	echo $str;
@@ -267,7 +277,8 @@ function set_output($op,$output) {
 		redis_set($op,$output);
 	}
 	else {
-		file_put_contents($SHARED_DIR."/input/".$op.".json",$output);
+		if (file_exists($SHARED_DIR."/input/".$op.".json")) return false;
+		else file_put_contents($SHARED_DIR."/input/".$op.".json",$output);
 	}
 
 	return true;
@@ -354,7 +365,7 @@ function remove_response($key) {
 	}
 	else {
 		copy($SHARED_DIR."/output/".$key.".json",$SHARED_DIR."/".$key.".json"); // DEBUG - last json
-		unlink($SHARED_DIR."/output/".$key.".json");
+		if (!unlink($SHARED_DIR."/output/".$key.".json")) echo "UNLINK ERROR";
 	}	
 }
 

manage.html

@@ -141,432 +141,15 @@
 </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>
-
-function check_deployments() {
-  var url  = 'scan.php?op=check_deployments';
-  jQuery.get(url, function(data) {
-      console.log('check_deployments: '+data);
-      if (data=="WAIT" || data=="") {
-	  setTimeout(check_deployments, 1000);
-      }
-      else jQuery("#deployments").html(data);
-  });
-}
-
-function get_deployments() {
-  var url  = 'scan.php?op=deployments';
-  jQuery.get(url, function(data) {
-  	console.log('deployments: '+data);
-	if (data=="OK") {
-      		setTimeout(check_deployments, 1000);
-	}
-	else jQuery("#deployments").html(data);
-  });
-}
-
-function check_system() {
-  var url  = 'scan.php?op=check_system&services=1';
-  jQuery.get(url, function(data) {
-    console.log('check_system: '+data);
-      if (data=="WAIT" || data=="") {
-        setTimeout(check_system, 1000);
-      }
-      else {
-        jQuery("#system").html(data);
-      }
-  });
-}
-
-function get_system() {
-  var url  = 'scan.php?op=system';
-  jQuery.get(url, function(data) {
-    console.log('system: '+data);
-	  if (data=="OK") {
-      		setTimeout(check_system, 1000);
-	  }
-	  else alert(data);
-  });
-}
-
-function check_repositories() {
-  var url  = 'scan.php?op=check_repositories';
-  jQuery.get(url, function(data) {
-      console.log('check_repositories: '+data);
-      if (data=="WAIT" || data=="") {
-		setTimeout(check_repositories, 500);
-      }
-      else {
-		jQuery("#repositories").html(data);
-      }
-  });
-}
-
-function get_repositories() {
-  var url  = 'scan.php?op=repositories';
-  jQuery.get(url, function(data) {
-	console.log('repositories: '+data);
-	if (data=="OK") {
-		setTimeout(check_repositories, 500);
-		get_deployments();
-	}
-	else alert(data);
-  });
-}
-
-function add_repository() {
-  var url  = 'scan.php?op=add_repository&repo='+jQuery('#repository').val();
-  jQuery.get(url, function(data) {
-	console.log('add_repository: '+data);
-	  if (data=="OK") {
-	  }
-	get_repositories();
-  });
-}
-
-function check_vpn() {
-  var url  = 'scan.php?op=check_vpn';
-  jQuery.get(url, function(data) {
-        console.log('check_vpn: '+data);
-        if (data=="2") {
-          $('#vpn_off').hide();
-          $('#vpn_on').show();
-        }
-        else {
-          $('#vpn_on').hide();
-          $('#vpn_off').show();
-        }
-        setTimeout(check_vpn, 10000);
-  });
-}
-
-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") {
-	  }
-	//get_vpn();
-  });
-}
-
-function check_updates() {
-  var url  = 'scan.php?op=check_updates';
-  jQuery.get(url, function(data) {
-	console.log('check_updates: '+data);
-      if (data=="WAIT" || data=="") {
-        setTimeout(check_updates, 1000);
-      }
-      else {
-        jQuery("#updates").html(data);
-      }
-  });
-}
-
-function get_updates() {
-  var url  = 'scan.php?op=updates';
-  jQuery.get(url, function(data) {
-	console.log('updates: '+data);
-	  if (data=="OK") {
-      		setTimeout(check_updates, 1000);
-	  }
-  });
-}
-
-function check_upgrade() {
-  var url  = 'scan.php?op=check_upgrade';
-  jQuery.get(url, function(data) {
-        console.log('check_upgrade: '+data);
-      if (data=="WAIT" || data=="") {
-        setTimeout(check_upgrade, 1000);
-      }
-      else {
-              // TODO
-      }
-  });
-}
-
-function upgrade(service) {
-  var url  = 'scan.php?op=upgrade&service='+service;
-  console.log('upgrade start: '+service);
-  jQuery.get(url, function(data) {
-        console.log('upgrade end: '+service);
-          if (data=="OK") {
-                setTimeout(check_upgrade, 1000);
-          }
-  });
-}
-
-function load_template(additional) {
-
-  jQuery("div.deployment").each(function(index) {
-        $(this).html('');
-  });
-  jQuery("#"+additional).html('Loading '+additional+' template...');
-  var url  = 'scan.php?op=deployment&additional='+additional;
-  jQuery.get(url, function(data) {
-	console.log('load_template: '+data);
-	  if (data=="OK") {
-      		setTimeout(check_deployment, 1000, additional);
-	  }
-  });
-}
-
-function check_reinstall(additional) {
-  var url  = 'scan.php?op=check_reinstall';
-  jQuery.get(url, function(data) {
-	console.log('check_reinstall: '+data);
-      if (data!="") {
-	      jQuery("#"+additional).html(data);
-      }
-      else setTimeout(check_reinstall, 1000, additional);
-  });
-}
-
-function reinstall(additional) {
-  jQuery("div.deployment").each(function(index) {
-        $(this).html('');
-  });
-  jQuery("#"+additional).html('Loading '+additional+' template...');
-  var url  = 'scan.php?op=reinstall&additional='+additional;
-  jQuery.get(url, function(data) {
-	console.log('reinstall '+additional+': '+data);
-	  if (data=="OK") {
-      		setTimeout(check_reinstall, 1000, additional);
-	  }
-  });
-}
-
-function check_uninstall(additional) {
-  var url  = 'scan.php?op=check_uninstall&additional='+additional;
-  jQuery.get(url, function(data) {
-        console.log('check_uninstall '+additional+': '+data);
-      if (data!="") {
-              jQuery("#"+additional).html(data);
-      }
-      if (data!="OK") {
-              setTimeout(check_uninstall, 1000, additional);
-      }
-      else {
-	  jQuery("#"+additional).html('Uninstall has finished');
-	  get_deployments();
-      }
-  });
-}
-
-function uninstall(additional) {
-
-  jQuery("div.deployment").each(function(index) {
-        $(this).html('');
-  });
-	data = '<fieldset><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="btn btn-lg btn-primary btn-block" type="button" onclick="confirm_uninstall(\''+additional+'\')">Uninstall</button></div></div></form></fieldset>';
-	jQuery("#"+additional).html(data);
-}
-
-function confirm_uninstall(additional) {
-  jQuery("#"+additional).html('Loading...');
-  var url  = 'scan.php?op=uninstall&additional='+additional;
-  jQuery.get(url, function(data) {
-        console.log('uninstall '+additional+': '+data);
-          if (data!="") {
-                jQuery("#"+additional).html(data);
-                setTimeout(check_uninstall, 1000, additional);
-          }
-  });
-}
-
-function check_deployment(additional) {
-  var url  = 'scan.php?op=check_deployment&additional='+additional;
-  jQuery.get(url, function(data) {
-      console.log('check_deployment '+additional);
-      //console.log('check_deployment data: '+data);
-      if (data!="") {
-	      jQuery("#"+additional).html(data);
-      }
-      else setTimeout(check_deployment, 1000, additional);
-  });
-}
-
-function deploy(additional) {
-  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=deploy&additional='+additional+pars;
-  jQuery.get(url, function(data) {
-	console.log('deploy '+additional+': '+data);
-	  if (data!="") {
-	        jQuery("#"+additional).html(data);
-      		setTimeout(check_deployment, 1000, additional);
-	  }
-  });
-}
-
-function redeploy(additional) {
-  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=redeploy&additional='+additional+pars;
-  jQuery.get(url, function(data) {
-	console.log('redeploy '+additional+': '+data);
-	  if (data!="") {
-	        jQuery("#"+additional).html(data);
-      		setTimeout(check_deployment, 1000, additional);
-	  }
-  });
-}
-
-function check_services() {
-  var url  = 'scan.php?op=check_services';
-  jQuery.get(url, function(data) {
-	console.log('check_services: '+data);
-      if (data=="WAIT" || data=="") {
-        setTimeout(check_services, 1000);
-      }
-      else {
-	jQuery("#services").html(data);
-      }
-  });
-}
-
-function get_services() {
-  var url  = 'scan.php?op=services';
-  jQuery.get(url, function(data) {
-	console.log('services: '+data);
-  	setTimeout(check_services, 1000);
-  });
-}
-
-function check_containers() {
-  var url  = 'scan.php?op=check_containers';
-  jQuery.get(url, function(data) {
-	console.log('check_containers: '+data);
-      if (data!="") {
-	      jQuery("#containers").html(data);
-      }
-      else setTimeout(check_containers, 1000);
-  });
-}
-
-function get_containers() {
-  var url  = 'scan.php?op=containers';
-  jQuery.get(url, function(data) {
-	console.log('containers: '+data);
-	  if (data=="OK") {
-      		setTimeout(check_containers, 1000);
-	  }
-  });
-}
-
-jQuery(document).ready(function(){
-
-	get_repositories();
-	get_system();
-	get_services();
-	check_vpn();
-
-	jQuery('#deployments_btn').click(function() {
-		jQuery('#services').hide();
-		jQuery('#deployments').toggle();
-	});
-
-	jQuery('#services_btn').click(function() {
-		jQuery('#deployments').hide();
-		jQuery('#services').toggle();
-	});
-
-	jQuery('#settings_btn').click(function() {
-		jQuery('#settings').toggle();
-		jQuery('#default').toggle();
-		jQuery('#vpn').hide();
-	});
-
-	jQuery('#vpn_btn').click(function() {
-		jQuery('#vpn').toggle();
-		jQuery('#settings').hide();
-	});
-
-	jQuery('#vpn_cancel_btn').click(function() {
-		jQuery('#vpn').hide();
-	});
-
-	jQuery('#update_btn').click(function() {
-		jQuery('#updates').html('Looking for updates... Please wait...');
-		get_updates();
-	});
-
-	jQuery('#add_repo').submit(function() {
-		jQuery('#repositories').html('Loading...');
-		add_repository();
-		return false;
-	});
-
-	jQuery('#save_vpn').submit(function() {
-		save_vpn();
-		jQuery('#vpn').html('Loading...');
-		return false;
-	});
-
-	jQuery('select#smarthost').click(function() {
-		if (jQuery(this).val()=='yes') jQuery('#div_smarthost').show();
-		else jQuery('#div_smarthost').hide();
-
-		if (jQuery("#smarthost").val()=='no' && jQuery("#localproxy").val()=='yes') {
-			alert("Warning! Local proxy will not work without smarthost proxy service.");
-		}
-	});
-	jQuery('select#vpn').click(function() {
-		if (jQuery(this).val()=='yes') jQuery('#div_vpn').show();
-		else jQuery('#div_vpn').hide();
-	});
-/*
-	jQuery('select#discovery').click(function() {
-		if (jQuery(this).val()=='yes') jQuery('#div_discover').show();
-		else jQuery('#div_discover').hide();
-	});
-	jQuery('select#additionals').click(function() {
-		if (jQuery(this).val()=='yes') jQuery('#div_additionals').show();
-		else jQuery('#div_additionals').hide();
-	});
-	jQuery('select#nextcloud').click(function() {
-		if (jQuery(this).val()=='Y') jQuery('#div_nextcloud').show();
-		else jQuery('#div_nextcloud').hide();
-	});
-	jQuery('select#bitwarden').click(function() {
-		if (jQuery(this).val()=='Y') jQuery('#div_bitwarden').show();
-		else jQuery('#div_bitwarden').hide();
-	});
-	jQuery('select#bitwarden_smtp').click(function() {
-		if (jQuery(this).val()=='3') jQuery('#div_bitwarden_smtp').show();
-		else jQuery('#div_bitwarden_smtp').hide();
-	});
-	jQuery('select#guacamole').click(function() {
-		if (jQuery(this).val()=='Y') jQuery('#div_guacamole').show();
-		else jQuery('#div_guacamole').hide();
-	});
-	jQuery('select#smtp_server').click(function() {
-		if (jQuery(this).val()=='Y') jQuery('#div_smtp_server').show();
-		else jQuery('#div_smtp_server').hide();
-	});
-	jQuery('select#roundcube').click(function() {
-		if (jQuery(this).val()=='Y') jQuery('#div_roundcube').show();
-		else jQuery('#div_roundcube').hide();
-	});
-*/
-});
-</script>
+<script src="common.js"></script>
 </body>
 </html>

manage2.html

@@ -0,0 +1,567 @@
+<!DOCTYPE html>
+<html lang="hu">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Control Panel</title>
+    <style>
+        :root {
+            --bg-color: #ffffff;
+            --text-color: #000000;
+            --app-bg: #f0f0f0;
+            --button-border: #000000;
+        }
+        [data-theme="dark"] {
+            --bg-color: #1a1a1a;
+            --text-color: #ffffff;
+            --app-bg: #2c2c2c;
+            --button-border: #ffffff;
+        }
+        body {
+            margin: 0;
+            font-family: Arial, sans-serif;
+            background-color: var(--bg-color);
+            color: var(--text-color);
+            display: flex;
+            flex-direction: column;
+            min-height: 100vh;
+        }
+        header {
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            padding: 10px 20px;
+        }
+        .profile {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            font-weight: bold;
+            gap: 5px;
+            cursor: pointer;
+        }
+        .profile img {
+            width: 50px;
+            height: 50px;
+            object-fit: cover;
+            border-radius: 50%;
+        }
+        .logo {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+        }
+        .logo img {
+            width: 50px;
+            height: 50px;
+        }
+        .logo div {
+            margin: 0;
+            padding: 0;
+        }
+        .logo h1 {
+            margin: 0;
+            padding: 0;
+            font-size: 24px;
+        }
+        .toggle {
+            cursor: pointer;
+            width: 40px;
+            height: 20px;
+            border: 1px solid var(--button-border);
+            border-radius: 10px;
+            position: relative;
+        }
+        .toggle::after {
+            content: '';
+            position: absolute;
+            top: 2px;
+            left: 2px;
+            width: 16px;
+            height: 16px;
+            background: var(--button-border);
+            border-radius: 50%;
+            transition: 0.3s;
+        }
+        .toggle.active::after {
+            transform: translateX(20px);
+        }
+        .buttons {
+            display: flex;
+            justify-content: center;
+            gap: 10px;
+            margin: 20px 0;
+            cursor: pointer;
+        }
+        .buttons button {
+            padding: 10px 20px;
+            background: none;
+            border: 1px solid var(--button-border);
+            border-radius: 10px;
+            cursor: pointer;
+            color: var(--text-color);
+        }
+        .my-apps {
+            flex: 1;
+            background-color: var(--app-bg);
+            padding: 40px;
+            display: flex;
+            flex-wrap: wrap;
+            justify-content: flex-start;
+            align-items: flex-start;
+            gap: 40px;
+            min-width: 92%;
+            max-width: 92%;
+            margin: 0 auto;
+            border-radius: 10px;
+            box-sizing: border-box;
+        }
+        .app {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            width: 120px;
+            cursor: pointer;
+        }
+        .app img {
+            width: 80px;
+            height: 80px;
+            object-fit: contain;
+            margin-bottom: 10px;
+        }
+        footer {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            padding: 20px;
+            font-size: 14px;
+        }
+        .footer-links {
+            display: flex;
+            gap: 15px;
+        }
+        .footer-links a {
+            color: black;
+            text-decoration: none;
+            font-weight: bold;
+        }
+        .footer-center {
+            text-align: center;
+        }
+        .footer-center p {
+            margin: 5px 0;
+        }
+        .footer-center strong {
+            font-size: 18px;
+        }
+        .footer-center a {
+            color: var(--text-color);
+            text-decoration: none;
+            font-weight: bold;
+        }
+        .footer-center a:hover {
+            text-decoration: underline;
+        }
+        .footer-social {
+            display: flex;
+            gap: 15px;
+        }
+        .footer-social a {
+            color: black;
+            text-decoration: none;
+            font-weight: bold;
+        }
+        .hidden {
+            display: none;
+        }
+
+        .popup.hidden {
+            display: none;
+        }
+
+        .popup {
+            position: fixed;
+            top: 0;
+            left: 0;
+            width: 100%;
+            height: 100%;
+            background: rgba(0,0,0,0.5);
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            z-index: 999;
+        }
+
+        .popup-content {
+            background: var(--bg-color);
+            padding: 30px;
+            border-radius: 15px;
+            width: 80%;
+            text-align: center;
+            position: relative;
+            animation: fadeIn 0.3s ease;
+        }
+
+        .popup-content .close {
+            position: absolute;
+            top: 10px;
+            right: 15px;
+            font-size: 24px;
+            cursor: pointer;
+        }
+
+        [data-theme="dark"] .footer-links a,
+        [data-theme="dark"] .footer-social a {
+            color: white;
+        }
+
+        [data-theme="dark"] .footer-links a:hover,
+        [data-theme="dark"] .footer-social a:hover {
+            text-decoration: underline;
+        }
+
+        @keyframes fadeIn {
+            from { opacity: 0; transform: scale(0.9); }
+            to { opacity: 1; transform: scale(1); }
+        }
+
+        .input-group {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            gap: 10px;
+            margin: 20px 0;
+        }
+
+        .input-group input {
+            padding: 10px;
+            border: 1px solid var(--button-border);
+            border-radius: 10px;
+            background: none;
+            color: var(--text-color);
+            outline: none;
+        }
+
+        .input-group button {
+            padding: 10px 20px;
+            background: none;
+            border: 1px solid var(--button-border);
+            border-radius: 10px;
+            color: var(--text-color);
+            cursor: pointer;
+        }
+
+        .checkbox-container {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  cursor: pointer;
+  font-size: 16px;
+  user-select: none;
+  color: var(--text-color);
+  position: relative;
+}
+
+.checkbox-container input {
+  position: absolute;
+  opacity: 0;
+  cursor: pointer;
+  height: 0;
+  width: 0;
+}
+
+.checkmark {
+  position: relative;
+  height: 24px;
+  width: 24px;
+  background-color: var(--app-bg);
+  border: 2px solid var(--button-border);
+  border-radius: 6px;
+  box-sizing: border-box;
+  transition: background-color 0.3s, border-color 0.3s;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+/* Ha be van pipálva: sötét hátteret és világos szegélyt */
+.checkbox-container input:checked ~ .checkmark {
+  background-color: var(--button-border);
+  border-color: var(--button-border);
+}
+
+/* A pipa - kisebb és középen */
+.checkmark::after {
+  content: "";
+  display: block;
+  width: 10px;
+  height: 6px;
+  border: solid var(--bg-color);
+  border-width: 0 0 3px 3px;
+  transform: rotate(-45deg);
+  opacity: 0;
+  transition: opacity 0.3s;
+}
+
+/* Ha be van jelölve: megjelenik a pipa */
+.checkbox-container input:checked ~ .checkmark::after {
+  opacity: 1;
+}
+
+/* Dark mode variációk */
+[data-theme="dark"] {
+  --bg-color: #1a1a1a;
+  --text-color: #f0f0f0;
+  --app-bg: #2c2c2c;
+  --button-border: #e0e0e0;
+}
+
+
+        .custom-select {
+            padding: 10px;
+            border: 1px solid var(--button-border);
+            border-radius: 10px;
+            background-color: var(--app-bg);
+            color: var(--text-color);
+            font-size: 16px;
+            appearance: none;
+            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:black;stroke-width:2' /%3E%3C/svg%3E");
+            background-repeat: no-repeat;
+            background-position: right 10px center;
+            background-size: 12px;
+        }
+
+        [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");
+        }
+        
+        @media (max-width: 768px) {
+            header {
+                flex-direction: column;
+                gap: 10px;
+            }
+
+            .buttons {
+                flex-direction: column;
+                align-items: center;
+            }
+
+            .buttons button {
+                width: 80%;
+            }
+
+            .my-apps {
+                min-width: 75%;
+                max-width: 75%;
+                padding: 20px;
+                justify-content: center;
+                flex-direction: column;
+                text-align: center;
+                align-items: center;
+            }
+
+            .app {
+                width: 80px;
+            }
+
+            footer {
+                flex-direction: column;
+                gap: 10px;
+                text-align: center;
+            }
+
+            .footer-links, .footer-social {
+                justify-content: center;
+            }
+            .input-group {
+                flex-direction: column;
+                align-items: stretch;
+            }
+            
+            .input-group input,
+            .input-group button,
+            .input-group select,
+            .checkbox-container {
+                width: 100%;
+            }
+        }
+    </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="logo">
+        <img src="image.png" alt="Logo">
+        <div><h1>Control Panel</h1></div>
+    </div>
+    <div class="toggle" id="themeToggle"></div>
+</header>
+
+<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>
+
+<div class="my-apps" id="myAppsContainer"></div>
+<div id="popup" class="popup hidden">
+  <div class="popup-content">
+    <span class="close">&times;</span>
+    <div id="popupText" class="deployment">Load app template here</div>
+  </div>
+</div>
+<footer>
+    <div class="footer-links">
+        <a href="#">Help</a>
+        <a href="#">Docs</a>
+        <a href="#">Report</a>
+    </div>
+
+    <div class="footer-center">
+        <p>Want to access your services remotely?</p>
+        <p><strong><a href="#">Go Pro!</a></strong></p>
+    </div>
+
+    <div class="footer-social">
+        <a href="#">GitHub</a>
+        <a href="#">X</a>
+    </div>
+</footer>
+
+<script>
+    const toggle = document.getElementById('themeToggle');
+    toggle.addEventListener('click', () => {
+        const currentTheme = document.documentElement.getAttribute('data-theme');
+        if (currentTheme === 'dark') {
+            document.documentElement.removeAttribute('data-theme');
+        } else {
+            document.documentElement.setAttribute('data-theme', 'dark');
+        }
+        toggle.classList.toggle('active');
+    });
+</script>
+
+<script>
+    // apps array beállítása common.js-ben
+    const apps = []; // GLOBAL VARIABLE
+
+    document.addEventListener('DOMContentLoaded', function() {
+
+    const myAppsBtn = document.getElementById('myAppsBtn');
+    const installAppsBtn = document.getElementById('installAppsBtn');
+    const backupBtn = document.getElementById('backupBtn');
+    const diskBtn = document.getElementById('diskBtn');
+    const monitorBtn = document.getElementById('monitorBtn');
+
+    const myAppsContainer = document.getElementById('myAppsContainer');
+    const popup = document.getElementById('popup');
+    const popupText = document.getElementById('popupText');
+    const closeBtn = document.querySelector('.close');
+
+    //Appok betöltése
+    function renderApps(all) {
+        myAppsContainer.innerHTML = '';
+        apps.forEach(app => {
+	    if ((all==false && app.installed=='true') || (all==true && app.installed!='true')) {
+		    const appDiv = document.createElement('div');
+		    appDiv.className = 'app';
+		    appDiv.innerHTML = `
+			<img src="${app.image}" alt="${app.name}" title="${app.orig_name}">${app.orig_name}
+		    `;
+		    appDiv.addEventListener('click', () => {
+			popupText.textContent = `You clicked on ${app.name}!`;
+			if (app.installed=='true') reinstall(app.name, 'popupText');
+			else load_template(app.name,'popupText');
+			popup.classList.remove('hidden');
+		    });
+		    myAppsContainer.appendChild(appDiv);
+            }
+        });
+    }
+
+    //TODO: Ilyen függvényeket kell csinálni és a listenerekhez adni az egyes részeket
+    function renderText(title) {
+        //TODO: itt kell a buttont editálni és így kell hozzáadni hozzá mindent
+        myAppsContainer.innerHTML = `
+            <h1 style="text-align: center;">${title}</h1>
+
+            <div class="input-group">
+                <input type="text" placeholder="Írj be valamit..." id="textInput">
+                <button id="submitButton">Küldés</button>
+
+                <select id="myComboBox" class="custom-select">
+                    <option value="">Válassz egy lehetőséget...</option>
+                    <option value="1">Első opció</option>
+                    <option value="2">Második opció</option>
+                    <option value="3">Harmadik opció</option>
+                </select>
+
+                <label class="checkbox-container">
+                    <input type="checkbox" id="myCheckbox">
+                    <span class="checkmark"></span>
+                    Elfogadom a feltételeket
+                </label>
+            </div>
+        `;
+
+        const submitButton = document.getElementById('submitButton');
+        const textInput = document.getElementById('textInput');
+
+        if (submitButton && textInput) {
+            submitButton.addEventListener('click', () => {
+                const value = textInput.value.trim();
+                if (value) {
+                    alert(`Beírt szöveg: ${value}`);
+                    textInput.value = '';
+                } else {
+                    alert('Kérlek írj be valamit!');
+                }
+            });
+        }
+    }
+
+    myAppsBtn.addEventListener('click', () => renderApps(false));
+    installAppsBtn.addEventListener('click', () => renderApps(true));
+    backupBtn.addEventListener('click', () => renderText('Backup'));
+    diskBtn.addEventListener('click', () => renderText('Disk Management'));
+    monitorBtn.addEventListener('click', () => renderText('Monitor'));
+
+    closeBtn.addEventListener('click', () => {
+        popup.classList.add('hidden');
+    });
+
+    popup.addEventListener('click', (event) => {
+        if (event.target === popup) {
+            popup.classList.add('hidden');
+        }
+    });
+
+    renderApps(false);
+});
+</script>
+
+<script>
+    const profileSection = document.getElementById('profileSection');
+    profileSection.addEventListener('click', () => {
+        //TODO: profile szekcióra kattintott
+    });
+</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=3"></script>
+</body>
+</html>

scan.php

@@ -116,7 +116,7 @@ switch ($_GET["op"]) {
 					if ($data["INSTALL_STATUS"]==1) {
 						echo "<table><tr><td><b>Service/Container</b></td><td><b>Image</b></td><td><b>Status</b></td><td><b>Action</b></td></tr></table>";
 						foreach ($data["INSTALLED_SERVICES"] as $service_name => $object) {
-							show_service_update($service_name, trim($object["update"]), trim($object["uptodate"]));
+							show_service_update($service_name, trim($object["update"]), trim($object["uptodate"]), trim($object["error"]));
 						}
 						echo "<br>";
 					}
@@ -134,46 +134,33 @@ switch ($_GET["op"]) {
 		else echo "ERROR";
 	break;
 	case "check_deployments":
+		$deployments = "";
 		$arr = check_response("deployments");
 		if (!empty($arr)) {
 			foreach ($arr as $key=>$data) {
 				if ($key=="deployments") {
 					if (count($data["DEPLOYMENTS"])) {
-						if ($data["DEPLOYMENTS"]["deployments"]=="NONE") echo "There are no deployments.<br>";
+						if ($data["DEPLOYMENTS"]["deployments"]=="NONE") $deployments = "There are no deployments.";
 						else {
 							foreach ($data["DEPLOYMENTS"] as $service_name => $content) {
                                                                 $orig_service_name = $service_name;
                                                                 $service_name = strtolower($service_name);
                                                                 //echo base64_decode($content);
-								if (array_key_exists($service_name,$data["INSTALLED_SERVICES"])) {
-                                                                        echo '<div><a href="#" onclick="reinstall(\''.$service_name.'\')">'.$orig_service_name.'</a> - '.$content.' - INSTALLED</div>';
+								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.'"}';
 							}
-								else echo '<div><a href="#" onclick="load_template(\''.$service_name.'\')">'.$orig_service_name.'</a> - '.$content.'</div>';
-								echo '<div id="'.$service_name.'" class="deployment"></div>';
+							if (!empty($deployments)) $deployments = "[{$deployments}]";
 						}
 					}
-					}
-					else echo "There are no deployments.";
-					echo "<br>";
-/*
-					if (count($data["INSTALLED_SERVICES"])) {
-						echo "<br>Installed services:<br>";
-						if ($data["INSTALLED_SERVICES"]["services"]=="NONE") echo "There are no installed services.<br>";
-						else {
-							foreach ($data["INSTALLED_SERVICES"] as $service_name => $content) {
-								//echo base64_decode($content);
-								echo $service_name."<br>";
-							}
-							echo "<br>";
-						}
-					}
-					else echo "There are no installed services.<br>";
-*/
+					else $deployments = "There are no deployments.";
 					remove_response("$key");
 				}
 			}
 		}
-		else echo "WAIT";
+		else $deployments = "WAIT";
+		echo $deployments;
 	break;
 	case "deployment":
 		$arr = array("NAME" => $_GET["additional"], "ACTION" => "ask");
@@ -193,7 +180,6 @@ switch ($_GET["op"]) {
 						$template = json_decode(base64_decode($data["TEMPLATE"]));
 						echo "<fieldset><form action=\"#\" method=\"post\" id=\"deploy_{$template->name}_form\"><br>";
 						if ($reinstall) {
-							//var_dump($template);
                                                         //var_dump($template);
                                                         $letsencrypt = check_letsencrypt();
 							if (empty($letsencrypt)) echo "LETSENCRYPT in progress...";
@@ -245,6 +231,7 @@ switch ($_GET["op"]) {
 	});
         jQuery('#cancel_{$template->name}_btn').click(function() {
                 $('div#{$template->name}').html('');
+    		document.getElementById('popup').classList.add('hidden'); // manage2 
         });
 </script>
 						";