Model fixing, moving things around to improve code.
Adds unique UUID generator, moves functions into repositories for adding servers and users, cleans up code, adding more comments.
This commit is contained in:
parent
01eaeaf178
commit
22b0bbf6ce
8 changed files with 333 additions and 250 deletions
|
@ -3,11 +3,9 @@
|
|||
namespace Pterodactyl\Http\Controllers\Admin;
|
||||
|
||||
use Alert;
|
||||
use Debugbar;
|
||||
use Hash;
|
||||
use Uuid;
|
||||
|
||||
use Pterodactyl\Models\User;
|
||||
use Pterodactyl\Repositories\UserRepository;
|
||||
|
||||
use Pterodactyl\Http\Controllers\Controller;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
|
@ -52,18 +50,19 @@ class AccountsController extends Controller
|
|||
'password_confirmation' => 'required'
|
||||
]);
|
||||
|
||||
//@TODO: re-generate UUID if conflict
|
||||
$user = new User;
|
||||
$user->uuid = Uuid::generate(4);
|
||||
try {
|
||||
|
||||
$user->username = $request->input('username');
|
||||
$user->email = $request->input('email');
|
||||
$user->password = Hash::make($request->input('password'));
|
||||
$user = new UserRepository;
|
||||
$userid = $user->create($request->input('username'), $request->input('email'), $request->input('password'));
|
||||
|
||||
$user->save();
|
||||
Alert::success('Account has been successfully created.')->flash();
|
||||
return redirect()->route('admin.accounts.view', ['id' => $userid]);
|
||||
|
||||
} catch (\Exception $e) {
|
||||
Alert::danger('An error occured while attempting to add a new user. Please check the logs or try again.')->flash();
|
||||
return redirect()->route('admin.accounts.new');
|
||||
}
|
||||
|
||||
Alert::success('Account has been successfully created.')->flash();
|
||||
return redirect()->route('admin.accounts.view', ['id' => $user->id]);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
namespace Pterodactyl\Http\Controllers\Admin;
|
||||
|
||||
use Debugbar;
|
||||
use Pterodactyl\Repositories\ServerRepository;
|
||||
use Pterodactyl\Models\Server;
|
||||
use Pterodactyl\Models\Node;
|
||||
use Pterodactyl\Models\Location;
|
||||
|
@ -56,7 +57,8 @@ class ServersController extends Controller
|
|||
{
|
||||
|
||||
try {
|
||||
$resp = Server::addServer($request->all());
|
||||
$server = new ServerRepository;
|
||||
$resp = $server->create($request->all());
|
||||
echo $resp . '<br />';
|
||||
} catch (\Exception $e) {
|
||||
Debugbar::addException($e);
|
||||
|
|
Reference in a new issue