Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop

Author: DaneEveritt

.dev/vagrant/provision.sh

@@ -19,7 +19,7 @@ export DEBIAN_FRONTEND=noninteractive
 debconf-set-selections <<< 'mariadb-server-5.5 mysql-server/root_password password pterodactyl'
 debconf-set-selections <<< 'mariadb-server-5.5 mysql-server/root_password_again password pterodactyl'
 # actually install
-apt-get install -y php7.1 php7.1-cli php7.1-gd php7.1-mysql php7.1-pdo php7.1-mbstring php7.1-tokenizer php7.1-bcmath php7.1-xml php7.1-fpm php7.1-memcached php7.1-curl php7.1-zip php-xdebug mariadb-server nginx curl tar unzip git memcached > /dev/null
+apt-get install -y php7.2 php7.2-cli php7.2-gd php7.2-mysql php7.2-pdo php7.2-mbstring php7.2-tokenizer php7.2-bcmath php7.2-xml php7.2-fpm php7.2-memcached php7.2-curl php7.2-zip php-xdebug mariadb-server nginx curl tar unzip git memcached > /dev/null
 
 echo "Install composer"
 curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
@@ -32,8 +32,8 @@ systemctl enable mailhog.service
 systemctl start mailhog
 
 echo "Configure xDebug"
-cp /var/www/html/pterodactyl/.dev/vagrant/xdebug.ini /etc/php/7.1/mods-available/
-systemctl restart php7.1-fpm
+cp /var/www/html/pterodactyl/.dev/vagrant/xdebug.ini /etc/php/7.2/mods-available/
+systemctl restart php7.2-fpm
 
 echo "Configure nginx"
 cp /var/www/html/pterodactyl/.dev/vagrant/pterodactyl.conf /etc/nginx/sites-available/

.dev/vagrant/pterodactyl.conf

@@ -31,7 +31,7 @@ server {
     location ~ \.php$ {
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
         # the fastcgi_pass path needs to be changed accordingly when using CentOS
-        fastcgi_pass unix:/var/run/php/php7.1-fpm.sock;
+        fastcgi_pass unix:/var/run/php/php7.2-fpm.sock;
         fastcgi_index index.php;
         include fastcgi_params;
         fastcgi_param PHP_VALUE "upload_max_filesize = 100M \n post_max_size=100M";

.github/ISSUE_TEMPLATE.md

@@ -1,14 +1,24 @@
-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.
+<!---
+Please take a little time to submit a good issue. It makes our life easier and the issue will be resolved quicker.
 
-If you're just making a suggestion, be descriptive, and link to any issues that might be releated as well.
+If you are submitting a feature request please remove everything in here. Then give a detailed explanation what you want to have implemented and why that would be a good addition.
 
-You can delete from this line up.
----------------------
+Please also try to give the issue a good title: It should summarize your issue in a few words and help us see what the issue is about in a glance. Things like "Panel is not working" do not help.
 
+--- You can delete everything above this line. --->
+
+<!--- Please fill in the following basic information --->
 * Panel or Daemon: 
 * Version of Panel/Daemon: 
 * Server's OS: 
 * Your Computer's OS & Browser: 
 
-## Add Details Below:
+------------------------
+
+<!---
+Please provide as much information about your issue as needed. Include precise steps to reproduce the issue and provide logs of the components that didn't work as expected.
 
+Please provide additional information, depending on what you have issues with:
+Panel: `php -v` (the php version in use).
+Daemon: `uname -a` and `docker info` (your kernel version and information regarding docker)
+--->

.gitignore

@@ -25,4 +25,7 @@ docker-compose.yml
 # for image related files
 misc
 .phpstorm.meta.php
-.php_cs.cache
+.php_cs.cache
+
+# Vagrant
+*.log

resources/lang/de/server.php

@@ -124,7 +124,7 @@
                 'title' => 'Send Console Command',
                 'description' => 'Der User darf die Konsole benutzen.',
             ],
-            'view_sftp' => [
+            'access_sftp' => [
                 'title' => 'SFTP erlaubt',
                 'description' => 'Ermöglicht dem Benutzer, eine Verbindung mit dem vom Daemon bereitgestellten SFTP-Server herzustellen.',
             ],

resources/lang/en/server.php

@@ -128,7 +128,7 @@
                 'title' => 'Send Console Command',
                 'description' => 'Allows sending a command from the console. If the user does not have stop or restart permissions they cannot send the application\'s stop command.',
             ],
-            'view_sftp' => [
+            'access_sftp' => [
                 'title' => 'SFTP Allowed',
                 'description' => 'Allows user to connect to the SFTP server provided by the daemon.',
             ],

resources/lang/es/server.php

@@ -124,7 +124,7 @@
                 'title' => 'Enviar Comandos De La Consola',
                 'description' => 'Permite el envío de un comando desde la consola. Si el usuario no tiene permiso para detener o reiniciar, no puede enviar el comando de detención de la aplicación.',
             ],
-            'view_sftp' => [
+            'access_sftp' => [
                 'title' => 'SFTP permitido',
                 'description' => 'Permite al usuario conectarse al servidor SFTP proporcionado por el daemon.',
             ],