What was I thinking? Fixed bug in 'add node' form when no custom keypair was provided.

feature/node-rewrite
Sven Slootweg 11 years ago
parent 53266626b0
commit 7897ffe6e3

@ -56,12 +56,29 @@ if(isset($_POST['submit']))
$sErrors[] = $locale->strings['error-admin-nodes-add-privatekey']; $sErrors[] = $locale->strings['error-admin-nodes-add-privatekey'];
} }
} }
else
{
$sPublicKeyName = "";
$sPrivateKeyName = "";
}
if(empty($sErrors)) if(empty($sErrors))
{ {
if(isset($_POST['customkey']) == false || if(isset($_POST['customkey']))
(move_uploaded_file($_FILES['publickey']['tmp_name'], "/etc/cvm/keys/{$sPublicKeyName}") && {
move_uploaded_file($_FILES['privatekey']['tmp_name'], "/etc/cvm/keys/{$sPrivateKeyName}"))) $sSuccess = move_uploaded_file($_FILES['publickey']['tmp_name'], "/etc/cvm/keys/{$sPublicKeyName}") &&
move_uploaded_file($_FILES['privatekey']['tmp_name'], "/etc/cvm/keys/{$sPrivateKeyName}");
if(!$sSuccess)
{
$sErrors[] = $locale->strings['error-admin-nodes-add-upload'];
}
}
else
{
$sSuccess = true;
}
if($sSuccess)
{ {
$sNode = new Node(0); $sNode = new Node(0);
$sNode->uName = $_POST['name']; $sNode->uName = $_POST['name'];
@ -76,10 +93,6 @@ if(isset($_POST['submit']))
redirect("/admin/nodes/"); redirect("/admin/nodes/");
} }
else
{
$sErrors[] = $locale->strings['error-admin-nodes-add-upload'];
}
} }
} }

Loading…
Cancel
Save