]>
Commit | Line | Data |
---|---|---|
8a2c0410 ER |
1 | --- ./misc/cli/eventum~ 2005-01-19 02:47:20.000000000 +0200 |
2 | +++ ./misc/cli/eventum 2005-01-19 03:02:40.119100405 +0200 | |
3 | @@ -11,7 +11,7 @@ | |
71c6fb06 ER |
4 | // |
5 | // @(#) $Id$ | |
6 | // | |
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"); | |
11 | ||
643718e7 ER |
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 | |
14 | @@ -45,16 +45,10 @@ | |
71c6fb06 ER |
15 | } |
16 | ||
17 | // definitions of path related variables | |
18 | -@define("APP_PATH", dirname(__FILE__) . '/'); | |
8bbad949 | 19 | +@define("APP_PATH", '/usr/share/eventum/cli/'); |
71c6fb06 ER |
20 | @define("APP_INC_PATH", APP_PATH . "include/"); |
21 | @define("APP_PEAR_PATH", APP_INC_PATH . "pear/"); | |
643718e7 ER |
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); | |
26 | -} else { | |
27 | - ini_set("include_path", ".:" . APP_PEAR_PATH); | |
28 | -} | |
29 | +ini_set("include_path", ".:" . APP_PEAR_PATH); | |
71c6fb06 ER |
30 | |
31 | @define("APP_BENCHMARK", false); | |
643718e7 | 32 | ?> |
8bbad949 ER |
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 | |
35 | @@ -46,9 +46,9 @@ | |
36 | ||
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); | |
43 | ||
44 | @define("APP_BENCHMARK", false); | |
45 | -?> | |
46 | \ No newline at end of file | |
47 | +?> | |
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 | |
50 | @@ -47,7 +47,7 @@ | |
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); | |
57 | ||
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 | |
61 | @@ -13,7 +13,7 @@ | |
62 | // | |
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"); | |
67 | ||
68 | list($user_email, $user_password, $url, $port, $relative_url) = Command_Line::getEnvironmentSettings(); | |
69 | if (empty($port)) { | |
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 | |
72 | @@ -29,7 +29,7 @@ | |
73 | // | |
74 | ||
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"); | |
78 | ||
79 | $_displayed_confirmation = false; | |
80 | ||
d39dadfc ER |
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 | |
e1f8c51d | 83 | @@ -60,7 +60,7 @@ |
71c6fb06 ER |
84 | { |
85 | $this->smarty = new Smarty; | |
d39dadfc | 86 | $this->smarty->template_dir = APP_TPL_PATH . APP_CURRENT_LANG; |
71c6fb06 ER |
87 | - $this->smarty->compile_dir = APP_PATH . "templates_c"; |
88 | + $this->smarty->compile_dir = "/var/cache/eventum"; | |
89 | $this->smarty->config_dir = ''; | |
d39dadfc | 90 | $this->smarty->register_modifier("activateLinks", array('Link_Filter', 'activateLinks')); |
71c6fb06 | 91 | } |
6fa3b56f ER |
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 | |
d6775ce9 ER |
94 | @@ -157,6 +165,7 @@ |
95 | 'permission' => 100, | |
96 | ), | |
97 | ); | |
98 | + $required_directories = array(); | |
99 | foreach ($required_directories as $dir_path => $options) { | |
100 | // check if directory exists | |
101 | if (!file_exists($dir_path)) { | |
6c5cabb4 ER |
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."; | |
107 | } | |
108 | - $error = checkPermissions('../locks', "Directory 'locks'", TRUE); | |
109 | + $error = checkPermissions('/var/run/eventum', "Directory '/var/run/eventum'", TRUE); | |
110 | if (!empty($error)) { | |
111 | $errors[] = $error; | |
112 | } | |
113 | - $error = checkPermissions('../logs', "Directory 'logs'", TRUE); | |
114 | + $error = checkPermissions('/var/log/eventum', "Directory '/var/log/eventum'", TRUE); | |
115 | if (!empty($error)) { | |
116 | $errors[] = $error; | |
117 | } | |
118 | - $error = checkPermissions('../templates_c', "Directory 'templates_c'", TRUE); | |
119 | + $error = checkPermissions('/var/cache/eventum', "Directory '/var/cache/eventum'", TRUE); | |
120 | if (!empty($error)) { | |
121 | $errors[] = $error; | |
122 | } | |
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)) { | |
126 | $errors[] = $error; | |
127 | } | |
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)) { | |
131 | $errors[] = $error; | |
132 | } | |
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)) { | |
136 | $errors[] = $error; | |
137 | } | |
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)) { | |
141 | $errors[] = $error; | |
142 | } | |
143 | @@ -203,11 +203,11 @@ | |
144 | } | |
145 | ||
146 | ini_set("include_path", '.'); | |
147 | -include_once("../include/Smarty/Smarty.class.php"); | |
148 | +include_once("/usr/share/pear/Smarty/Smarty.class.php"); | |
149 | ||
150 | $tpl = new Smarty(); | |
151 | -$tpl->template_dir = '../templates/en'; | |
152 | -$tpl->compile_dir = "../templates_c"; | |
153 | +$tpl->template_dir = '/usr/share/eventum/templates/en'; | |
154 | +$tpl->compile_dir = "/var/cache/eventum"; | |
155 | $tpl->config_dir = ''; | |
156 | ||
157 | function replace_table_prefix($str) | |
158 | @@ -276,8 +276,8 @@ | |
159 | ||
160 | clearstatcache(); | |
161 | // check if config.inc.php in the root directory is writable | |
162 | - if (!is_writable('../config.inc.php')) { | |
163 | - 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."; | |
164 | + if (!is_writable('/etc/eventum/config.php')) { | |
165 | + return "The file '/etc/eventum/config.php' needs to be writable by the web server user. Please correct this problem and try again."; | |
166 | } | |
167 | // gotta check and see if the provided installation path really exists... | |
168 | if (!file_exists($HTTP_POST_VARS['path'])) { | |
169 | @@ -287,16 +287,16 @@ | |
170 | $private_key = '<?php | |
171 | $private_key = "' . md5(microtime()) . '"; | |
172 | ?>'; | |
173 | - if (!is_writable('../include/private_key.php')) { | |
174 | - return "The file 'include/private_key.php' needs to be writable by the web server user. Please correct this problem and try again."; | |
175 | + if (!is_writable('/etc/eventum/private_key.php')) { | |
176 | + return "The file '/etc/eventum/private_key.php' needs to be writable by the web server user. Please correct this problem and try again."; | |
177 | } | |
178 | - $fp = @fopen('../include/private_key.php', 'w'); | |
179 | + $fp = @fopen('/etc/eventum/private_key.php', 'w'); | |
180 | if ($fp === FALSE) { | |
181 | - 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."; | |
182 | + 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."; | |
183 | } | |
184 | $res = fwrite($fp, $private_key); | |
185 | if ($fp === FALSE) { | |
186 | - 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."; | |
187 | + 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."; | |
188 | } | |
189 | fclose($fp); | |
190 | // check if we can connect | |
191 | @@ -396,7 +396,7 @@ | |
192 | $protocol_type = 'http://'; | |
193 | } | |
194 | $config_contents = str_replace("%{PROTOCOL_TYPE}%", $protocol_type, $config_contents); | |
195 | - $fp = @fopen('../config.inc.php', 'w'); | |
196 | + $fp = @fopen('/etc/eventum/config.php', 'w'); | |
197 | if ($fp === FALSE) { | |
198 | 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."; | |
199 | } | |
200 | @@ -425,23 +425,8 @@ | |
201 | $tpl->assign('is_imap_enabled', function_exists('imap_open')); | |
202 | } | |
203 | ||
204 | - | |
205 | -$full_url = dirname($HTTP_SERVER_VARS['PHP_SELF']); | |
206 | -$pieces = explode("/", $full_url); | |
207 | -$relative_url = array(); | |
208 | -$relative_url[] = ''; | |
209 | -foreach ($pieces as $piece) { | |
210 | - if ((!empty($piece)) && ($piece != 'setup')) { | |
211 | - $relative_url[] = $piece; | |
212 | - } | |
213 | -} | |
214 | -$relative_url[] = ''; | |
215 | -$relative_url = implode("/", $relative_url); | |
216 | - | |
217 | -if (substr($HTTP_SERVER_VARS['DOCUMENT_ROOT'], -1) == '/') { | |
218 | - $HTTP_SERVER_VARS['DOCUMENT_ROOT'] = substr($HTTP_SERVER_VARS['DOCUMENT_ROOT'], 0, -1); | |
219 | -} | |
220 | -$installation_path = $HTTP_SERVER_VARS['DOCUMENT_ROOT'] . $relative_url; | |
221 | +$installation_path = "/usr/share/eventum"; | |
222 | +$relative_url = "/eventum/"; | |
223 | ||
224 | $tpl->assign("phpversion", phpversion()); | |
225 | $tpl->assign("rel_url", $relative_url); | |
9ff5b0e3 ER |
226 | --- ./index.php~ 2005-04-22 18:33:06.556398818 +0300 |
227 | +++ ./index.php 2005-04-22 18:33:07.885180913 +0300 | |
228 | @@ -33,8 +33,8 @@ | |
229 | include_once(APP_INC_PATH . "db_access.php"); | |
230 | ||
231 | // check if templates_c is writable by the web server user | |
232 | -if (!Misc::isWritableDirectory(APP_PATH . 'templates_c')) { | |
233 | - $errors = array("Directory 'templates_c' is not writable."); | |
234 | +if (!Misc::isWritableDirectory('/var/cache/eventum')) { | |
235 | + $errors = array("Directory '/var/cache/eventum' is not writable."); | |
236 | Misc::displayRequirementErrors($errors); | |
237 | exit; | |
238 | } |