1 --- eventum-r3833/misc/cli/config.inc.php~ 2009-02-10 09:30:34.000000000 +0200
2 +++ eventum-r3833/misc/cli/config.inc.php 2009-02-10 09:31:11.928169361 +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/');
13 set_include_path(get_include_path() . PATH_SEPARATOR . APP_PEAR_PATH);
14 --- eventum/include/class.template_helper.php~ 2007-01-30 18:52:59.020179406 +0200
15 +++ eventum/include/class.template_helper.php 2007-01-30 18:53:24.620759076 +0200
17 $this->smarty = new Smarty;
18 $this->smarty->template_dir = APP_TPL_PATH;
19 $this->smarty->compile_dir = APP_TPL_COMPILE_PATH;
20 + $this->smarty->plugins_dir = array('/usr/share/eventum/include/smarty', 'plugins');
21 $this->smarty->config_dir = '';
22 $this->smarty->register_modifier("activateLinks", array('Link_Filter', 'activateLinks'));
23 $this->smarty->register_modifier("formatCustomValue", array('Custom_Field', 'formatValue'));
24 --- ./include/class.monitor.php~ 2005-02-22 21:50:49.000000000 +0200
25 +++ ./include/class.monitor.php 2005-02-22 23:04:50.000000000 +0200
30 + $required_directories = array();
31 foreach ($required_directories as $dir_path => $options) {
32 // check if directory exists
33 if (!file_exists($dir_path)) {
34 --- ./include/class.misc.php 2005-10-26 17:17:17.000000000 +0300
35 +++ /tmp/class.misc.php 2005-10-26 17:30:12.000000000 +0300
38 function highlightQuotedReply($text)
40 - require_once(APP_SMARTY_PATH . "plugins/modifier.highlight_quoted.php");
41 + require_once(APP_INC_PATH. "smarty/modifier.highlight_quoted.php");
42 return smarty_modifier_highlight_quoted($text);
45 --- eventum-r3615/init.php~ 2008-06-05 00:02:42.833798000 +0300
46 +++ eventum-r3615/init.php 2008-06-05 00:02:58.229406819 +0300
48 // | Authors: Elan Ruusamäe <glen@delfi.ee> |
49 // +----------------------------------------------------------------------+
51 -if (!file_exists(dirname(__FILE__) . '/config/config.php')) {
52 +if (!file_exists('/etc/webapps/eventum/config.php')) {
53 Header('Location: setup/');
59 -define('APP_PATH', realpath(dirname(__FILE__)) . '/');
60 -define('APP_CONFIG_PATH', APP_PATH . 'config/');
61 +define('APP_PATH', '/usr/share/eventum/htdocs/');
62 +define('APP_CONFIG_PATH', '/etc/webapps/eventum/');
64 // include local site config
65 require_once APP_CONFIG_PATH . 'config.php';
68 if (!defined('APP_INC_PATH')) {
69 - define('APP_INC_PATH', APP_PATH . 'include/');
70 + define('APP_INC_PATH', '/usr/share/eventum/include/');
73 if (!defined('APP_PEAR_PATH')) {
74 - define('APP_PEAR_PATH', APP_INC_PATH . 'pear/');
75 + define('APP_PEAR_PATH', '/usr/share/pear/');
78 if (!defined('APP_TPL_PATH')) {
79 - define('APP_TPL_PATH', APP_PATH . 'templates/');
80 + define('APP_TPL_PATH', '/usr/share/eventum/templates/');
83 if (!defined('APP_TPL_COMPILE_PATH')) {
84 - define('APP_TPL_COMPILE_PATH', APP_PATH . 'templates_c');
85 + define('APP_TPL_COMPILE_PATH', '/var/cache/eventum/');
88 if (!defined('APP_SMARTY_PATH')) {
89 - define('APP_SMARTY_PATH', APP_INC_PATH . 'Smarty/');
90 + define('APP_SMARTY_PATH', '/usr/share/php/Smarty/');
93 if (!defined('APP_JPGRAPH_PATH')) {
97 if (!defined('APP_LOCKS_PATH')) {
98 - define('APP_LOCKS_PATH', APP_PATH . 'locks/');
99 + define('APP_LOCKS_PATH', '/var/run/eventum/');
102 if (!defined('APP_SETUP_FILE')) {
106 if (!defined('APP_SQL_PATCHES_PATH')) {
107 - define('APP_SQL_PATCHES_PATH', APP_PATH . 'misc/upgrade/patches');
108 + define('APP_SQL_PATCHES_PATH', '/usr/share/eventum/upgrade/patches');
111 if (!defined('APP_LOG_PATH')) {
112 - define('APP_LOG_PATH', APP_PATH . 'logs/');
113 + define('APP_LOG_PATH', '/var/log/eventum/');
116 if (!defined('APP_ROUTED_MAILS_SAVEDIR')) {
117 --- eventum/setup/index.php~ 2007-01-30 20:04:32.306824546 +0200
118 +++ eventum/setup/index.php 2007-01-30 20:14:43.880555938 +0200
121 define('APP_CHARSET', 'UTF-8');
122 define('APP_DEFAULT_LOCALE', 'en_US');
123 -define('APP_PATH', realpath(dirname(__FILE__) . '/..') . '/');
124 +define('APP_PATH', realpath(dirname(__FILE__) . '/../..') . '/');
125 define('APP_INC_PATH', APP_PATH . 'include/');
126 define('APP_PEAR_PATH', APP_INC_PATH . 'pear/');
127 -define('APP_SMARTY_PATH', APP_INC_PATH . 'Smarty/');
128 -define('APP_CONFIG_PATH', APP_PATH . 'config/');
129 +define('APP_SMARTY_PATH', '/usr/share/php/Smarty/');
130 +define('APP_CONFIG_PATH', '/etc/webapps/eventum/');
131 define('APP_SETUP_FILE', APP_CONFIG_PATH . 'setup.php');
132 define('APP_TPL_PATH', APP_PATH . 'templates/');
133 -define('APP_TPL_COMPILE_PATH', APP_PATH . 'templates_c');
134 -define('APP_LOG_PATH', APP_PATH . 'logs/');
135 +define('APP_TPL_COMPILE_PATH', '/var/cache/eventum');
136 +define('APP_LOG_PATH', '/var/log/eventum/');
137 define('APP_ERROR_LOG', APP_LOG_PATH . 'errors.log');
138 -define('APP_LOCKS_PATH', APP_PATH . 'locks/');
139 +define('APP_LOCKS_PATH', '/var/run/eventum/');
141 define('APP_BENCHMARK', false);
144 if (ini_get('file_uploads') != "1") {
145 $errors[] = "The 'file_uploads' directive needs to be enabled in your PHP.INI file in order for Eventum to work properly.";
147 - $error = checkPermissions(APP_CONFIG_PATH, "Directory '" . APP_CONFIG_PATH . "'", TRUE);
148 - if (!empty($error)) {
149 - $errors[] = $error;
151 $error = checkPermissions(APP_LOCKS_PATH, "Directory '" . APP_LOCKS_PATH . "'", TRUE);
152 if (!empty($error)) {
155 $setup_file_path = APP_SETUP_FILE;
158 - // check if config directory is writable
159 - if (!is_writable(APP_CONFIG_PATH)) {
160 - return "The file '" . APP_CONFIG_PATH . "' directory needs to be writable by the web server user. Please correct this problem and try again.";
162 // need to create a random private key variable
163 $private_key = '<?php
164 $private_key = "' . md5(microtime()) . '";
165 --- eventum/misc/cli/eventum~ 2007-01-30 20:33:31.435916994 +0200
166 +++ eventum/misc/cli/eventum 2007-01-30 20:34:58.717881130 +0200
169 -require_once(dirname(__FILE__) . '/config.inc.php');
170 +require_once('/etc/eventum/cli.php');
171 require_once(APP_INC_PATH . 'class.command_line.php');
172 --- eventum/misc/process_mail_queue.php~ 2007-02-15 00:31:11.000000000 +0200
173 +++ eventum/misc/process_mail_queue.php 2007-02-15 01:02:15.704386785 +0200
176 ini_set("memory_limit", "1024M");
178 -require_once(dirname(__FILE__) . "/../init.php");
179 +require_once(dirname(__FILE__) . "/htdocs/init.php");
180 require_once(APP_INC_PATH . "db_access.php");
181 require_once(APP_INC_PATH . "class.mail_queue.php");
183 --- eventum/misc/download_emails.php~ 2007-02-15 00:31:11.000000000 +0200
184 +++ eventum/misc/download_emails.php 2007-02-15 01:02:56.183553358 +0200
187 ini_set("memory_limit", "1024M");
189 -require_once(dirname(__FILE__) . "/../init.php");
190 +require_once(dirname(__FILE__) . "/htdocs/init.php");
191 require_once(APP_INC_PATH . "class.support.php");
192 require_once(APP_INC_PATH . "class.lock.php");
193 require_once(APP_INC_PATH . "class.project.php");
194 --- eventum/misc/check_reminders.php~ 2007-02-15 01:04:27.107937884 +0200
195 +++ eventum/misc/check_reminders.php 2007-02-15 01:10:20.645910516 +0200
200 -require_once(dirname(__FILE__) . "/../init.php");
201 +require_once(dirname(__FILE__) . "/htdocs/init.php");
202 require_once(APP_INC_PATH . "db_access.php");
203 require_once(APP_INC_PATH . "class.lock.php");
204 require_once(APP_INC_PATH . "class.reminder.php");
205 --- eventum/misc/monitor.php~ 2007-02-15 01:27:45.089473611 +0200
206 +++ eventum/misc/monitor.php 2007-02-15 01:28:05.849942411 +0200
211 -require_once(dirname(__FILE__) . "/../init.php");
212 +require_once(dirname(__FILE__) . "/htdocs/init.php");
213 require_once(APP_INC_PATH . "class.monitor.php");
215 // the disk partition in which eventum is stored in
216 --- eventum/misc/route_drafts.php~ 2007-02-15 01:36:00.780666107 +0200
217 +++ eventum/misc/route_drafts.php 2007-02-15 01:36:28.141283847 +0200
222 -include_once(dirname(__FILE__) . "/../init.php");
223 +require_once(dirname(__FILE__) . "/htdocs/init.php");
224 require_once(APP_INC_PATH . "db_access.php");
225 require_once(APP_INC_PATH . "class.routing.php");
227 --- eventum/misc/route_emails.php~ 2007-02-15 01:37:09.932227380 +0200
228 +++ eventum/misc/route_emails.php 2007-02-15 01:37:25.452577786 +0200
233 -include_once(dirname(__FILE__) . "/../init.php");
234 +require_once(dirname(__FILE__) . "/htdocs/init.php");
235 require_once(APP_INC_PATH . "db_access.php");
236 require_once(APP_INC_PATH . "class.routing.php");
238 --- eventum/misc/route_notes.php~ 2007-02-15 01:38:04.393456957 +0200
239 +++ eventum/misc/route_notes.php 2007-02-15 01:38:18.973786135 +0200
244 -include_once(dirname(__FILE__) . "/../init.php");
245 +require_once(dirname(__FILE__) . "/htdocs/init.php");
246 require_once(APP_INC_PATH . "db_access.php");
247 require_once(APP_INC_PATH . "class.routing.php");