Merge branch 'develop' into feature/service-changes

Author: DaneEveritt

.github/ISSUE_TEMPLATE.md

@@ -1,61 +1,6 @@
-<!-- The checkboxes below can be clicked once you submit this report if you'd like -->
-<!-- You can also use "- [x]" to mark it as checked. -->
-## Product
-Please check the corresponding boxes below for which products this is about.
+Please describe your issue in full below. Include what products are affected, as well as what version(s) you are running. Please also include information about your system, such as `uname -a` and `php -v` and `docker info` if applicable.
 
-- [ ] Panel
-- [ ] Daemon
-- [ ] Dockerfile(s) [Please list if so: __ ]
+If you're just making a suggestion, be descriptive, and link to any issues that might be releated as well.
 
-## Type
-- [ ] Bug or Issue
-- [ ] Feature Request
-- [ ] Enhancement
-- [ ] Other
-
-<!-- You only need to fill out the information below if this is a bug report.  -->
-<!-- Please delete this line and everything below if this is NOT a bug report. -->
-
-## What Happens
-<!-- Please include a description of what is happening when you encounter this bug. -->
-
-## How to Reproduce
-<!-- Please provide us a list of step for how to reproduce this issue. -->
-
-1. Step 1
-2. Step 2
-3. etc.
-
-## Error Logs
-<!-- Please include a paste output of the errors if they are logged. They can be found in: -->
-<!-- Panel: /var/www/pterodactyl/html/storage/logs/               Daemon: /srv/daemon/logs -->
-<!-- You can also paste them on https://gist.github.com and include their links below.     -->
-
-```
-error logs
-```
-
-## System Information
-#### Output of `uname -a`:
-
-```
-paste here
-```
-
-#### Output of `php -v` (if Panel):
-
-```
-paste here
-```
-
-#### Output of `node -v` (if Daemon):
-
-```
-paste here
-```
-
-#### Output of `docker info` and `docker -v` (if Daemon or Dockerfiles):
-
-```
-paste here
-```
+You can delete from this line up.
+---------------------

CHANGELOG.md

@@ -3,6 +3,29 @@ This file is a running track of new features and fixes to each version of the pa
 
 This project follows [Semantic Versioning](http://semver.org) guidelines.
 
+## v0.5.5 (Bodacious Boreopterus)
+### Added
+* New API route to return allocations given a server ID. This adds support for a community-driven WHMCS module :rocket: available [here](https://github.com/hammerdawn/Pterodactyl-WHMCS).
+
+### Fixed
+* Fixes subuser display when trying to edit an existing subuser.
+
+## v0.5.4 (Bodacious Boreopterus)
+### Added
+* Changing node configuration values now automatically makes a call to the daemon and updates the configuration there. Changing daemon tokens now does not require any intervention, and takes effect immediately. SSL & Port configurations will still require a daemon reboot.
+* New button in file manager that triggers the right click menu to enable support on mobile devices and those who cannot right click (blessed be them).
+* Support for filtering users when listing all users on the system.
+* Container ID and User ID on the daemon are now shown when viewing a server in the panel.
+
+### Changed
+* File uploads now account for a maximum file size that is assigned for the daemon, and gives cleaner errors when that limit is reached.
+* File upload limit can now be controlled from the panel.
+* Updates regex and default values for some Minecraft services to reflect current technology.
+
+### Fixed
+* Fixes potential for generated password to not meet own validation requirements.
+* Fixes some regex checking issues with newer versions of Minecraft.
+
 ## v0.5.3 (Bodacious Boreopterus)
 ### Fixed
 * Fixed an error that occurred when viewing a node listing when no nodes were created yet due to a mis-declared variable. Also fixes a bug that would have all nodes trying to connect to the daemon using the same secret token on the node listing, causing only the last node to display properly.

app/Console/Commands/ClearServices.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * Pterodactyl - Panel
- * Copyright (c) 2015 - 2016 Dane Everitt <dane@daneeveritt.com>
+ * Copyright (c) 2015 - 2016 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
@@ -21,10 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
 namespace Pterodactyl\Console\Commands;
 
 use DB;
-
 use Illuminate\Console\Command;
 
 class ClearServices extends Command
@@ -60,8 +60,7 @@ public function __construct()
      */
     public function handle()
     {
-
-        if (!$this->confirm('This is a destructive operation, are you sure you wish to continue?')) {
+        if (! $this->confirm('This is a destructive operation, are you sure you wish to continue?')) {
             $this->error('Canceling.');
             exit();
         }

app/Console/Commands/ClearTasks.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * Pterodactyl - Panel
- * Copyright (c) 2015 - 2016 Dane Everitt <dane@daneeveritt.com>
+ * Copyright (c) 2015 - 2016 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
@@ -21,19 +21,16 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
 namespace Pterodactyl\Console\Commands;
 
-use DB;
 use Carbon;
 use Pterodactyl\Models;
 use Illuminate\Console\Command;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 
-use Pterodactyl\Jobs\SendScheduledTask;
-
 class ClearTasks extends Command
 {
-
     use DispatchesJobs;
 
     /**

app/Console/Commands/Inspire.php

@@ -28,6 +28,6 @@ class Inspire extends Command
      */
     public function handle()
     {
-        $this->comment(PHP_EOL.Inspiring::quote().PHP_EOL);
+        $this->comment(PHP_EOL . Inspiring::quote() . PHP_EOL);
     }
 }

app/Console/Commands/MakeUser.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * Pterodactyl - Panel
- * Copyright (c) 2015 - 2016 Dane Everitt <dane@daneeveritt.com>
+ * Copyright (c) 2015 - 2016 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
@@ -21,11 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
 namespace Pterodactyl\Console\Commands;
 
-use Hash;
 use Illuminate\Console\Command;
-
 use Pterodactyl\Repositories\UserRepository;
 
 class MakeUser extends Command
@@ -77,6 +76,7 @@ public function handle()
         try {
             $user = new UserRepository;
             $user->create($email, $password, $admin);
+
             return $this->info('User successfully created.');
         } catch (\Exception $ex) {
             return $this->error($ex->getMessage());

app/Console/Commands/RunTasks.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * Pterodactyl - Panel
- * Copyright (c) 2015 - 2016 Dane Everitt <dane@daneeveritt.com>
+ * Copyright (c) 2015 - 2016 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
@@ -21,19 +21,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
 namespace Pterodactyl\Console\Commands;
 
-use DB;
 use Carbon;
 use Pterodactyl\Models;
 use Illuminate\Console\Command;
-use Illuminate\Foundation\Bus\DispatchesJobs;
-
 use Pterodactyl\Jobs\SendScheduledTask;
+use Illuminate\Foundation\Bus\DispatchesJobs;
 
 class RunTasks extends Command
 {
-
     use DispatchesJobs;
 
     /**

app/Console/Commands/ShowVersion.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * Pterodactyl - Panel
- * Copyright (c) 2015 - 2016 Dane Everitt <dane@daneeveritt.com>
+ * Copyright (c) 2015 - 2016 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
@@ -21,10 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
 namespace Pterodactyl\Console\Commands;
 
-use Illuminate\Console\Command;
 use Version;
+use Illuminate\Console\Command;
 
 class ShowVersion extends Command
 {

app/Console/Commands/UpdateEmailSettings.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * Pterodactyl - Panel
- * Copyright (c) 2015 - 2016 Dane Everitt <dane@daneeveritt.com>
+ * Copyright (c) 2015 - 2016 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
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
 namespace Pterodactyl\Console\Commands;
 
 use Illuminate\Console\Command;
@@ -66,7 +67,7 @@ public function handle()
     {
         $variables = [];
         $file = base_path() . '/.env';
-        if (!file_exists($file)) {
+        if (! file_exists($file)) {
             $this->error('Missing environment file! It appears that you have not installed this panel correctly.');
             exit();
         }
@@ -75,35 +76,35 @@ public function handle()
 
         $this->table([
             'Option',
-            'Description'
+            'Description',
         ], [
             [
                 'smtp',
-                'SMTP Server Email'
+                'SMTP Server Email',
             ],
             [
                 'mail',
-                'PHP\'s Internal Mail Server'
+                'PHP\'s Internal Mail Server',
             ],
             [
                 'mailgun',
-                'Mailgun Email Service'
+                'Mailgun Email Service',
             ],
             [
                 'mandrill',
-                'Mandrill Transactional Email Service'
+                'Mandrill Transactional Email Service',
             ],
             [
                 'postmark',
-                'Postmark Transactional Email Service'
-            ]
+                'Postmark Transactional Email Service',
+            ],
         ]);
         $variables['MAIL_DRIVER'] = is_null($this->option('driver')) ? $this->choice('Which email driver would you like to use?', [
             'smtp',
             'mail',
             'mailgun',
             'mandrill',
-            'postmark'
+            'postmark',
         ]) : $this->option('driver');
 
         switch ($variables['MAIL_DRIVER']) {

app/Console/Commands/UpdateEnvironment.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * Pterodactyl - Panel
- * Copyright (c) 2015 - 2016 Dane Everitt <dane@daneeveritt.com>
+ * Copyright (c) 2015 - 2016 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
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
 namespace Pterodactyl\Console\Commands;
 
 use Uuid;
@@ -66,23 +67,22 @@ public function __construct()
      */
     public function handle()
     {
-
         $variables = [];
         $file = base_path() . '/.env';
-        if (!file_exists($file)) {
+        if (! file_exists($file)) {
             $this->error('Missing environment file! It appears that you have not installed this panel correctly.');
             exit();
         }
 
         $envContents = file_get_contents($file);
 
         $this->info('Simply leave blank and press enter to fields that you do not wish to update.');
-        if (!env('SERVICE_AUTHOR', false)) {
+        if (! env('SERVICE_AUTHOR', false)) {
             $this->info('No service author set, setting one now.');
             $variables['SERVICE_AUTHOR'] = env('SERVICE_AUTHOR', (string) Uuid::generate(4));
         }
 
-        if (!env('QUEUE_STANDARD', false) || !env('QUEUE_DRIVER', false)) {
+        if (! env('QUEUE_STANDARD', false) || ! env('QUEUE_DRIVER', false)) {
             $this->info('Setting default queue settings.');
             $variables['QUEUE_DRIVER'] = env('QUEUE_DRIVER', 'database');
             $variables['QUEUE_HIGH'] = env('QUEUE_HIGH', 'high');
@@ -91,25 +91,25 @@ public function handle()
         }
 
         if (is_null($this->option('dbhost'))) {
-            $variables['DB_HOST'] = $this->anticipate('Database Host', [ 'localhost', '127.0.0.1', env('DB_HOST') ], env('DB_HOST'));
+            $variables['DB_HOST'] = $this->anticipate('Database Host', ['localhost', '127.0.0.1', env('DB_HOST')], env('DB_HOST'));
         } else {
             $variables['DB_HOST'] = $this->option('dbhost');
         }
 
         if (is_null($this->option('dbport'))) {
-            $variables['DB_PORT'] = $this->anticipate('Database Port', [ 3306, env('DB_PORT') ], env('DB_PORT'));
+            $variables['DB_PORT'] = $this->anticipate('Database Port', [3306, env('DB_PORT')], env('DB_PORT'));
         } else {
             $variables['DB_PORT'] = $this->option('dbport');
         }
 
         if (is_null($this->option('dbname'))) {
-            $variables['DB_DATABASE'] = $this->anticipate('Database Name', [ 'pterodactyl', 'homestead', ENV('DB_DATABASE') ], env('DB_DATABASE'));
+            $variables['DB_DATABASE'] = $this->anticipate('Database Name', ['pterodactyl', 'homestead', ENV('DB_DATABASE')], env('DB_DATABASE'));
         } else {
             $variables['DB_DATABASE'] = $this->option('dbname');
         }
 
         if (is_null($this->option('dbuser'))) {
-            $variables['DB_USERNAME'] = $this->anticipate('Database Username', [ ENV('DB_DATABASE') ], env('DB_USERNAME'));
+            $variables['DB_USERNAME'] = $this->anticipate('Database Username', [ENV('DB_DATABASE')], env('DB_USERNAME'));
         } else {
             $variables['DB_USERNAME'] = $this->option('dbuser');
         }