From f81826fd9ba89fee94a3641132e23229f83d8915 Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Mon, 1 Nov 2010 11:26:36 +0000
Subject: [PATCH] - display determined Froxlor path in
 cron.d-configurationtemplates, fixes #455

---
 admin_configfiles.php                                          | 3 ++-
 .../misc/configfiles/debian_lenny/cron/etc_cron.d_froxlor      | 2 +-
 templates/misc/configfiles/gentoo/cron/etc_cron.d_froxlor      | 2 +-
 .../misc/configfiles/suse_linux_10_0/cron/etc_cron.d_froxlor   | 2 +-
 .../misc/configfiles/ubuntu_hardy/cron/etc_cron.d_froxlor      | 2 +-
 .../misc/configfiles/ubuntu_lucid/cron/etc_cron.d_froxlor      | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/admin_configfiles.php b/admin_configfiles.php
index a3da106c..edcbab6f 100644
--- a/admin_configfiles.php
+++ b/admin_configfiles.php
@@ -96,7 +96,8 @@ if($userinfo['change_serversettings'] == '1')
 			'<VIRTUAL_UID_MAPS>' => $settings['system']['vmail_uid'],
 			'<VIRTUAL_GID_MAPS>' => $settings['system']['vmail_gid'],
 			'<SSLPROTOCOLS>' => ($settings['system']['use_ssl'] == '1') ? 'imaps pop3s' : '',
-			'<CUSTOMER_TMP>' => ($settings['system']['mod_fcgid_tmpdir'] != '') ? makeCorrectDir($settings['system']['mod_fcgid_tmpdir']) : '/tmp/'
+			'<CUSTOMER_TMP>' => ($settings['system']['mod_fcgid_tmpdir'] != '') ? makeCorrectDir($settings['system']['mod_fcgid_tmpdir']) : '/tmp/',
+			'<BASE_PATH>' => makeCorrectDir(dirname(__FILE__))
 		);
 		$files = '';
 		$configpage = '';
diff --git a/templates/misc/configfiles/debian_lenny/cron/etc_cron.d_froxlor b/templates/misc/configfiles/debian_lenny/cron/etc_cron.d_froxlor
index 9178e5c0..3ab32dd7 100644
--- a/templates/misc/configfiles/debian_lenny/cron/etc_cron.d_froxlor
+++ b/templates/misc/configfiles/debian_lenny/cron/etc_cron.d_froxlor
@@ -5,4 +5,4 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 #
 # Regular cron jobs for the froxlor package
 #
-*/5 * * * *	root	/usr/bin/php5 -q /var/www/froxlor/scripts/froxlor_master_cronjob.php
+*/5 * * * *	root	/usr/bin/php5 -q <BASE_PATH>scripts/froxlor_master_cronjob.php
diff --git a/templates/misc/configfiles/gentoo/cron/etc_cron.d_froxlor b/templates/misc/configfiles/gentoo/cron/etc_cron.d_froxlor
index fb0c357f..93eb07b4 100644
--- a/templates/misc/configfiles/gentoo/cron/etc_cron.d_froxlor
+++ b/templates/misc/configfiles/gentoo/cron/etc_cron.d_froxlor
@@ -7,4 +7,4 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
 #
 # Please check that all following paths are correct
 #
-*/5 * * * *	root	/usr/lib/php5/bin/php -q /var/www/froxlor/scripts/froxlor_master_cronjob.php
+*/5 * * * *	root	/usr/lib/php5/bin/php -q <BASE_PATH>scripts/froxlor_master_cronjob.php
diff --git a/templates/misc/configfiles/suse_linux_10_0/cron/etc_cron.d_froxlor b/templates/misc/configfiles/suse_linux_10_0/cron/etc_cron.d_froxlor
index 55f958a3..3ab32dd7 100644
--- a/templates/misc/configfiles/suse_linux_10_0/cron/etc_cron.d_froxlor
+++ b/templates/misc/configfiles/suse_linux_10_0/cron/etc_cron.d_froxlor
@@ -5,4 +5,4 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 #
 # Regular cron jobs for the froxlor package
 #
-*/5 * * * *	root	/usr/bin/php5 -q /srv/www/htdocs/froxlor/scripts/froxlor_master_cronjob.php
+*/5 * * * *	root	/usr/bin/php5 -q <BASE_PATH>scripts/froxlor_master_cronjob.php
diff --git a/templates/misc/configfiles/ubuntu_hardy/cron/etc_cron.d_froxlor b/templates/misc/configfiles/ubuntu_hardy/cron/etc_cron.d_froxlor
index 9178e5c0..3ab32dd7 100644
--- a/templates/misc/configfiles/ubuntu_hardy/cron/etc_cron.d_froxlor
+++ b/templates/misc/configfiles/ubuntu_hardy/cron/etc_cron.d_froxlor
@@ -5,4 +5,4 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 #
 # Regular cron jobs for the froxlor package
 #
-*/5 * * * *	root	/usr/bin/php5 -q /var/www/froxlor/scripts/froxlor_master_cronjob.php
+*/5 * * * *	root	/usr/bin/php5 -q <BASE_PATH>scripts/froxlor_master_cronjob.php
diff --git a/templates/misc/configfiles/ubuntu_lucid/cron/etc_cron.d_froxlor b/templates/misc/configfiles/ubuntu_lucid/cron/etc_cron.d_froxlor
index 9178e5c0..3ab32dd7 100644
--- a/templates/misc/configfiles/ubuntu_lucid/cron/etc_cron.d_froxlor
+++ b/templates/misc/configfiles/ubuntu_lucid/cron/etc_cron.d_froxlor
@@ -5,4 +5,4 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 #
 # Regular cron jobs for the froxlor package
 #
-*/5 * * * *	root	/usr/bin/php5 -q /var/www/froxlor/scripts/froxlor_master_cronjob.php
+*/5 * * * *	root	/usr/bin/php5 -q <BASE_PATH>scripts/froxlor_master_cronjob.php