StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add EULA acceptance popup when starting server

Browse source
This commit is contained in:
Dane Everitt 2016-01-08 19:54:06 -05:00
parent 4b40fa65d4
commit 2160613163
7 changed files with 80 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/Http/Controllers/Server/ServerController.php
View file

@ -29,6 +29,15 @@ class ServerController extends Controller
//
}
public function getJavascript(Request $request, $uuid, $file)
{
$server = Server::getByUUID($uuid);
return response()->view('server.js.' . $server->a_serviceFile . '.' . basename($file, '.js'), [
'server' => $server,
'node' => Node::find($server->node)
])->header('Content-Type', 'application/javascript');
}
/**
* Renders server index page for specified server.
*

25
app/Http/Routes/ServerRoutes.php
View file

@ -41,6 +41,16 @@ class ServerRoutes {
'uses' => 'Server\ServerController@getAddFile'
]);
$router->post('files/directory-list', [
'as' => 'server.files.directory-list',
'uses' => 'Server\AjaxController@postDirectoryList'
]);
$router->post('files/save', [
'as' => 'server.files.save',
'uses' => 'Server\AjaxController@postSaveFile'
]);
// Assorted AJAX Routes
$router->group(['prefix' => 'ajax'], function ($server) use ($router) {
// Returns Server Status
@ -52,15 +62,16 @@ class ServerRoutes {
$router->post('set-connection', [
'uses' => 'Server\AjaxController@postSetConnection'
]);
});
// Assorted File Manager URLs
$router->post('files/directory-list', [
'uses' => 'Server\AjaxController@postDirectoryList'
]);
// Assorted AJAX Routes
$router->group(['prefix' => 'js'], function ($server) use ($router) {
// Returns Server Status
$router->get('{file}', [
'as' => 'server.js',
'uses' => 'Server\ServerController@getJavascript'
])->where('file', '.*');
$router->post('files/save', [
'uses' => 'Server\AjaxController@postSaveFile'
]);
});
});
}

7
app/Models/Server.php
View file

@ -112,7 +112,9 @@ class Server extends Model
return self::$serverUUIDInstance[$uuid];
}
$query = self::where('uuidShort', $uuid)->where('active', 1);
$query = self::select('servers.*', 'services.file as a_serviceFile')
->join('services', 'services.id', '=', 'servers.id')
->where('uuidShort', $uuid)->where('active', 1);
if (self::$user->root_admin !== 1) {
$query->whereIn('servers.id', Subuser::accessServers());
@ -120,6 +122,9 @@ class Server extends Model
$result = $query->first();
// @TODO: saving after calling this could end up resetting the daemon secret.
// We probably need to just allow access to self::getUserDaemonSecret() to
// get this result.
if(!is_null($result)) {
$result->daemonSecret = self::getUserDaemonSecret($result);
}