2 Commits
1.0.7 ... 1.0.9

Author SHA1 Message Date
99b248577e edit deployment data fix
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
2025-05-29 12:46:17 +00:00
8aed85fba5 edit deployment data
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
2025-05-29 10:56:45 +00:00
4 changed files with 38 additions and 7 deletions

View File

@@ -266,6 +266,25 @@ function confirm_uninstall(additional) {
});
}
function update_deployment(additional) {
//jQuery("#"+additional).html('Loading...');
pars = '';
jQuery('input.additional_'+additional).each(function(index) {
console.log('Field ' + $(this).attr('name') + ': ' + $(this).val());
//pars += '&'+$(this).attr('id') + '=' + $(this).val();
pars += '&'+$(this).attr('name') + '=' + $(this).val();
});
//console.log(pars);
var url = 'scan.php?op=edit&additional='+additional+pars;
jQuery.get(url, function(data) {
console.log('edit '+additional+': '+data);
if (data!="") {
jQuery("#"+additional).html(data);
setTimeout(check_deployment, 1000, additional);
}
});
}
function request_letsencrypt(domain) {
var url = 'scan.php?op=request_letsencrypt&domain='+domain;
jQuery.get(url, function(data) {

View File

@@ -152,6 +152,6 @@
<script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.14.6/dist/umd/popper.min.js" integrity="sha384-wHAiFfRlMFy6i5SRaxvfOCifBUQy1xHdJ/yoi7FRNXMRBu5WHdZYu1hA6ZOblgut" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.2.1/dist/js/bootstrap.min.js" integrity="sha384-B0UglyR+jN6CkvvICOB2joaf5I4l3gm9GU6Hc1og6Ls7i6U/mkkaduKaBhlAXv9k" crossorigin="anonymous"></script>
<script src="common.js?t=4"></script>
<script src="common.js?t=5"></script>
</body>
</html>

View File

@@ -803,6 +803,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=7"></script>
<script src="common.js?t=8"></script>
</body>
</html>

View File

@@ -203,7 +203,7 @@ switch ($_GET["op"]) {
foreach ($template->fields as $field) {
if (!empty($field->title)) echo "<div class=\"row\"><h3>".$field->title."</h3></div>";
if (isset($field->generated)) {
echo "<input type=\"hidden\" value=\"generated:{$field->generated}\" name=\"{$field->key}\" id=\"{$template->name}_{$field->key}\" class=\"additional_{$template->name}\">";
echo "<input type=\"hidden\" value=\"generated:{$field->generated}:{$field->value}\" name=\"{$field->key}\" id=\"{$template->name}_{$field->key}\" class=\"additional_{$template->name}\">";
}
else {
echo "<div class=\"row\">";
@@ -223,9 +223,15 @@ switch ($_GET["op"]) {
}
echo "
<div class=\"row buttons\">
<div class=\"mb-3\">
echo "<div class=\"row buttons\">";
if ($reinstall) {
echo "
<div class=\"mb-3\">
<button class=\"btn btn-lg btn-primary btn-block\" type=\"submit\" id=\"update_{$template->name}_btn\" onclick=\"update_deployment('{$template->name}')\">Update</button>
</div>";
}
echo "
<div class=\"mb-3\" style=\"margin-left:30px;\">
<button class=\"btn btn-lg btn-primary btn-block\" type=\"submit\" id=\"deploy_{$template->name}_btn\">".($reinstall ? "Reinstall" : "Install")."</button>
</div>";
if ($reinstall) {
@@ -234,7 +240,7 @@ switch ($_GET["op"]) {
<button class=\"btn btn-lg btn-primary btn-block\" type=\"button\" id=\"uninstall_{$template->name}_btn\" onclick=\"uninstall('{$template->name}')\">Uninstall</button>
</div>";
}
echo "<div class=\"mb-3\" style=\"margin-left:30px;\">
echo "<div class=\"mb-3\" style=\"margin-left:230px;float:\">
<button class=\"btn btn-lg btn-primary btn-block\" type=\"button\" id=\"cancel_{$template->name}_btn\">Cancel</button>
</div>";
echo "
@@ -297,6 +303,7 @@ switch ($_GET["op"]) {
show_letsencrypt($letsencrypt, $domain);
}
break;
case "edit": // update deployment after edit
case "redeploy":
case "deploy":
if ($key=check_deploy($_GET["additional"])) {
@@ -311,6 +318,11 @@ switch ($_GET["op"]) {
foreach ($fields as $field_key => $field_value) {
$field_arr = explode(":",$field_value);
if ($field_arr[0]=="generated") {
if ($_GET["op"]=="edit") {
$fields[$field_key] = $field_arr[2]; // replace with previously stored value
continue; // do NOT regenerate values
}
if (intval($field_arr[3])==0) $len = 10; // default length
else $len = $field_arr[3];