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
6 // definitions of path related variables
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);
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
18 $this->smarty = new Smarty;
19 $this->smarty->template_dir = APP_TPL_PATH;
20 $this->smarty->compile_dir = APP_TPL_COMPILE_PATH;
21 + $this->smarty->plugins_dir = array('/usr/share/eventum/include/smarty', 'plugins');
22 $this->smarty->config_dir = '';
23 $this->smarty->register_modifier("activateLinks", array('Link_Filter', 'activateLinks'));
24 $this->smarty->register_modifier("formatCustomValue", array('Custom_Field', 'formatValue'));
25 --- ./include/class.monitor.php~ 2005-02-22 21:50:49.000000000 +0200
26 +++ ./include/class.monitor.php 2005-02-22 23:04:50.000000000 +0200
31 + $required_directories = array();
32 foreach ($required_directories as $dir_path => $options) {
33 // check if directory exists
34 if (!file_exists($dir_path)) {
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
39 function highlightQuotedReply($text)
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);
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
49 // | Authors: Elan Ruusamäe <glen@delfi.ee> |
50 // +----------------------------------------------------------------------+
52 -if (!file_exists(dirname(__FILE__) . '/config/config.php')) {
53 +if (!file_exists('/etc/webapps/eventum/config.php')) {
54 Header('Location: setup/');
60 -define('APP_PATH', realpath(dirname(__FILE__)) . '/');
61 -define('APP_CONFIG_PATH', APP_PATH . 'config/');
62 +define('APP_PATH', '/usr/share/eventum/htdocs/');
63 +define('APP_CONFIG_PATH', '/etc/webapps/eventum/');
65 // include local site config
66 require_once APP_CONFIG_PATH . 'config.php';
69 if (!defined('APP_INC_PATH')) {
70 - define('APP_INC_PATH', APP_PATH . 'include/');
71 + define('APP_INC_PATH', '/usr/share/eventum/include/');
74 if (!defined('APP_PEAR_PATH')) {
75 - define('APP_PEAR_PATH', APP_INC_PATH . 'pear/');
76 + define('APP_PEAR_PATH', '/usr/share/pear/');
79 if (!defined('APP_TPL_PATH')) {
80 - define('APP_TPL_PATH', APP_PATH . 'templates/');
81 + define('APP_TPL_PATH', '/usr/share/eventum/templates/');
84 if (!defined('APP_TPL_COMPILE_PATH')) {
85 - define('APP_TPL_COMPILE_PATH', APP_PATH . 'templates_c');
86 + define('APP_TPL_COMPILE_PATH', '/var/cache/eventum/');
89 if (!defined('APP_SMARTY_PATH')) {
90 - define('APP_SMARTY_PATH', APP_INC_PATH . 'Smarty/');
91 + define('APP_SMARTY_PATH', '/usr/share/php/Smarty/');
94 if (!defined('APP_JPGRAPH_PATH')) {
98 if (!defined('APP_LOCKS_PATH')) {
99 - define('APP_LOCKS_PATH', APP_PATH . 'locks/');
100 + define('APP_LOCKS_PATH', '/var/run/eventum/');
103 if (!defined('APP_SETUP_FILE')) {
107 if (!defined('APP_SQL_PATCHES_PATH')) {
108 - define('APP_SQL_PATCHES_PATH', APP_PATH . 'misc/upgrade/patches');
109 + define('APP_SQL_PATCHES_PATH', '/usr/share/eventum/upgrade/patches');
112 if (!defined('APP_LOG_PATH')) {
113 - define('APP_LOG_PATH', APP_PATH . 'logs/');
114 + define('APP_LOG_PATH', '/var/log/eventum/');
117 if (!defined('APP_ROUTED_MAILS_SAVEDIR')) {
118 --- eventum/setup/index.php~ 2007-01-30 20:04:32.306824546 +0200
119 +++ eventum/setup/index.php 2007-01-30 20:14:43.880555938 +0200
122 define('APP_CHARSET', 'UTF-8');
123 define('APP_DEFAULT_LOCALE', 'en_US');
124 -define('APP_PATH', realpath(dirname(__FILE__) . '/..') . '/');
125 +define('APP_PATH', realpath(dirname(__FILE__) . '/../..') . '/');
126 define('APP_INC_PATH', APP_PATH . 'include/');
127 define('APP_PEAR_PATH', APP_INC_PATH . 'pear/');
128 -define('APP_SMARTY_PATH', APP_INC_PATH . 'Smarty/');
129 -define('APP_CONFIG_PATH', APP_PATH . 'config/');
130 +define('APP_SMARTY_PATH', '/usr/share/php/Smarty/');
131 +define('APP_CONFIG_PATH', '/etc/webapps/eventum/');
132 define('APP_SETUP_FILE', APP_CONFIG_PATH . 'setup.php');
133 define('APP_TPL_PATH', APP_PATH . 'templates/');
134 -define('APP_TPL_COMPILE_PATH', APP_PATH . 'templates_c');
135 -define('APP_LOG_PATH', APP_PATH . 'logs/');
136 +define('APP_TPL_COMPILE_PATH', '/var/cache/eventum');
137 +define('APP_LOG_PATH', '/var/log/eventum/');
138 define('APP_ERROR_LOG', APP_LOG_PATH . 'errors.log');
139 -define('APP_LOCKS_PATH', APP_PATH . 'locks/');
140 +define('APP_LOCKS_PATH', '/var/run/eventum/');
142 define('APP_BENCHMARK', false);
145 if (ini_get('file_uploads') != "1") {
146 $errors[] = "The 'file_uploads' directive needs to be enabled in your PHP.INI file in order for Eventum to work properly.";
148 - $error = checkPermissions(APP_CONFIG_PATH, "Directory '" . APP_CONFIG_PATH . "'", TRUE);
149 - if (!empty($error)) {
150 - $errors[] = $error;
152 $error = checkPermissions(APP_LOCKS_PATH, "Directory '" . APP_LOCKS_PATH . "'", TRUE);
153 if (!empty($error)) {
156 $setup_file_path = APP_SETUP_FILE;
159 - // check if config directory is writable
160 - if (!is_writable(APP_CONFIG_PATH)) {
161 - return "The file '" . APP_CONFIG_PATH . "' directory needs to be writable by the web server user. Please correct this problem and try again.";
163 // need to create a random private key variable
164 $private_key = '<?php
165 $private_key = "' . md5(microtime()) . '";
166 --- eventum/misc/cli/eventum~ 2007-01-30 20:33:31.435916994 +0200
167 +++ eventum/misc/cli/eventum 2007-01-30 20:34:58.717881130 +0200
170 -require_once(dirname(__FILE__) . '/config.inc.php');
171 +require_once('/etc/eventum/cli.php');
172 require_once(APP_INC_PATH . 'class.command_line.php');
173 --- eventum/misc/process_mail_queue.php~ 2007-02-15 00:31:11.000000000 +0200
174 +++ eventum/misc/process_mail_queue.php 2007-02-15 01:02:15.704386785 +0200
177 ini_set("memory_limit", "1024M");
179 -require_once(dirname(__FILE__) . "/../init.php");
180 +require_once(dirname(__FILE__) . "/htdocs/init.php");
181 require_once(APP_INC_PATH . "db_access.php");
182 require_once(APP_INC_PATH . "class.mail_queue.php");
184 --- eventum/misc/download_emails.php~ 2007-02-15 00:31:11.000000000 +0200
185 +++ eventum/misc/download_emails.php 2007-02-15 01:02:56.183553358 +0200
188 ini_set("memory_limit", "1024M");
190 -require_once(dirname(__FILE__) . "/../init.php");
191 +require_once(dirname(__FILE__) . "/htdocs/init.php");
192 require_once(APP_INC_PATH . "class.support.php");
193 require_once(APP_INC_PATH . "class.lock.php");
194 require_once(APP_INC_PATH . "class.project.php");
195 --- eventum/misc/check_reminders.php~ 2007-02-15 01:04:27.107937884 +0200
196 +++ eventum/misc/check_reminders.php 2007-02-15 01:10:20.645910516 +0200
201 -require_once(dirname(__FILE__) . "/../init.php");
202 +require_once(dirname(__FILE__) . "/htdocs/init.php");
203 require_once(APP_INC_PATH . "db_access.php");
204 require_once(APP_INC_PATH . "class.lock.php");
205 require_once(APP_INC_PATH . "class.reminder.php");
206 --- eventum/misc/monitor.php~ 2007-02-15 01:27:45.089473611 +0200
207 +++ eventum/misc/monitor.php 2007-02-15 01:28:05.849942411 +0200
212 -require_once(dirname(__FILE__) . "/../init.php");
213 +require_once(dirname(__FILE__) . "/htdocs/init.php");
214 require_once(APP_INC_PATH . "class.monitor.php");
216 // the disk partition in which eventum is stored in
217 --- eventum/misc/route_drafts.php~ 2007-02-15 01:36:00.780666107 +0200
218 +++ eventum/misc/route_drafts.php 2007-02-15 01:36:28.141283847 +0200
223 -include_once(dirname(__FILE__) . "/../init.php");
224 +require_once(dirname(__FILE__) . "/htdocs/init.php");
225 require_once(APP_INC_PATH . "db_access.php");
226 require_once(APP_INC_PATH . "class.routing.php");
228 --- eventum/misc/route_emails.php~ 2007-02-15 01:37:09.932227380 +0200
229 +++ eventum/misc/route_emails.php 2007-02-15 01:37:25.452577786 +0200
234 -include_once(dirname(__FILE__) . "/../init.php");
235 +require_once(dirname(__FILE__) . "/htdocs/init.php");
236 require_once(APP_INC_PATH . "db_access.php");
237 require_once(APP_INC_PATH . "class.routing.php");
239 --- eventum/misc/route_notes.php~ 2007-02-15 01:38:04.393456957 +0200
240 +++ eventum/misc/route_notes.php 2007-02-15 01:38:18.973786135 +0200
245 -include_once(dirname(__FILE__) . "/../init.php");
246 +require_once(dirname(__FILE__) . "/htdocs/init.php");
247 require_once(APP_INC_PATH . "db_access.php");
248 require_once(APP_INC_PATH . "class.routing.php");