From 3896f9057e18afc24a9594ac4f01b67040a61e64 Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Sat, 30 Jan 2010 14:26:31 +0000
Subject: [PATCH] fixed shell_include command for lighttpd (old syscp-bug
 #1051)

---
 TODO                          | 2 +-
 lib/configfiles_index.inc.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/TODO b/TODO
index 31249b21..08ef22a0 100644
--- a/TODO
+++ b/TODO
@@ -46,6 +46,7 @@ FIXED	 	 	0001154 		Wrong configuration set with AWstats an fcgi
 FIXED	 	 	0001149 		Create a Configuration-Option for SPF Records in Zonefiles
 FIXED	 	 	0001095 		lighttpd - redirection - "/" slash is added to end of url
 FIXED	 	 	0001148 		Show info for inactive modifications
+FIXED	 	 	0001051 		include_shell issue in lighttpd 1.4.20
 --------------------------------------------------------------------------------------------------------------
 WONFIX	 	 	0001278 		Customer and domain directories are not created
 WONTFIX 	 	0001056 	 	Need extra payment methods
@@ -117,7 +118,6 @@ WONTFIX 	 	0001033 		Cron-Tasks: creating of php.ini
  	 	 	0001109 		no mail traffic is shown and calculated without third party module
  	 	 	0001101 		Default mail qouta - possibillity to set new accounts to amount of webspace
  	 	 	0001084 		Add select box to change special logfile setting on domain edit
- 	 	 	0001051 		include_shell issue in lighttpd 1.4.20
  	 	 	0001058 		Add id/class attributs in <img> tag (left navigation)
  	 	 	0001043 		When creating customer it should also be possible to add domains (merge customer & domain menu)
  	 	 	0001035 		PHP-Error-Log | Adminpanel & CronTask
diff --git a/lib/configfiles_index.inc.php b/lib/configfiles_index.inc.php
index 4ee236ad..677f658f 100644
--- a/lib/configfiles_index.inc.php
+++ b/lib/configfiles_index.inc.php
@@ -23,7 +23,7 @@ if(isConfigDir($settings['system']['apacheconf_vhost']))
 {
 	$configcommand['vhost'] = 'mkdir -p ' . $settings['system']['apacheconf_vhost'];
 	$configcommand['include'] = 'echo -e "\\nInclude ' . makeCorrectDir($settings['system']['apacheconf_vhost']) . '*.conf" >> ' . makeCorrectFile(makeCorrectDir($settings['system']['apacheconf_vhost']) . '/httpd.conf');
-	$configcommand['v_inclighty'] = 'echo -e \'\\ninclude_shell "find ' . makeCorrectDir($settings['system']['apacheconf_vhost']) . ' -maxdepth 1 -name \'*.conf\' -exec cat {} \;"\' >> /etc/lighttpd/lighttpd.conf';
+	$configcommand['v_inclighty'] = 'echo -e \'\\ninclude_shell "cat ' . makeCorrectDir($settings['system']['apacheconf_vhost']) . '*.conf"\' >> /etc/lighttpd/lighttpd.conf';
 }
 else
 {
@@ -35,7 +35,7 @@ else
 if(isConfigDir($settings['system']['apacheconf_diroptions']))
 {
 	$configcommand['diroptions'] = 'mkdir -p ' . $settings['system']['apacheconf_diroptions'];
-	$configcommand['d_inclighty'] = 'echo -e \'\\ninclude_shell "find ' . makeCorrectDir($settings['system']['apacheconf_diroptions']) . ' -maxdepth 1 -name \'*.conf\' -exec cat {} \;"\' >> /etc/lighttpd/lighttpd.conf';
+	$configcommand['d_inclighty'] = 'echo -e \'\\ninclude_shell "cat ' . makeCorrectDir($settings['system']['apacheconf_diroptions']) . '*.conf"\' >> /etc/lighttpd/lighttpd.conf';
 }
 else
 {