[packages/eventum.git] / eventum-paths.patch

--- eventum/misc/cli/config.inc.php	2007-01-30 20:32:58.965186306 +0200
+++ eventum/misc/cli/config.inc.php	2007-01-30 20:57:01.887651515 +0200
@@ -32,9 +32,8 @@
 set_time_limit(0);
 
 // definitions of path related variables
-define('APP_PATH', dirname(__FILE__) . '/');
-define('APP_INC_PATH', APP_PATH . 'include/');
-define('APP_PEAR_PATH', APP_INC_PATH . 'pear/');
+define('APP_INC_PATH', '/usr/share/eventum/cli/');
+define('APP_PEAR_PATH', '/usr/share/pear/');
 define('APP_BENCHMARK', false);
 
 set_include_path(get_include_path() . PATH_SEPARATOR . APP_PEAR_PATH);
--- eventum/include/class.template.php~	2007-01-30 18:52:59.020179406 +0200
+++ eventum/include/class.template.php	2007-01-30 18:53:24.620759076 +0200
@@ -61,6 +61,7 @@
         $this->smarty = new Smarty;
         $this->smarty->template_dir = APP_TPL_PATH;
         $this->smarty->compile_dir = APP_TPL_COMPILE_PATH;
+        $this->smarty->plugins_dir  = array('/usr/share/eventum/include/smarty', 'plugins');
         $this->smarty->config_dir = '';
         $this->smarty->register_modifier("activateLinks", array('Link_Filter', 'activateLinks'));
         $this->smarty->register_modifier("formatCustomValue", array('Custom_Field', 'formatValue'));
--- ./include/class.monitor.php~	2005-02-22 21:50:49.000000000 +0200
+++ ./include/class.monitor.php	2005-02-22 23:04:50.000000000 +0200
@@ -157,6 +165,7 @@
                 'permission'       => 100,
             ),
         );
+        $required_directories = array();
         foreach ($required_directories as $dir_path => $options) {
             // check if directory exists
             if (!file_exists($dir_path)) {
--- ./include/class.misc.php	2005-10-26 17:17:17.000000000 +0300
+++ /tmp/class.misc.php	2005-10-26 17:30:12.000000000 +0300
@@ -607,7 +607,7 @@
      */
     function highlightQuotedReply($text)
     {
-        require_once(APP_SMARTY_PATH . "plugins/modifier.highlight_quoted.php");
+        require_once(APP_INC_PATH. "smarty/modifier.highlight_quoted.php");
         return smarty_modifier_highlight_quoted($text);
     }
 
--- eventum-r3615/init.php~	2008-06-05 00:02:42.833798000 +0300
+++ eventum-r3615/init.php	2008-06-05 00:02:58.229406819 +0300
@@ -26,7 +26,7 @@
 // | Authors: Elan Ruusamäe <glen@delfi.ee>                               |
 // +----------------------------------------------------------------------+
 
-if (!file_exists(dirname(__FILE__) . '/config/config.php')) {
+if (!file_exists('/etc/webapps/eventum/config.php')) {
     Header('Location: setup/');
     exit;
 }
@@ -44,31 +44,31 @@
 define('APP_VERSION', '2.1.2');
 
 // define base path
-define('APP_PATH', realpath(dirname(__FILE__)) . '/');
-define('APP_CONFIG_PATH', APP_PATH . 'config/');
+define('APP_PATH', '/usr/share/eventum/htdocs/');
+define('APP_CONFIG_PATH', '/etc/webapps/eventum/');
 
 // include local site config
 require_once APP_CONFIG_PATH . 'config.php';
 
 // define other paths
 if (!defined('APP_INC_PATH')) {
-    define('APP_INC_PATH', APP_PATH . 'include/');
+    define('APP_INC_PATH', '/usr/share/eventum/include/');
 }
 
 if (!defined('APP_PEAR_PATH')) {
-    define('APP_PEAR_PATH', APP_INC_PATH . 'pear/');
+    define('APP_PEAR_PATH', '/usr/share/pear/');
 }
 
 if (!defined('APP_TPL_PATH')) {
-    define('APP_TPL_PATH', APP_PATH . 'templates/');
+    define('APP_TPL_PATH', '/usr/share/eventum/templates/');
 }
 
 if (!defined('APP_TPL_COMPILE_PATH')) {
-    define('APP_TPL_COMPILE_PATH', APP_PATH . 'templates_c');
+    define('APP_TPL_COMPILE_PATH', '/var/cache/eventum/');
 }
 
 if (!defined('APP_SMARTY_PATH')) {
-    define('APP_SMARTY_PATH', APP_INC_PATH . 'Smarty/');
+    define('APP_SMARTY_PATH', '/usr/share/php/Smarty/');
 }
 
 if (!defined('APP_JPGRAPH_PATH')) {
@@ -76,7 +76,7 @@
 }
 
 if (!defined('APP_LOCKS_PATH')) {
-    define('APP_LOCKS_PATH', APP_PATH . 'locks/');
+    define('APP_LOCKS_PATH', '/var/run/eventum/');
 }
 
 if (!defined('APP_SETUP_FILE')) {
@@ -84,11 +84,11 @@
 }
 
 if (!defined('APP_SQL_PATCHES_PATH')) {
-    define('APP_SQL_PATCHES_PATH', APP_PATH . 'misc/upgrade/patches');
+    define('APP_SQL_PATCHES_PATH', '/usr/share/eventum/upgrade/patches');
 }
 
 if (!defined('APP_LOG_PATH')) {
-    define('APP_LOG_PATH', APP_PATH . 'logs/');
+    define('APP_LOG_PATH', '/var/log/eventum/');
 }
 
 if (!defined('APP_ROUTED_MAILS_SAVEDIR')) {
--- eventum/setup/index.php~	2007-01-30 20:04:32.306824546 +0200
+++ eventum/setup/index.php	2007-01-30 20:14:43.880555938 +0200
@@ -38,17 +38,17 @@
 set_time_limit(0);
 define('APP_CHARSET', 'UTF-8');
 define('APP_DEFAULT_LOCALE', 'en_US');
-define('APP_PATH', realpath(dirname(__FILE__) . '/..') . '/');
+define('APP_PATH', realpath(dirname(__FILE__) . '/../..') . '/');
 define('APP_INC_PATH', APP_PATH . 'include/');
 define('APP_PEAR_PATH', APP_INC_PATH . 'pear/');
-define('APP_SMARTY_PATH', APP_INC_PATH . 'Smarty/');
-define('APP_CONFIG_PATH', APP_PATH . 'config/');
+define('APP_SMARTY_PATH', '/usr/share/php/Smarty/');
+define('APP_CONFIG_PATH', '/etc/webapps/eventum/');
 define('APP_SETUP_FILE', APP_CONFIG_PATH . 'setup.php');
 define('APP_TPL_PATH', APP_PATH . 'templates/');
-define('APP_TPL_COMPILE_PATH', APP_PATH . 'templates_c');
-define('APP_LOG_PATH', APP_PATH . 'logs/');
+define('APP_TPL_COMPILE_PATH', '/var/cache/eventum');
+define('APP_LOG_PATH', '/var/log/eventum/');
 define('APP_ERROR_LOG', APP_LOG_PATH . 'errors.log');
-define('APP_LOCKS_PATH', APP_PATH . 'locks/');
+define('APP_LOCKS_PATH', '/var/run/eventum/');
 
 define('APP_BENCHMARK', false);
 
@@ -192,10 +192,6 @@
     if (ini_get('file_uploads') != "1") {
         $errors[] = "The 'file_uploads' directive needs to be enabled in your PHP.INI file in order for Eventum to work properly.";
     }
-    $error = checkPermissions(APP_CONFIG_PATH, "Directory '" . APP_CONFIG_PATH . "'", TRUE);
-    if (!empty($error)) {
-        $errors[] = $error;
-    }
     $error = checkPermissions(APP_LOCKS_PATH, "Directory '" . APP_LOCKS_PATH . "'", TRUE);
     if (!empty($error)) {
         $errors[] = $error;
@@ -329,10 +325,6 @@
     $setup_file_path = APP_SETUP_FILE;
 
     clearstatcache();
-    // check if config directory is writable
-    if (!is_writable(APP_CONFIG_PATH)) {
-        return "The file '" . APP_CONFIG_PATH . "' directory needs to be writable by the web server user. Please correct this problem and try again.";
-    }
     // need to create a random private key variable
     $private_key = '<?php
 $private_key = "' . md5(microtime()) . '";
--- eventum/misc/cli/eventum~	2007-01-30 20:33:31.435916994 +0200
+++ eventum/misc/cli/eventum	2007-01-30 20:34:58.717881130 +0200
@@ -13,3 +13,3 @@
 //
-require_once(dirname(__FILE__) . '/config.inc.php');
+require_once('/etc/eventum/cli.php');
 require_once(APP_INC_PATH . 'class.command_line.php');
--- eventum/misc/process_mail_queue.php~	2007-02-15 00:31:11.000000000 +0200
+++ eventum/misc/process_mail_queue.php	2007-02-15 01:02:15.704386785 +0200
@@ -30,7 +30,7 @@
 
 ini_set("memory_limit", "1024M");
 
-require_once(dirname(__FILE__) . "/../init.php");
+require_once(dirname(__FILE__) . "/htdocs/init.php");
 require_once(APP_INC_PATH . "db_access.php");
 require_once(APP_INC_PATH . "class.mail_queue.php");
 
--- eventum/misc/download_emails.php~	2007-02-15 00:31:11.000000000 +0200
+++ eventum/misc/download_emails.php	2007-02-15 01:02:56.183553358 +0200
@@ -30,7 +30,7 @@
 
 ini_set("memory_limit", "1024M");
 
-require_once(dirname(__FILE__) . "/../init.php");
+require_once(dirname(__FILE__) . "/htdocs/init.php");
 require_once(APP_INC_PATH . "class.support.php");
 require_once(APP_INC_PATH . "class.lock.php");
 require_once(APP_INC_PATH . "class.project.php");
--- eventum/misc/check_reminders.php~	2007-02-15 01:04:27.107937884 +0200
+++ eventum/misc/check_reminders.php	2007-02-15 01:10:20.645910516 +0200
@@ -29,7 +29,7 @@
 // @(#) $Id$
 //
 
-require_once(dirname(__FILE__) . "/../init.php");
+require_once(dirname(__FILE__) . "/htdocs/init.php");
 require_once(APP_INC_PATH . "db_access.php");
 require_once(APP_INC_PATH . "class.lock.php");
 require_once(APP_INC_PATH . "class.reminder.php");
--- eventum/misc/monitor.php~	2007-02-15 01:27:45.089473611 +0200
+++ eventum/misc/monitor.php	2007-02-15 01:28:05.849942411 +0200
@@ -27,7 +27,7 @@
 //
 // @(#) $Id$
 
-require_once(dirname(__FILE__) . "/../init.php");
+require_once(dirname(__FILE__) . "/htdocs/init.php");
 require_once(APP_INC_PATH . "class.monitor.php");
 
 // the disk partition in which eventum is stored in
--- eventum/misc/route_drafts.php~	2007-02-15 01:36:00.780666107 +0200
+++ eventum/misc/route_drafts.php	2007-02-15 01:36:28.141283847 +0200
@@ -27,7 +27,7 @@
 //
 // @(#) $Id$
 
-include_once(dirname(__FILE__) . "/../init.php");
+require_once(dirname(__FILE__) . "/htdocs/init.php");
 require_once(APP_INC_PATH . "db_access.php");
 require_once(APP_INC_PATH . "class.routing.php");
 
--- eventum/misc/route_emails.php~	2007-02-15 01:37:09.932227380 +0200
+++ eventum/misc/route_emails.php	2007-02-15 01:37:25.452577786 +0200
@@ -27,7 +27,7 @@
 //
 // @(#) $Id$
 
-include_once(dirname(__FILE__) . "/../init.php");
+require_once(dirname(__FILE__) . "/htdocs/init.php");
 require_once(APP_INC_PATH . "db_access.php");
 require_once(APP_INC_PATH . "class.routing.php");
 
--- eventum/misc/route_notes.php~	2007-02-15 01:38:04.393456957 +0200
+++ eventum/misc/route_notes.php	2007-02-15 01:38:18.973786135 +0200
@@ -27,7 +27,7 @@
 //
 // @(#) $Id$
 
-include_once(dirname(__FILE__) . "/../init.php");
+require_once(dirname(__FILE__) . "/htdocs/init.php");
 require_once(APP_INC_PATH . "db_access.php");
 require_once(APP_INC_PATH . "class.routing.php");
Commit	Line	Data
31dabce6 ER	1	--- eventum/misc/cli/config.inc.php 2007-01-30 20:32:58.965186306 +0200
	2	+++ eventum/misc/cli/config.inc.php 2007-01-30 20:57:01.887651515 +0200
	3	@@ -32,9 +32,8 @@
	4	set_time_limit(0);
71c6fb06 ER	5
71c6fb06 ER	6	// definitions of path related variables
31dabce6 ER	7	-define('APP_PATH', dirname(__FILE__) . '/');
	8	-define('APP_INC_PATH', APP_PATH . 'include/');
	9	-define('APP_PEAR_PATH', APP_INC_PATH . 'pear/');
	10	+define('APP_INC_PATH', '/usr/share/eventum/cli/');
	11	+define('APP_PEAR_PATH', '/usr/share/pear/');
	12	define('APP_BENCHMARK', false);
	13
	14	set_include_path(get_include_path() . PATH_SEPARATOR . APP_PEAR_PATH);
	15	--- eventum/include/class.template.php~ 2007-01-30 18:52:59.020179406 +0200
	16	+++ eventum/include/class.template.php 2007-01-30 18:53:24.620759076 +0200
	17	@@ -61,6 +61,7 @@
71c6fb06	18	$this->smarty = new Smarty;
465c3ab7	19	$this->smarty->template_dir = APP_TPL_PATH;
31dabce6 ER	20	$this->smarty->compile_dir = APP_TPL_COMPILE_PATH;
31dabce6 ER	21	+ $this->smarty->plugins_dir = array('/usr/share/eventum/include/smarty', 'plugins');
71c6fb06	22	$this->smarty->config_dir = '';
d39dadfc	23	$this->smarty->register_modifier("activateLinks", array('Link_Filter', 'activateLinks'));
465c3ab7	24	$this->smarty->register_modifier("formatCustomValue", array('Custom_Field', 'formatValue'));
6fa3b56f ER	25	--- ./include/class.monitor.php~ 2005-02-22 21:50:49.000000000 +0200
6fa3b56f ER	26	+++ ./include/class.monitor.php 2005-02-22 23:04:50.000000000 +0200
d6775ce9 ER	27	@@ -157,6 +165,7 @@
	28	'permission' => 100,
	29	),
	30	);
	31	+ $required_directories = array();
	32	foreach ($required_directories as $dir_path => $options) {
	33	// check if directory exists
	34	if (!file_exists($dir_path)) {
31dabce6 ER	35	--- ./include/class.misc.php 2005-10-26 17:17:17.000000000 +0300
	36	+++ /tmp/class.misc.php 2005-10-26 17:30:12.000000000 +0300
	37	@@ -607,7 +607,7 @@
	38	*/
	39	function highlightQuotedReply($text)
	40	{
	41	- require_once(APP_SMARTY_PATH . "plugins/modifier.highlight_quoted.php");
	42	+ require_once(APP_INC_PATH. "smarty/modifier.highlight_quoted.php");
	43	return smarty_modifier_highlight_quoted($text);
6c5cabb4	44	}
6c5cabb4	45
bc46f6d4 ER	46	--- eventum-r3615/init.php~ 2008-06-05 00:02:42.833798000 +0300
	47	+++ eventum-r3615/init.php 2008-06-05 00:02:58.229406819 +0300
	48	@@ -26,7 +26,7 @@
	49	// \| Authors: Elan Ruusamäe <glen@delfi.ee> \|
31dabce6 ER	50	// +----------------------------------------------------------------------+
	51
	52	-if (!file_exists(dirname(__FILE__) . '/config/config.php')) {
	53	+if (!file_exists('/etc/webapps/eventum/config.php')) {
	54	Header('Location: setup/');
	55	exit;
bc46f6d4 ER	56	}
	57	@@ -44,31 +44,31 @@
	58	define('APP_VERSION', '2.1.2');
31dabce6 ER	59
	60	// define base path
	61	-define('APP_PATH', realpath(dirname(__FILE__)) . '/');
	62	-define('APP_CONFIG_PATH', APP_PATH . 'config/');
	63	+define('APP_PATH', '/usr/share/eventum/htdocs/');
	64	+define('APP_CONFIG_PATH', '/etc/webapps/eventum/');
	65
	66	// include local site config
	67	require_once APP_CONFIG_PATH . 'config.php';
	68
	69	// define other paths
	70	if (!defined('APP_INC_PATH')) {
	71	- define('APP_INC_PATH', APP_PATH . 'include/');
	72	+ define('APP_INC_PATH', '/usr/share/eventum/include/');
6c5cabb4 ER	73	}
6c5cabb4 ER	74
31dabce6 ER	75	if (!defined('APP_PEAR_PATH')) {
	76	- define('APP_PEAR_PATH', APP_INC_PATH . 'pear/');
	77	+ define('APP_PEAR_PATH', '/usr/share/pear/');
	78	}
6c5cabb4	79
31dabce6 ER	80	if (!defined('APP_TPL_PATH')) {
	81	- define('APP_TPL_PATH', APP_PATH . 'templates/');
	82	+ define('APP_TPL_PATH', '/usr/share/eventum/templates/');
	83	}
9ff5b0e3	84
31dabce6 ER	85	if (!defined('APP_TPL_COMPILE_PATH')) {
	86	- define('APP_TPL_COMPILE_PATH', APP_PATH . 'templates_c');
	87	+ define('APP_TPL_COMPILE_PATH', '/var/cache/eventum/');
9ff5b0e3	88	}
465c3ab7	89
31dabce6 ER	90	if (!defined('APP_SMARTY_PATH')) {
	91	- define('APP_SMARTY_PATH', APP_INC_PATH . 'Smarty/');
	92	+ define('APP_SMARTY_PATH', '/usr/share/php/Smarty/');
3955d156 ER	93	}
3955d156 ER	94
31dabce6	95	if (!defined('APP_JPGRAPH_PATH')) {
bc46f6d4	96	@@ -76,7 +76,7 @@
31dabce6	97	}
3955d156	98
31dabce6 ER	99	if (!defined('APP_LOCKS_PATH')) {
	100	- define('APP_LOCKS_PATH', APP_PATH . 'locks/');
	101	+ define('APP_LOCKS_PATH', '/var/run/eventum/');
	102	}
3955d156	103
31dabce6	104	if (!defined('APP_SETUP_FILE')) {
bc46f6d4 ER	105	@@ -84,11 +84,11 @@
	106	}
	107
	108	if (!defined('APP_SQL_PATCHES_PATH')) {
	109	- define('APP_SQL_PATCHES_PATH', APP_PATH . 'misc/upgrade/patches');
	110	+ define('APP_SQL_PATCHES_PATH', '/usr/share/eventum/upgrade/patches');
3955d156 ER	111	}
3955d156 ER	112
31dabce6 ER	113	if (!defined('APP_LOG_PATH')) {
	114	- define('APP_LOG_PATH', APP_PATH . 'logs/');
	115	+ define('APP_LOG_PATH', '/var/log/eventum/');
	116	}
3955d156	117
bc46f6d4	118	if (!defined('APP_ROUTED_MAILS_SAVEDIR')) {
31dabce6 ER	119	--- eventum/setup/index.php~ 2007-01-30 20:04:32.306824546 +0200
	120	+++ eventum/setup/index.php 2007-01-30 20:14:43.880555938 +0200
	121	@@ -38,17 +38,17 @@
	122	set_time_limit(0);
	123	define('APP_CHARSET', 'UTF-8');
	124	define('APP_DEFAULT_LOCALE', 'en_US');
	125	-define('APP_PATH', realpath(dirname(__FILE__) . '/..') . '/');
	126	+define('APP_PATH', realpath(dirname(__FILE__) . '/../..') . '/');
	127	define('APP_INC_PATH', APP_PATH . 'include/');
	128	define('APP_PEAR_PATH', APP_INC_PATH . 'pear/');
	129	-define('APP_SMARTY_PATH', APP_INC_PATH . 'Smarty/');
	130	-define('APP_CONFIG_PATH', APP_PATH . 'config/');
	131	+define('APP_SMARTY_PATH', '/usr/share/php/Smarty/');
	132	+define('APP_CONFIG_PATH', '/etc/webapps/eventum/');
	133	define('APP_SETUP_FILE', APP_CONFIG_PATH . 'setup.php');
	134	define('APP_TPL_PATH', APP_PATH . 'templates/');
	135	-define('APP_TPL_COMPILE_PATH', APP_PATH . 'templates_c');
	136	-define('APP_LOG_PATH', APP_PATH . 'logs/');
	137	+define('APP_TPL_COMPILE_PATH', '/var/cache/eventum');
	138	+define('APP_LOG_PATH', '/var/log/eventum/');
	139	define('APP_ERROR_LOG', APP_LOG_PATH . 'errors.log');
	140	-define('APP_LOCKS_PATH', APP_PATH . 'locks/');
	141	+define('APP_LOCKS_PATH', '/var/run/eventum/');
	142
	143	define('APP_BENCHMARK', false);
	144
	145	@@ -192,10 +192,6 @@
	146	if (ini_get('file_uploads') != "1") {
	147	$errors[] = "The 'file_uploads' directive needs to be enabled in your PHP.INI file in order for Eventum to work properly.";
452347b6	148	}
31dabce6 ER	149	- $error = checkPermissions(APP_CONFIG_PATH, "Directory '" . APP_CONFIG_PATH . "'", TRUE);
	150	- if (!empty($error)) {
	151	- $errors[] = $error;
	152	- }
	153	$error = checkPermissions(APP_LOCKS_PATH, "Directory '" . APP_LOCKS_PATH . "'", TRUE);
	154	if (!empty($error)) {
	155	$errors[] = $error;
	156	@@ -329,10 +325,6 @@
	157	$setup_file_path = APP_SETUP_FILE;
452347b6	158
31dabce6 ER	159	clearstatcache();
	160	- // check if config directory is writable
	161	- if (!is_writable(APP_CONFIG_PATH)) {
	162	- return "The file '" . APP_CONFIG_PATH . "' directory needs to be writable by the web server user. Please correct this problem and try again.";
	163	- }
	164	// need to create a random private key variable
	165	$private_key = '<?php
	166	$private_key = "' . md5(microtime()) . '";
	167	--- eventum/misc/cli/eventum~ 2007-01-30 20:33:31.435916994 +0200
	168	+++ eventum/misc/cli/eventum 2007-01-30 20:34:58.717881130 +0200
	169	@@ -13,3 +13,3 @@
	170	//
	171	-require_once(dirname(__FILE__) . '/config.inc.php');
	172	+require_once('/etc/eventum/cli.php');
	173	require_once(APP_INC_PATH . 'class.command_line.php');
a856f903 ER	174	--- eventum/misc/process_mail_queue.php~ 2007-02-15 00:31:11.000000000 +0200
	175	+++ eventum/misc/process_mail_queue.php 2007-02-15 01:02:15.704386785 +0200
	176	@@ -30,7 +30,7 @@
	177
	178	ini_set("memory_limit", "1024M");
	179
	180	-require_once(dirname(__FILE__) . "/../init.php");
	181	+require_once(dirname(__FILE__) . "/htdocs/init.php");
	182	require_once(APP_INC_PATH . "db_access.php");
	183	require_once(APP_INC_PATH . "class.mail_queue.php");
	184
	185	--- eventum/misc/download_emails.php~ 2007-02-15 00:31:11.000000000 +0200
	186	+++ eventum/misc/download_emails.php 2007-02-15 01:02:56.183553358 +0200
	187	@@ -30,7 +30,7 @@
	188
	189	ini_set("memory_limit", "1024M");
	190
	191	-require_once(dirname(__FILE__) . "/../init.php");
	192	+require_once(dirname(__FILE__) . "/htdocs/init.php");
	193	require_once(APP_INC_PATH . "class.support.php");
	194	require_once(APP_INC_PATH . "class.lock.php");
	195	require_once(APP_INC_PATH . "class.project.php");
1265e6ed ER	196	--- eventum/misc/check_reminders.php~ 2007-02-15 01:04:27.107937884 +0200
	197	+++ eventum/misc/check_reminders.php 2007-02-15 01:10:20.645910516 +0200
	198	@@ -29,7 +29,7 @@
	199	// @(#) $Id$
	200	//
	201
	202	-require_once(dirname(__FILE__) . "/../init.php");
	203	+require_once(dirname(__FILE__) . "/htdocs/init.php");
	204	require_once(APP_INC_PATH . "db_access.php");
	205	require_once(APP_INC_PATH . "class.lock.php");
	206	require_once(APP_INC_PATH . "class.reminder.php");
98f6aee2 ER	207	--- eventum/misc/monitor.php~ 2007-02-15 01:27:45.089473611 +0200
	208	+++ eventum/misc/monitor.php 2007-02-15 01:28:05.849942411 +0200
	209	@@ -27,7 +27,7 @@
1265e6ed ER	210	//
1265e6ed ER	211	// @(#) $Id$
98f6aee2	212
1265e6ed	213	-require_once(dirname(__FILE__) . "/../init.php");
1265e6ed ER	214	+require_once(dirname(__FILE__) . "/htdocs/init.php");
	215	require_once(APP_INC_PATH . "class.monitor.php");
	216
	217	// the disk partition in which eventum is stored in
209255df ER	218	--- eventum/misc/route_drafts.php~ 2007-02-15 01:36:00.780666107 +0200
	219	+++ eventum/misc/route_drafts.php 2007-02-15 01:36:28.141283847 +0200
	220	@@ -27,7 +27,7 @@
	221	//
	222	// @(#) $Id$
	223
	224	-include_once(dirname(__FILE__) . "/../init.php");
	225	+require_once(dirname(__FILE__) . "/htdocs/init.php");
	226	require_once(APP_INC_PATH . "db_access.php");
	227	require_once(APP_INC_PATH . "class.routing.php");
	228
	229	--- eventum/misc/route_emails.php~ 2007-02-15 01:37:09.932227380 +0200
	230	+++ eventum/misc/route_emails.php 2007-02-15 01:37:25.452577786 +0200
	231	@@ -27,7 +27,7 @@
	232	//
	233	// @(#) $Id$
	234
	235	-include_once(dirname(__FILE__) . "/../init.php");
	236	+require_once(dirname(__FILE__) . "/htdocs/init.php");
	237	require_once(APP_INC_PATH . "db_access.php");
	238	require_once(APP_INC_PATH . "class.routing.php");
	239
	240	--- eventum/misc/route_notes.php~ 2007-02-15 01:38:04.393456957 +0200
	241	+++ eventum/misc/route_notes.php 2007-02-15 01:38:18.973786135 +0200
	242	@@ -27,7 +27,7 @@
	243	//
	244	// @(#) $Id$
	245
	246	-include_once(dirname(__FILE__) . "/../init.php");
	247	+require_once(dirname(__FILE__) . "/htdocs/init.php");
	248	require_once(APP_INC_PATH . "db_access.php");
	249	require_once(APP_INC_PATH . "class.routing.php");
	250