beenull/ctrlpanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #397 from 1day2die/development

Browse source 
simplify the installer User creation and UI Changes
This commit is contained in:
Dennis 2022-02-09 08:37:09 +01:00 committed by GitHub
commit efcd557795
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -23,3 +23,4 @@ storage/app/public/logo.png
*vscode
- Kopie.env
public/install/logs.txt
install.lock

12
public/install/forms.php
View file

@ -206,8 +206,6 @@ if (isset($_POST['createUser'])) {
}
$name = $_POST['user'];
$mail = $_POST['email'];
$pteroID = $_POST['pteroID'];
$pass = $_POST['pass'];
$repass = $_POST['repass'];
@ -231,9 +229,8 @@ if (isset($_POST['createUser'])) {
$result = json_decode($response, true);
curl_close($ch); // Close the connection
if ($result["attributes"]["email"] !== $mail) {
header("LOCATION: index.php?step=6&message=The Email is not the same as the one used on Pterodactyl");
if (!$result["attributes"]["email"]) {
header("LOCATION: index.php?step=6&message=Could not find the user with pterodactyl ID ".$pteroID);
die();
}
if ($pass !== $repass) {
@ -241,6 +238,8 @@ if (isset($_POST['createUser'])) {
die();
}
$mail = $result["attributes"]["email"];
$name = $result["attributes"]["username"];
$pass = password_hash($pass, PASSWORD_DEFAULT);
$pteroURL = $pterobaseurl["value"] . "/api/application/users/" . $pteroID;
@ -269,11 +268,14 @@ if (isset($_POST['createUser'])) {
die();
}
$query1 = "INSERT INTO `" . getEnvironmentValue("DB_DATABASE") . "`.`users` (`name`, `role`, `credits`, `server_limit`, `pterodactyl_id`, `email`, `password`, `created_at`) VALUES ('$name', 'admin', '250', '1', '$pteroID', '$mail', '$pass', CURRENT_TIMESTAMP)";
if ($db->query($query1)) {
wh_log("[USER MAKER] Created user with Email ".$mail. " and pterodactyl ID ". $pteroID);
header("LOCATION: index.php?step=7");
} else {
wh_log($db->error);

39
public/install/index.php
View file

@ -22,6 +22,7 @@ if (file_exists("../../install.lock")) {
left: 50%;
margin-right: -50%;
transform: translate(-50%, -50%);
width: 30%;
}
.ok {
@ -399,29 +400,18 @@ echo $cardheader;
<form method="POST" enctype="multipart/form-data" class="mb-3"
action="/install/forms.php" name="createUser">
<div class="row">
<div class="col-md-12">
<div class="form-group">
<div class="custom-control mb-3">
<label for="user">Your Username</label>
<input id="user" name="user"
type="text" required
value="" class="form-control">
</div>
</div>
<div class="form-group">
<div class="custom-control mb-3">
<label for="email">Your Email Adress (used to Login)</label>
<input id="email" name="email"
type="text" required
value="" class="form-control">
</div>
</div>
<div class="form-group">
<div class="custom-control mb-3">
<label for="pteroID">Your Pterodactyl User-ID (found in the users-list on your pterodactyl dashboard)</label>
<input id="pteroID" name="pteroID" type="text"
required
value="1" class="form-control">
</div>
</div>
<div class="form-group">
<div class="custom-control mb-3">
<label for="pass">Password</label>
<label for="pass">Password (this will be your new pterodactyl password aswell!)</label>
<input id="pass" name="pass" type="password"
required
value="" minlength="8" class="form-control">
@ -436,15 +426,6 @@ echo $cardheader;
</div>
</div>
<div class="form-group">
<div class="custom-control mb-3">
<label for="pteroID">Your Pterodactyl User-ID</label>
<input id="pteroID" name="pteroID" type="text"
required
value="" class="form-control">
</div>
</div>
</div>
<button class="btn btn-primary" name="createUser">Submit</button>