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

Add database management back to front-end and begin some refactoring

Browse source 
Here we go again boys...
This commit is contained in:
Dane Everitt 2017-10-18 22:32:19 -05:00
parent 2b80de03df
commit 97dc0519d6
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
32 changed files with 774 additions and 407 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/Traits/Controllers/JavascriptInjection.php
View file

@ -10,25 +10,23 @@
namespace Pterodactyl\Traits\Controllers;
use Javascript;
use Illuminate\Http\Request;
trait JavascriptInjection
{
/**
* @var \Illuminate\Contracts\Session\Session
*/
protected $session;
/**
* Injects server javascript into the page to be used by other services.
*
* @param array $args
* @param bool $overwrite
* @return mixed
* @param array $args
* @param bool $overwrite
* @param \Illuminate\Http\Request|null $request
* @return array
*/
public function injectJavascript($args = [], $overwrite = false)
public function injectJavascript($args = [], $overwrite = false, Request $request = null)
{
$server = $this->session->get('server_data.model');
$token = $this->session->get('server_data.token');
$request = $request ?? app()->make(Request::class);
$server = $request->attributes->get('server');
$token = $request->attributes->get('server_token');
$response = array_merge([
'server' => [