]>
Commit | Line | Data |
---|---|---|
20fe5784 ER |
1 | --- eventum-1.4/setup/index.php~ 2005-01-14 19:23:25.334500007 +0200 |
2 | +++ eventum-1.4/setup/index.php 2005-01-14 19:23:32.743136482 +0200 | |
fa6fcb2f ER |
3 | @@ -417,23 +417,8 @@ |
4 | $tpl->assign('is_imap_enabled', function_exists('imap_open'));\r | |
5 | }\r | |
6 | \r | |
7 | -\r | |
8 | -$full_url = dirname($HTTP_SERVER_VARS['PHP_SELF']);\r | |
9 | -$pieces = explode("/", $full_url);\r | |
10 | -$relative_url = array();\r | |
11 | -$relative_url[] = '';\r | |
12 | -foreach ($pieces as $piece) {\r | |
13 | - if ((!empty($piece)) && ($piece != 'setup')) {\r | |
14 | - $relative_url[] = $piece;\r | |
15 | - }\r | |
16 | -}\r | |
17 | -$relative_url[] = '';\r | |
18 | -$relative_url = implode("/", $relative_url);\r | |
19 | -\r | |
20 | -if (substr($HTTP_SERVER_VARS['DOCUMENT_ROOT'], -1) == '/') {\r | |
21 | - $HTTP_SERVER_VARS['DOCUMENT_ROOT'] = substr($HTTP_SERVER_VARS['DOCUMENT_ROOT'], 0, -1);\r | |
22 | -}\r | |
23 | -$installation_path = $HTTP_SERVER_VARS['DOCUMENT_ROOT'] . $relative_url;\r | |
24 | +$installation_path = "/usr/share/eventum";\r | |
25 | +$relative_url = "/eventum/";\r | |
26 | \r | |
27 | $tpl->assign("phpversion", phpversion());\r | |
28 | $tpl->assign("rel_url", $relative_url);\r | |
d40ad926 ER |
29 | --- eventum-1.4.orig/setup/config.inc.php 2005-01-05 01:05:58.000000000 +0200 |
30 | +++ eventum-1.4/setup/config.inc.php 2005-01-19 02:28:23.000000000 +0200 | |
31 | @@ -56,9 +56,9 @@ | |
32 | @define("APP_INC_PATH", APP_PATH . "include/");\r | |
33 | @define("APP_PEAR_PATH", APP_INC_PATH . "pear/");\r | |
34 | @define("APP_TPL_PATH", APP_PATH . "templates/");\r | |
35 | -@define("APP_SMARTY_PATH", APP_INC_PATH . "Smarty/");\r | |
36 | +@define("APP_SMARTY_PATH", "/usr/share/pear/Smarty/");\r | |
37 | @define("APP_JPGRAPH_PATH", APP_INC_PATH . "jpgraph/");\r | |
38 | -@define("APP_LOG_PATH", APP_PATH . "logs/");\r | |
39 | +@define("APP_LOG_PATH", "/var/log/eventum/");\r | |
40 | @define("APP_LOCKS_PATH", APP_PATH . "locks/");\r | |
41 | if (stristr(PHP_OS, 'darwin')) {\r | |
42 | ini_set("include_path", ".:" . APP_PEAR_PATH);\r | |
8a2c0410 ER |
43 | --- ./misc/cli/eventum~ 2005-01-19 02:47:20.000000000 +0200 |
44 | +++ ./misc/cli/eventum 2005-01-19 03:02:40.119100405 +0200 | |
45 | @@ -11,7 +11,7 @@ | |
46 | //\r | |
47 | // @(#) $Id$\r | |
48 | //\r | |
49 | -include_once("config.inc.php");\r | |
50 | +include_once("/etc/eventum/cli.php");\r | |
51 | include_once(APP_INC_PATH . "class.command_line.php");\r | |
52 | include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");\r | |
53 | \r | |
54 | --- eventum-1.4/misc/cli/config.inc.php~ 2005-01-05 01:06:01.000000000 +0200 | |
55 | +++ eventum-1.4/misc/cli/config.inc.php 2005-01-19 03:25:10.000000000 +0200 | |
56 | @@ -45,7 +45,7 @@ | |
57 | }\r | |
58 | \r | |
59 | // definitions of path related variables\r | |
60 | -@define("APP_PATH", dirname(__FILE__) . '/');\r | |
61 | +@define("APP_PATH", '/usr/share/eventum/misc/cli/');\r | |
62 | @define("APP_INC_PATH", APP_PATH . "include/");\r | |
63 | @define("APP_PEAR_PATH", APP_INC_PATH . "pear/");\r | |
64 | if (stristr(PHP_OS, 'darwin')) {\r | |
65 | @@ -57,4 +57,4 @@ | |
66 | }\r | |
67 | \r | |
68 | @define("APP_BENCHMARK", false);\r | |
69 | -?> | |
70 | \ No newline at end of file | |
71 | +?>\r |