Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	app/Http/Controllers/Base/LanguageController.php
#	app/Http/Kernel.php
#	app/Http/Middleware/TrimStrings.php
#	app/Providers/RouteServiceProvider.php

app/Console/Commands/UpdateEnvironment.php

@@ -154,6 +154,19 @@ class UpdateEnvironment extends Command
             $variables['SESSION_DRIVER'] = $this->option('session-driver');
         }
 
+        if (is_null($this->option('queue-driver'))) {
+            $this->line('If you chose redis as your cache driver backend, you *must* have a redis server configured already.');
+            $variables['QUEUE_DRIVER'] = $this->choice('Which cache driver backend would you like to use?', [
+                'database' => 'Database (recommended)',
+                'redis' => 'Redis',
+                'sqs' => 'Amazon SQS',
+                'sync' => 'Sync',
+                'null' => 'None',
+            ], config('queue.driver', 'database'));
+        } else {
+            $variables['QUEUE_DRIVER'] = $this->option('queue-driver');
+        }
+
         $bar = $this->output->createProgressBar(count($variables));
 
         foreach ($variables as $key => $value) {

app/Exceptions/Handler.php

@@ -70,6 +70,6 @@ class Handler extends ExceptionHandler
             return response()->json(['error' => 'Unauthenticated.'], 401);
         }
 
-        return redirect()->guest('/auth/login');
+        return redirect()->guest(route('auth.login'));
     }
 }

app/Http/Controllers/Base/LanguageController.php

@@ -0,0 +1,71 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+namespace Pterodactyl\Http\Controllers\Base;
+
+use Auth;
+use Session;
+use Illuminate\Http\Request;
+use Pterodactyl\Models\User;
+use Pterodactyl\Http\Controllers\Controller;
+
+class LanguageController extends Controller
+{
+    /**
+     * A list of supported languages on the panel.
+     *
+     * @var array
+     */
+    protected $languages = [
+        'de' => 'German',
+        'en' => 'English',
+        'et' => 'Estonian',
+        'nb' => 'Norwegian',
+        'nl' => 'Dutch',
+        'pt' => 'Portuguese',
+        'ro' => 'Romanian',
+        'ru' => 'Russian',
+    ];
+
+    /**
+     * Sets the language for a user.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  string                    $language
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function setLanguage(Request $request, $language)
+    {
+        if (array_key_exists($language, $this->languages)) {
+            if (Auth::check()) {
+                $user = User::findOrFail(Auth::user()->id);
+                $user->language = $language;
+                $user->save();
+            }
+            Session::put('applocale', $language);
+        }
+
+        return redirect()->back();
+    }
+}

app/Http/Middleware/LanguageMiddleware.php

@@ -44,7 +44,7 @@ class LanguageMiddleware
         if (Session::has('applocale')) {
             App::setLocale(Session::get('applocale'));
         } elseif (Auth::check() && isset(Auth::user()->language)) {
-            Session::set('applocale', Auth::user()->language);
+            Session::put('applocale', Auth::user()->language);
             App::setLocale(Auth::user()->language);
         } else {
             App::setLocale(Settings::get('default_language', 'en'));

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -18,7 +18,7 @@ class RedirectIfAuthenticated
     public function handle($request, Closure $next, $guard = null)
     {
         if (Auth::guard($guard)->check()) {
-            return redirect('/');
+            return redirect(route('index'));
         }
 
         return $next($request);

app/Http/Middleware/TrimStrings.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Middleware;
+namespace Pterodactyl\Http\Middleware;
 
 use Illuminate\Foundation\Http\Middleware\TrimStrings as BaseTrimmer;
 

app/Observers/ServerObserver.php

@@ -25,11 +25,8 @@
 namespace Pterodactyl\Observers;
 
 use Cache;
-use Carbon;
 use Pterodactyl\Events;
 use Pterodactyl\Models\Server;
-use Pterodactyl\Jobs\DeleteServer;
-use Pterodactyl\Jobs\SuspendServer;
 use Pterodactyl\Notifications\ServerCreated;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 

app/Providers/AuthServiceProvider.php

@@ -2,7 +2,6 @@
 
 namespace Pterodactyl\Providers;
 
-use Illuminate\Contracts\Auth\Access\Gate as GateContract;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
 
 class AuthServiceProvider extends ServiceProvider
@@ -22,8 +21,8 @@ class AuthServiceProvider extends ServiceProvider
      * @param  \Illuminate\Contracts\Auth\Access\Gate  $gate
      * @return void
      */
-    public function boot(GateContract $gate)
+    public function boot()
     {
-        parent::registerPolicies($gate);
+        $this->registerPolicies();
     }
 }

app/Providers/RouteServiceProvider.php

@@ -33,21 +33,6 @@ class RouteServiceProvider extends ServiceProvider
      */
     public function map()
     {
-        $this->mapper();
-
-        Route::group(['namespace' => $this->namespace], function ($router) {
-            foreach (glob(app_path('Http//Routes') . '/*.php') as $file) {
-                $this->app->make('Pterodactyl\\Http\\Routes\\' . basename($file, '.php'))->map($router);
-            }
-        });
-    }
-
-    /**
-     * Configure all routes used by the application.
-     *
-     * @return void
-     */
-    protected function mapper() {
         Route::middleware(['web', 'auth', 'csrf'])
              ->namespace($this->namespace . '\Base')
              ->group(base_path('routes/base.php'));

app/Repositories/ServerRepository.php

@@ -25,7 +25,6 @@
 namespace Pterodactyl\Repositories;
 
 use DB;
-use Log;
 use Crypt;
 use Validator;
 use Pterodactyl\Models;