From d21391e8baef788e643ed9dfe77f60b5d0125437 Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Thu, 12 Nov 2015 08:27:07 +0100
Subject: [PATCH] add apache-2.4 to the installer so apache-2.4 users get the
 2.4 mods activated right away, NOTE: we cannot find out whether you're on 2.2
 or 2.4 - so you should now what you got and select the correct one, fixes
 #1566

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
---
 install/lib/class.FroxlorInstall.php | 5 ++++-
 install/lng/english.lng.php          | 1 +
 install/lng/french.lng.php           | 1 +
 install/lng/german.lng.php           | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/install/lib/class.FroxlorInstall.php b/install/lib/class.FroxlorInstall.php
index 1faa8703..63593c9f 100644
--- a/install/lib/class.FroxlorInstall.php
+++ b/install/lib/class.FroxlorInstall.php
@@ -454,7 +454,9 @@ class FroxlorInstall {
 		$this->_updateSetting($upd_stmt, $this->_data['httpgroup'], 'system', 'httpgroup');
 
 		// necessary changes for webservers != apache2
-		if ($this->_data['webserver'] == "lighttpd") {
+		if ($this->_data['webserver'] == "apache24") {
+		    $this->_updateSetting($upd_stmt, '1', 'system', 'apache24');
+		} elseif ($this->_data['webserver'] == "lighttpd") {
 			$this->_updateSetting($upd_stmt, '/etc/lighttpd/conf-enabled/', 'system', 'apacheconf_vhost');
 			$this->_updateSetting($upd_stmt, '/etc/lighttpd/froxlor-diroptions/', 'system', 'apacheconf_diroptions');
 			$this->_updateSetting($upd_stmt, '/etc/lighttpd/froxlor-htpasswd/', 'system', 'apacheconf_htpasswddir');
@@ -766,6 +768,7 @@ class FroxlorInstall {
 		}
 		// apache
 		$formdata .= $this->_getSectionItemCheckbox('apache2', ($this->_data['webserver'] == 'apache2'), $websrvstyle);
+		$formdata .= $this->_getSectionItemCheckbox('apache24', ($this->_data['webserver'] == 'apache24'), $websrvstyle);
 		// lighttpd
 		$formdata .= $this->_getSectionItemCheckbox('lighttpd', ($this->_data['webserver'] == 'lighttpd'), $websrvstyle);
 		// nginx
diff --git a/install/lng/english.lng.php b/install/lng/english.lng.php
index 239e006a..f0cd71d7 100644
--- a/install/lng/english.lng.php
+++ b/install/lng/english.lng.php
@@ -61,6 +61,7 @@ $lng['install']['servername'] = 'Server name (FQDN, no ip-address)';
 $lng['install']['serverip'] = 'Server IP';
 $lng['install']['webserver'] = 'Webserver';
 $lng['install']['apache2'] = 'Apache 2';
+$lng['install']['apache24'] = 'Apache 2.4';
 $lng['install']['lighttpd'] = 'LigHTTPd';
 $lng['install']['nginx'] = 'NGINX';
 $lng['install']['httpuser'] = 'HTTP username';
diff --git a/install/lng/french.lng.php b/install/lng/french.lng.php
index b78ab7cc..ddcf815d 100644
--- a/install/lng/french.lng.php
+++ b/install/lng/french.lng.php
@@ -61,6 +61,7 @@ $lng['install']['servername'] = 'Nom du serveur (FQDN, pas d\'adresse IP)';
 $lng['install']['serverip'] = 'Adresse IP du serveur';
 $lng['install']['webserver'] = 'Serveur Web';
 $lng['install']['apache2'] = 'Apache 2';
+$lng['install']['apache24'] = 'Apache 2.4';
 $lng['install']['lighttpd'] = 'LigHTTPd';
 $lng['install']['nginx'] = 'NGINX';
 $lng['install']['httpuser'] = 'Nom d\'utilisateur HTTP';
diff --git a/install/lng/german.lng.php b/install/lng/german.lng.php
index 4dc9347e..b2b21db4 100644
--- a/install/lng/german.lng.php
+++ b/install/lng/german.lng.php
@@ -61,6 +61,7 @@ $lng['install']['servername'] = 'Servername (FQDN, keine IP-Adresse)';
 $lng['install']['serverip'] = 'Server-IP';
 $lng['install']['webserver'] = 'Webserver';
 $lng['install']['apache2'] = 'Apache 2';
+$lng['install']['apache24'] = 'Apache 2.4';
 $lng['install']['lighttpd'] = 'LigHTTPd';
 $lng['install']['nginx'] = 'NGINX';
 $lng['install']['httpuser'] = 'HTTP Username';