More complete implementation of database management in panel.

Still missing ability to change passwords for databases, but that will
come soon.

app/Http/Controllers/Admin/DatabaseController.php

@@ -23,9 +23,14 @@
  */
 namespace Pterodactyl\Http\Controllers\Admin;
 
+use Alert;
 use DB;
+use Log;
 
 use Pterodactyl\Models;
+use Pterodactyl\Repositories\DatabaseRepository;
+use Pterodactyl\Exceptions\DisplayException;
+use Pterodactyl\Exceptions\DisplayValidationException;
 
 use Pterodactyl\Http\Controllers\Controller;
 use Illuminate\Http\Request;
@@ -62,4 +67,64 @@ class DatabaseController extends Controller
         ]);
     }
 
+    public function getNew(Request $request)
+    {
+        return view('admin.databases.new', [
+            'nodes' => Models\Node::select('nodes.id', 'nodes.name', 'locations.long as a_location')
+                ->join('locations', 'locations.id', '=', 'nodes.location')
+                ->get()
+        ]);
+    }
+
+    public function postNew(Request $request)
+    {
+        try {
+            $repo = new DatabaseRepository;
+            $repo->add($request->except([
+                '_token'
+            ]));
+
+            Alert::success('Successfully added a new database server to the system.')->flash();
+            return redirect()->route('admin.databases', [
+                'tab' => 'tab_dbservers'
+            ]);
+        } catch (DisplayValidationException $ex) {
+            return redirect()->route('admin.databases.new')->withErrors(json_decode($ex->getMessage()))->withInput();
+        } catch (\Exception $ex) {
+            if ($ex instanceof DisplayException || $ex instanceof \PDOException) {
+                Alert::danger($ex->getMessage())->flash();
+            } else {
+                Log::error($ex);
+                Alert::danger('An error occurred while attempting to delete this database server from the system.')->flash();
+            }
+            return redirect()->route('admin.databases.new')->withInput();
+        }
+    }
+
+    public function deleteDatabase(Request $request, $id)
+    {
+        try {
+            $repo = new DatabaseRepository;
+            $repo->drop($id);
+        } catch (\Exception $ex) {
+            Log::error($ex);
+            return response()->json([
+                'error' => ($ex instanceof DisplayException) ? $ex->getMessage() : 'An error occurred while attempting to delete this database from the system.'
+            ], 500);
+        }
+    }
+
+    public function deleteServer(Request $request, $id)
+    {
+        try {
+            $repo = new DatabaseRepository;
+            $repo->delete($id);
+        } catch (\Exception $ex) {
+            Log::error($ex);
+            return response()->json([
+                'error' => ($ex instanceof DisplayException) ? $ex->getMessage() : 'An error occurred while attempting to delete this database server from the system.'
+            ], 500);
+        }
+    }
+
 }

app/Http/Controllers/Admin/ServersController.php

@@ -413,18 +413,4 @@ class ServersController extends Controller
         ])->withInput();
     }
 
-    public function deleteDatabase(Request $request, $id, $database)
-    {
-        try {
-            $repo = new DatabaseRepository;
-            $repo->drop($database);
-            return response('', 204);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-            return response()->json([
-                'error' => 'An exception occured while attempting to delete this database.'
-            ], 500);
-        }
-    }
-
 }

app/Http/Controllers/Server/ServerController.php

@@ -228,6 +228,10 @@ class ServerController extends Controller
 
         return view('server.settings', [
             'server' => $server,
+            'databases' => Models\Database::select('databases.*', 'database_servers.host as a_host', 'database_servers.port as a_port')
+                ->where('server', $server->id)
+                ->join('database_servers', 'database_servers.id', '=', 'databases.db_server')
+                ->get(),
             'node' => Models\Node::find($server->node),
             'variables' => $variables->where('user_viewable', 1),
             'service' => $service,

app/Http/Routes/AdminRoutes.php

@@ -158,10 +158,6 @@ class AdminRoutes {
                 'uses' => 'Admin\ServersController@postDatabase'
             ]);
 
-            $router->delete('/view/{id}/database/{database}', [
-                'uses' => 'Admin\ServersController@deleteDatabase'
-            ]);
-
             // Change Server Details
             $router->post('/view/{id}/details', [
                 'uses' => 'Admin\ServersController@postUpdateServerDetails'
@@ -328,6 +324,14 @@ class AdminRoutes {
             $router->post('/new', [
                 'uses' => 'Admin\DatabaseController@postNew'
             ]);
+            $router->delete('/delete/{id}', [
+                'as' => 'admin.databases.delete',
+                'uses' => 'Admin\DatabaseController@deleteDatabase'
+            ]);
+            $router->delete('/delete-server/{id}', [
+                'as' => 'admin.databases.delete-server',
+                'uses' => 'Admin\DatabaseController@deleteServer'
+            ]);
         });
 
     }