done a few fixes for newer php-versions

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
Merge branch 'master' of github.com:Froxlor/Froxlor
fix incorrect security check on mail-directories where various special-characters are allowed, fixes #1458

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
don't make the fpm-socket readable for all, fixes #1418

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
fix version_compare
Removing evil if from nginx vhosts

Signed-off-by: Roman Schmerold <bnoize@froxlor.org>
Removed another evil if I overlooked

Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
Fixed duplicate creation of directory protection, fixes #1450

Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
Update copyright in standard customer index

Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
Added froxlor logo to footer

Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
Rewrite of merging special vhost settings, fixes #1430

Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>