1 --- ./misc/cli/eventum~ 2005-01-19 02:47:20.000000000 +0200
2 +++ ./misc/cli/eventum 2005-01-19 03:02:40.119100405 +0200
7 -include_once("config.inc.php");
8 +include_once("/etc/eventum/cli.php");
9 include_once(APP_INC_PATH . "class.command_line.php");
10 include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");
12 --- eventum-1.4.orig/misc/cli/config.inc.php 2005-01-26 00:00:58.000000000 +0200
13 +++ eventum-1.4/misc/cli/config.inc.php 2005-01-25 23:57:39.000000000 +0200
17 // definitions of path related variables
18 -@define("APP_PATH", dirname(__FILE__) . '/');
19 +@define("APP_PATH", '/usr/share/eventum/cli/');
20 @define("APP_INC_PATH", APP_PATH . "include/");
21 @define("APP_PEAR_PATH", APP_INC_PATH . "pear/");
22 -if (stristr(PHP_OS, 'darwin')) {
23 - ini_set("include_path", ".:" . APP_PEAR_PATH);
24 -} elseif (stristr(PHP_OS, 'win')) {
25 - ini_set("include_path", ".;" . APP_PEAR_PATH);
27 - ini_set("include_path", ".:" . APP_PEAR_PATH);
29 +ini_set("include_path", ".:" . APP_PEAR_PATH);
31 @define("APP_BENCHMARK", false);
33 --- eventum-1.4/misc/cli/config.inc.php~ 2005-02-22 21:35:52.000000000 +0200
34 +++ eventum-1.4/misc/cli/config.inc.php 2005-02-22 21:44:10.000000000 +0200
37 // definitions of path related variables
38 @define("APP_PATH", '/usr/share/eventum/cli/');
39 -@define("APP_INC_PATH", APP_PATH . "include/");
40 +@define("APP_INC_PATH", APP_PATH);
41 @define("APP_PEAR_PATH", APP_INC_PATH . "pear/");
42 ini_set("include_path", ".:" . APP_PEAR_PATH);
44 @define("APP_BENCHMARK", false);
46 \ No newline at end of file
48 --- ./misc/cli/config.inc.php~ 2005-02-22 21:49:37.000000000 +0200
49 +++ ./misc/cli/config.inc.php 2005-02-22 21:50:01.000000000 +0200
51 // definitions of path related variables
52 @define("APP_PATH", '/usr/share/eventum/cli/');
53 @define("APP_INC_PATH", APP_PATH);
54 -@define("APP_PEAR_PATH", APP_INC_PATH . "pear/");
55 +@define("APP_PEAR_PATH", "/usr/share/pear/");
56 ini_set("include_path", ".:" . APP_PEAR_PATH);
58 @define("APP_BENCHMARK", false);
59 --- ./misc/cli/eventum~ 2005-01-24 17:49:25.000000000 +0200
60 +++ ./misc/cli/eventum 2005-01-25 15:48:56.000000000 +0200
63 include_once("/etc/eventum/cli.php");
64 include_once(APP_INC_PATH . "class.command_line.php");
65 -include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");
66 +include_once(APP_PEAR_PATH . "XML/RPC.php");
68 list($user_email, $user_password, $url, $port, $relative_url) = Command_Line::getEnvironmentSettings();
70 --- ./misc/cli/include/class.command_line.php 2005-01-05 01:06:03.000000000 +0200
71 +++ ./misc/cli/include/class.command_line.php 2005-01-25 15:48:56.000000000 +0200
75 include_once(APP_INC_PATH . "class.misc.php");
76 -include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");
77 +include_once(APP_PEAR_PATH . "XML/RPC.php");
79 $_displayed_confirmation = false;
81 --- ./include/class.template.php~ 2005-02-27 17:49:54.000000000 +0200
82 +++ ./include/class.template.php 2005-02-27 17:51:00.000000000 +0200
85 $this->smarty = new Smarty;
86 $this->smarty->template_dir = APP_TPL_PATH . APP_CURRENT_LANG;
87 - $this->smarty->compile_dir = APP_PATH . "templates_c";
88 + $this->smarty->compile_dir = "/var/cache/eventum";
89 $this->smarty->config_dir = '';
90 $this->smarty->register_modifier("activateLinks", array('Link_Filter', 'activateLinks'));
92 --- ./include/class.monitor.php~ 2005-02-22 21:50:49.000000000 +0200
93 +++ ./include/class.monitor.php 2005-02-22 23:04:50.000000000 +0200
98 + $required_directories = array();
99 foreach ($required_directories as $dir_path => $options) {
100 // check if directory exists
101 if (!file_exists($dir_path)) {
102 --- ./setup/index.php 2005-04-16 05:53:27.000000000 +0300
103 +++ eventum-1.5.2.patched/setup/index.php 2005-04-16 05:53:05.000000000 +0300
104 @@ -118,31 +118,31 @@
105 if (ini_get('allow_call_time_pass_reference') != "1") {
106 $errors[] = "The 'allow_call_time_pass_reference' directive needs to be enabled in your PHP.INI file in order for Eventum to work properly.";
108 - $error = checkPermissions('../locks', "Directory 'locks'", TRUE);
109 + $error = checkPermissions('/var/run/eventum', "Directory '/var/run/eventum'", TRUE);
110 if (!empty($error)) {
113 - $error = checkPermissions('../logs', "Directory 'logs'", TRUE);
114 + $error = checkPermissions('/var/log/eventum', "Directory '/var/log/eventum'", TRUE);
115 if (!empty($error)) {
118 - $error = checkPermissions('../templates_c', "Directory 'templates_c'", TRUE);
119 + $error = checkPermissions('/var/cache/eventum', "Directory '/var/cache/eventum'", TRUE);
120 if (!empty($error)) {
123 - $error = checkPermissions('../config.inc.php', "File 'config.inc.php'");
124 + $error = checkPermissions('/etc/eventum/config.php', "File '/etc/eventum/config.php'");
125 if (!empty($error)) {
128 - $error = checkPermissions('../logs/errors.log', "File 'logs/errors.log'");
129 + $error = checkPermissions('/var/log/eventum/errors.log', "File '/var/log/eventum/errors.log'");
130 if (!empty($error)) {
133 - $error = checkPermissions('../setup.conf.php', "File 'setup.conf.php'");
134 + $error = checkPermissions('/etc/eventum/setup.php', "File '/etc/eventum/setup.php'");
135 if (!empty($error)) {
138 - $error = checkPermissions('../include/private_key.php', "File 'include/private_key.php'");
139 + $error = checkPermissions('/etc/eventum/private_key.php', "File '/etc/eventum/private_key.php'");
140 if (!empty($error)) {
146 // check if config.inc.php in the root directory is writable
147 - if (!is_writable('../config.inc.php')) {
148 - return "The file 'config.inc.php' in Eventum's root directory needs to be writable by the web server user. Please correct this problem and try again.";
149 + if (!is_writable('/etc/eventum/config.php')) {
150 + return "The file '/etc/eventum/config.php' needs to be writable by the web server user. Please correct this problem and try again.";
152 // gotta check and see if the provided installation path really exists...
153 if (!file_exists($HTTP_POST_VARS['path'])) {
154 @@ -287,16 +287,16 @@
155 $private_key = '<?php
156 $private_key = "' . md5(microtime()) . '";
158 - if (!is_writable('../include/private_key.php')) {
159 - return "The file 'include/private_key.php' needs to be writable by the web server user. Please correct this problem and try again.";
160 + if (!is_writable('/etc/eventum/private_key.php')) {
161 + return "The file '/etc/eventum/private_key.php' needs to be writable by the web server user. Please correct this problem and try again.";
163 - $fp = @fopen('../include/private_key.php', 'w');
164 + $fp = @fopen('/etc/eventum/private_key.php', 'w');
166 - return "Could not open the file 'include/private_key.php' for writing. The permissions on the file should be set as to allow the user that the web server runs as to open it. Please correct this problem and try again.";
167 + return "Could not open the file '/etc/eventum/private_key.php' for writing. The permissions on the file should be set as to allow the user that the web server runs as to open it. Please correct this problem and try again.";
169 $res = fwrite($fp, $private_key);
171 - return "Could not write the configuration information to 'include/private_key.php'. The file should be writable by the user that the web server runs as. Please correct this problem and try again.";
172 + return "Could not write the configuration information to '/etc/eventum/private_key.php'. The file should be writable by the user that the web server runs as. Please correct this problem and try again.";
175 // check if we can connect
177 $tpl->assign('is_imap_enabled', function_exists('imap_open'));
181 -$full_url = dirname($HTTP_SERVER_VARS['PHP_SELF']);
182 -$pieces = explode("/", $full_url);
183 -$relative_url = array();
184 -$relative_url[] = '';
185 -foreach ($pieces as $piece) {
186 - if ((!empty($piece)) && ($piece != 'setup')) {
187 - $relative_url[] = $piece;
190 -$relative_url[] = '';
191 -$relative_url = implode("/", $relative_url);
193 -if (substr($HTTP_SERVER_VARS['DOCUMENT_ROOT'], -1) == '/') {
194 - $HTTP_SERVER_VARS['DOCUMENT_ROOT'] = substr($HTTP_SERVER_VARS['DOCUMENT_ROOT'], 0, -1);
196 -$installation_path = $HTTP_SERVER_VARS['DOCUMENT_ROOT'] . $relative_url;
197 +$installation_path = "/usr/share/eventum";
198 +$relative_url = "/eventum/";
200 $tpl->assign("phpversion", phpversion());
201 $tpl->assign("rel_url", $relative_url);
202 --- ./index.php~ 2005-04-22 18:33:06.556398818 +0300
203 +++ ./index.php 2005-04-22 18:33:07.885180913 +0300
205 include_once(APP_INC_PATH . "db_access.php");
207 // check if templates_c is writable by the web server user
208 -if (!Misc::isWritableDirectory(APP_PATH . 'templates_c')) {
209 - $errors = array("Directory 'templates_c' is not writable.");
210 +if (!Misc::isWritableDirectory('/var/cache/eventum')) {
211 + $errors = array("Directory '/var/cache/eventum' is not writable.");
212 Misc::displayRequirementErrors($errors);
215 --- ../include/class.support.php~ 2005-07-10 15:40:57.000000000 +0300
216 +++ ../include/class.support.php 2005-07-14 22:47:58.665843734 +0300
219 function saveRoutedEmail($message)
221 - $path = APP_PATH . "misc/routed_emails/";
222 + $path = "/var/lib/eventum/routed_emails/";
223 list($usec,) = explode(" ", microtime());
224 $filename = date('dmY.His.') . $usec . '.email.txt';
225 $fp = @fopen($path . $filename, 'w');
226 --- ../setup/index.php~ 2005-07-26 18:49:37.000000000 +0300
227 +++ ../setup/index.php 2005-07-26 19:12:57.000000000 +0300
228 @@ -213,11 +213,11 @@
232 -include_once("../include/Smarty/Smarty.class.php");
233 +include_once("/usr/share/pear/Smarty/Smarty.class.php");
236 -$tpl->template_dir = '../templates/en';
237 -$tpl->compile_dir = "../templates_c";
238 +$tpl->template_dir = '/usr/share/eventum/templates/en';
239 +$tpl->compile_dir = "/var/cache/eventum";
240 $tpl->config_dir = '';
242 function replace_table_prefix($str)
244 $config_contents = str_replace("%{APP_ENABLE_FULLTEXT}%", "false", $config_contents);
247 - $fp = @fopen('../config.inc.php', 'w');
248 + $fp = @fopen('/etc/eventum/config.php', 'w');
250 return "Could not open the file 'config.inc.php' for writing. The permissions on the file should be set as to allow the user that the web server runs as to open it. Please correct this problem and try again.";
252 --- eventum-1.5.5/setup/index.php~ 2005-07-26 20:22:06.000000000 +0300
253 +++ eventum-1.5.5/setup/index.php 2005-07-26 20:35:31.000000000 +0300
258 -if (stristr(PHP_OS, 'darwin')) {
259 - ini_set("include_path", ".:./../include/pear/");
260 -} elseif (stristr(PHP_OS, 'win')) {
261 - ini_set("include_path", ".;./../include/pear/");
263 - ini_set("include_path", ".:./../include/pear/");
265 +ini_set("include_path", ".:../../include/pear/");
266 include_once("File/Util.php");
268 $html = checkRequirements();
269 --- ./include/class.template.php 2005-10-26 17:06:21.000000000 +0300
270 +++ /tmp/class.template.php 2005-10-26 17:05:19.000000000 +0300
272 $this->smarty->compile_dir = "/var/cache/eventum";
273 $this->smarty->config_dir = '';
274 $this->smarty->register_modifier("activateLinks", array('Link_Filter', 'activateLinks'));
275 + $this->smarty->plugins_dir = array('/usr/share/eventum/include/smarty', 'plugins');
279 --- ./include/class.misc.php 2005-10-26 17:17:17.000000000 +0300
280 +++ /tmp/class.misc.php 2005-10-26 17:30:12.000000000 +0300
283 function highlightQuotedReply($text)
285 - include_once(APP_SMARTY_PATH . "plugins/modifier.highlight_quoted.php");
286 + include_once(APP_INC_PATH. "smarty/modifier.highlight_quoted.php");
287 return smarty_modifier_highlight_quoted($text);