Merge branch 'stable-3.1'

Author: Marius Burkard

.gitlab/issue_templates/Bug.md

@@ -18,7 +18,7 @@ insert the output of `nginx -v` or `apachectl -v` here
 insert the output of `php -v` here
 ```
 
-## propsed fix
+## proposed fix
 optional, of course.  
 if you want to post code snippets, please use  
 ```  
@@ -34,3 +34,8 @@ if you know of a forum post on howtoforge.com that deals with this topic, just a
 ## screenshots
 optional, of course.  
 Add screenshots of the problem by clicking "Attach a file" on the bottom right.
+
+## log entries
+```
+apache / nginx error.log lines (if related)
+```

install/lib/install.lib.php

@@ -92,6 +92,9 @@ function get_distname() {
 				$ver = explode(" ", $ver, 2);
 				$ver = reset($ver);
 				$mainver = $ver;
+				$mainver = explode('.', $ver);
+				$mainver = array_filter($mainver);
+				$mainver = current($mainver).'.'.next($mainver);
 			}
 			switch ($mainver){
 			case "17.04":

interface/web/admin/list/server_ip.list.php

@@ -1,4 +1,4 @@
-<?php
+<?php
 /*
     Datatypes:
     - INTEGER

interface/web/admin/list/server_ip_map.list.php

@@ -1,4 +1,4 @@
-<?php
+<?php
 
 $liste['name']     = 'server_ip_map';
 $liste['table']    = 'server_ip_map';

interface/web/admin/list/server_php.list.php

@@ -1,4 +1,4 @@
-<?php
+<?php
 /*
     Datatypes:
     - INTEGER

interface/web/js/jquery.ispconfigsearch.js

@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2012, ISPConfig UG (haftungsbeschränkt)
 All rights reserved.
 

server/conf/mail/welcome_email_de.txt

@@ -1,4 +1,4 @@
-From: ISPConfig <postmaster@localhost.localdomain>
+From: ISPConfig <postmaster@localhost.localdomain>
 Subject: Ihr Mailaccount ist aktiv.
 
 Ihr Mailaccount ist jetzt aktiv. Viel Vergnügen.

server/conf/mail/welcome_email_en.txt

@@ -1,4 +1,4 @@
-From: ISPConfig <postmaster@localhost.localdomain>
+From: ISPConfig <postmaster@localhost.localdomain>
 Subject: Welcome to your new email account.
 
 Welcome to your new email account. Your webmaster.

server/conf/mail/welcome_email_es.txt

@@ -1,4 +1,4 @@
-From: ISPConfig <postmaster@localhost.localdomain>
+From: ISPConfig <postmaster@localhost.localdomain>
 Subject: Bienvenido a su nueva cuenta de correo
 
 Bienvenido a su nueva cuenta de correo. Su administrador.

server/conf/mail/welcome_email_hr.txt

@@ -1,4 +1,4 @@
-From: ISPConfig <postmaster@localhost.localdomain>
+From: ISPConfig <postmaster@localhost.localdomain>
 Subject: Dobrodošli u vaš novi email račun.
 
 Dobrodošli u vaš novi email račun. Vaš webmajstor.