dvkei/Pterodactyl-Panel
1
0
Fork 0
forked from Alex/Pterodactyl-Panel
Code Issues Pull Requests Projects Releases Wiki Activity

Apply fixes from StyleCI (#325)

Browse Source
This commit is contained in:
Dane Everitt 2017-02-24 18:23:03 -05:00 committed by GitHub
parent cb6b44d4f0
commit bbf9fd12ae
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Admin/ServersController.php
View File

@ -128,8 +128,9 @@ class ServersController extends Controller
public function postNewServerGetNodes(Request $request) public function postNewServerGetNodes(Request $request)
{ {
$nodes = Models\Node::with('allocations')->where('location_id', $request->input('location'))->get(); $nodes = Models\Node::with('allocations')->where('location_id', $request->input('location'))->get();
return $nodes->map(function ($item) { return $nodes->map(function ($item) {
$filtered = $item->allocations->where('server_id', null)->map(function($map) { $filtered = $item->allocations->where('server_id', null)->map(function ($map) {
return collect($map)->only(['id', 'ip', 'port']); return collect($map)->only(['id', 'ip', 'port']);
}); });

1
app/Http/Middleware/AdminAuthenticate.php
View File

@ -24,7 +24,6 @@
namespace Pterodactyl\Http\Middleware; namespace Pterodactyl\Http\Middleware;
use Theme;
use Closure; use Closure;
use Illuminate\Contracts\Auth\Guard; use Illuminate\Contracts\Auth\Guard;

4
app/Models/Server.php
View File

@ -29,8 +29,8 @@ use Cache;
use Javascript; use Javascript;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Notifications\Notifiable; use Illuminate\Notifications\Notifiable;
use Nicolaslopezj\Searchable\SearchableTrait;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Nicolaslopezj\Searchable\SearchableTrait;
class Server extends Model class Server extends Model
{ {
@ -86,7 +86,7 @@ class Server extends Model
'installed' => 'integer', 'installed' => 'integer',
]; ];
protected $searchable = [ protected $searchable = [
'columns' => [ 'columns' => [
'servers.name' => 10, 'servers.name' => 10,
'servers.username' => 10, 'servers.username' => 10,

2
app/Repositories/ServerRepository.php
View File

@ -268,7 +268,7 @@ class ServerRepository
// Add Additional Allocations // Add Additional Allocations
if (isset($data['allocation_additional']) && is_array($data['allocation_additional'])) { if (isset($data['allocation_additional']) && is_array($data['allocation_additional'])) {
foreach($data['allocation_additional'] as $allocation) { foreach ($data['allocation_additional'] as $allocation) {
$model = Models\Allocation::where('id', $allocation)->where('node_id', $data['node_id'])->whereNull('server_id')->first(); $model = Models\Allocation::where('id', $allocation)->where('node_id', $data['node_id'])->whereNull('server_id')->first();
if (! $model) { if (! $model) {
continue; continue;