Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion webroot/panel/account.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,13 @@
$validKeys = array_filter($keys, "testValidSSHKey");
$USER->setSSHKeys(array_merge($USER->getSSHKeys(), $validKeys));
if (count($keys) != count($validKeys)) {
UnityHTTPD::alert("invalid SSH key");
UnityHTTPD::badRequest(
"one more more invalid SSH keys were not added",
data: [
"keys_valid_added" => $validKeys,
"keys_invalid_not_added" => array_diff($keys, $validKeys),
],
);
}
}
break;
Expand Down
7 changes: 5 additions & 2 deletions webroot/panel/modal/new_key.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@

<div style="display: none;" id="key_import">
<label for="keyfile">Select local file:</label>
<input type="file" id="keyfile" name="keyfile">
<input type="submit" value="Import Key">
<input type="file" id="keyfile" name="keyfile" />
<input type="submit" id="submit-keyfile" value="Import Key" disabled />
</div>

<div style="display: none;" id="key_generate">
Expand Down Expand Up @@ -116,4 +116,7 @@ function generateKey(type) {
});
});

$("#keyfile").on("change", function() {
$("#submit-keyfile")[0].disabled = !this.files.length;
});
</script>