]>
Commit | Line | Data |
---|---|---|
e1f8c51d ER |
1 | --- eventum-1.4.c/setup/config.inc.php 2005-01-05 01:05:58.000000000 +0200 |
2 | +++ eventum-1.4/setup/config.inc.php 2005-01-24 17:21:52.000000000 +0200 | |
3 | @@ -56,10 +56,10 @@ | |
d40ad926 ER |
4 | @define("APP_INC_PATH", APP_PATH . "include/");\r |
5 | @define("APP_PEAR_PATH", APP_INC_PATH . "pear/");\r | |
6 | @define("APP_TPL_PATH", APP_PATH . "templates/");\r | |
7 | -@define("APP_SMARTY_PATH", APP_INC_PATH . "Smarty/");\r | |
8 | +@define("APP_SMARTY_PATH", "/usr/share/pear/Smarty/");\r | |
9 | @define("APP_JPGRAPH_PATH", APP_INC_PATH . "jpgraph/");\r | |
10 | -@define("APP_LOG_PATH", APP_PATH . "logs/");\r | |
e1f8c51d | 11 | -@define("APP_LOCKS_PATH", APP_PATH . "locks/");\r |
d40ad926 | 12 | +@define("APP_LOG_PATH", "/var/log/eventum/");\r |
e1f8c51d | 13 | +@define("APP_LOCKS_PATH", "/var/run/eventum/");\r |
d40ad926 ER |
14 | if (stristr(PHP_OS, 'darwin')) {\r |
15 | ini_set("include_path", ".:" . APP_PEAR_PATH);\r | |
e1f8c51d ER |
16 | } elseif (stristr(PHP_OS, 'win')) {\r |
17 | @@ -153,4 +153,4 @@ | |
18 | \r | |
19 | // set charset\r | |
20 | header("content-type: text/html;charset=" . APP_CHARSET);\r | |
21 | -?> | |
22 | \ No newline at end of file | |
23 | +?>\r | |
8a2c0410 ER |
24 | --- ./misc/cli/eventum~ 2005-01-19 02:47:20.000000000 +0200 |
25 | +++ ./misc/cli/eventum 2005-01-19 03:02:40.119100405 +0200 | |
26 | @@ -11,7 +11,7 @@ | |
27 | //\r | |
28 | // @(#) $Id$\r | |
29 | //\r | |
30 | -include_once("config.inc.php");\r | |
31 | +include_once("/etc/eventum/cli.php");\r | |
32 | include_once(APP_INC_PATH . "class.command_line.php");\r | |
33 | include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");\r | |
34 | \r | |
35 | --- eventum-1.4/misc/cli/config.inc.php~ 2005-01-05 01:06:01.000000000 +0200 | |
36 | +++ eventum-1.4/misc/cli/config.inc.php 2005-01-19 03:25:10.000000000 +0200 | |
37 | @@ -45,7 +45,7 @@ | |
38 | }\r | |
39 | \r | |
40 | // definitions of path related variables\r | |
41 | -@define("APP_PATH", dirname(__FILE__) . '/');\r | |
42 | +@define("APP_PATH", '/usr/share/eventum/misc/cli/');\r | |
43 | @define("APP_INC_PATH", APP_PATH . "include/");\r | |
44 | @define("APP_PEAR_PATH", APP_INC_PATH . "pear/");\r | |
45 | if (stristr(PHP_OS, 'darwin')) {\r | |
46 | @@ -57,4 +57,4 @@ | |
47 | }\r | |
48 | \r | |
49 | @define("APP_BENCHMARK", false);\r | |
50 | -?> | |
51 | \ No newline at end of file | |
52 | +?>\r | |
e1f8c51d ER |
53 | --- eventum-1.4.c/include/class.template.php 2005-01-05 01:05:59.000000000 +0200 |
54 | +++ eventum-1.4/include/class.template.php 2005-01-24 17:22:35.000000000 +0200 | |
55 | @@ -60,7 +60,7 @@ | |
56 | {\r | |
57 | $this->smarty = new Smarty;\r | |
58 | $this->smarty->template_dir = APP_PATH . "templates/" . APP_CURRENT_LANG;\r | |
59 | - $this->smarty->compile_dir = APP_PATH . "templates_c";\r | |
60 | + $this->smarty->compile_dir = "/var/cache/eventum";\r | |
61 | $this->smarty->config_dir = '';\r | |
62 | $this->smarty->register_modifier("activateLinks", array('Link_Filter', 'processText'));\r | |
63 | }\r | |
898e761e ER |
64 | --- index.php 2005-01-05 01:05:52.000000000 +0200 |
65 | +++ eventum-1.4/setup/index.php 2005-01-24 17:47:16.000000000 +0200 | |
66 | @@ -114,15 +114,15 @@ | |
67 | if (ini_get('allow_call_time_pass_reference') != "1") {\r | |
68 | $errors[] = "The 'allow_call_time_pass_reference' directive needs to be enabled in your PHP.INI file in order for Eventum to work properly.";\r | |
69 | }\r | |
70 | - $error = checkPermissions('../locks', "Directory 'locks'", TRUE);\r | |
71 | + $error = checkPermissions('/var/run/eventum', "Directory '/var/run/eventum'", TRUE); | |
647a326e ER |
72 | if (!empty($error)) {\r |
73 | $errors[] = $error;\r | |
74 | }\r | |
75 | - $error = checkPermissions('../logs', "Directory 'logs'", TRUE);\r | |
76 | + $error = checkPermissions('/var/log/eventum', "Directory '/var/log/eventum'", TRUE); | |
77 | if (!empty($error)) {\r | |
78 | $errors[] = $error;\r | |
79 | }\r | |
898e761e ER |
80 | - $error = checkPermissions('../templates_c', "Directory 'templates_c'", TRUE);\r |
81 | + $error = checkPermissions('/var/cache/eventum', "Directory '/var/cache/eventum'", TRUE); | |
82 | if (!empty($error)) {\r | |
83 | $errors[] = $error;\r | |
84 | }\r | |
647a326e ER |
85 | @@ -130,7 +130,7 @@ |
86 | if (!empty($error)) {\r | |
87 | $errors[] = $error;\r | |
88 | }\r | |
89 | - $error = checkPermissions('../logs/errors.log', "File 'logs/errors.log'");\r | |
90 | + $error = checkPermissions('/var/log/eventum/errors.log', "File '/var/log/eventum/errors.log'"); | |
91 | if (!empty($error)) {\r | |
92 | $errors[] = $error;\r | |
93 | }\r | |
94 | @@ -199,11 +199,11 @@ | |
95 | }\r | |
96 | \r | |
97 | ini_set("include_path", '.');\r | |
98 | -include_once("../include/Smarty/Smarty.class.php");\r | |
99 | +include_once('/usr/share/pear/Smarty/Smarty.class.php'); | |
100 | \r | |
101 | $tpl = new Smarty();\r | |
102 | $tpl->template_dir = '../templates/en';\r | |
103 | -$tpl->compile_dir = "../templates_c";\r | |
104 | +$tpl->compile_dir = "/var/cache/eventum"; | |
105 | $tpl->config_dir = '';\r | |
106 | \r | |
107 | function replace_table_prefix($str)\r | |
898e761e ER |
108 | @@ -417,23 +417,8 @@ |
109 | $tpl->assign('is_imap_enabled', function_exists('imap_open'));\r | |
110 | }\r | |
111 | \r | |
112 | -\r | |
113 | -$full_url = dirname($HTTP_SERVER_VARS['PHP_SELF']);\r | |
114 | -$pieces = explode("/", $full_url);\r | |
115 | -$relative_url = array();\r | |
116 | -$relative_url[] = '';\r | |
117 | -foreach ($pieces as $piece) {\r | |
118 | - if ((!empty($piece)) && ($piece != 'setup')) {\r | |
119 | - $relative_url[] = $piece;\r | |
120 | - }\r | |
121 | -}\r | |
122 | -$relative_url[] = '';\r | |
123 | -$relative_url = implode("/", $relative_url);\r | |
124 | -\r | |
125 | -if (substr($HTTP_SERVER_VARS['DOCUMENT_ROOT'], -1) == '/') {\r | |
126 | - $HTTP_SERVER_VARS['DOCUMENT_ROOT'] = substr($HTTP_SERVER_VARS['DOCUMENT_ROOT'], 0, -1);\r | |
127 | -}\r | |
128 | -$installation_path = $HTTP_SERVER_VARS['DOCUMENT_ROOT'] . $relative_url;\r | |
129 | +$installation_path = "/usr/share/eventum"; | |
130 | +$relative_url = "/eventum/"; | |
131 | \r | |
132 | $tpl->assign("phpversion", phpversion());\r | |
133 | $tpl->assign("rel_url", $relative_url);\r | |
17f0d707 ER |
134 | --- misc/cli/eventum~ 2005-01-24 17:49:25.000000000 +0200 |
135 | +++ ./misc/cli/eventum 2005-01-25 15:48:56.000000000 +0200 | |
136 | @@ -13,7 +13,7 @@ | |
137 | //\r | |
138 | include_once("/etc/eventum/cli.php");\r | |
139 | include_once(APP_INC_PATH . "class.command_line.php");\r | |
140 | -include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");\r | |
141 | +include_once('/usr/share/pear/XML/RPC.php'); | |
142 | \r | |
143 | list($user_email, $user_password, $url, $port, $relative_url) = Command_Line::getEnvironmentSettings();\r | |
144 | if (empty($port)) {\r | |
145 | --- misc/cli/config.inc.php~ 2005-01-24 17:49:25.000000000 +0200 | |
146 | +++ ./misc/cli/config.inc.php 2005-01-25 15:52:07.000000000 +0200 | |
147 | @@ -47,7 +47,7 @@ | |
148 | // definitions of path related variables\r | |
149 | @define("APP_PATH", '/usr/share/eventum/misc/cli/');\r | |
150 | @define("APP_INC_PATH", APP_PATH . "include/");\r | |
151 | -@define("APP_PEAR_PATH", APP_INC_PATH . "pear/");\r | |
152 | +@define("APP_PEAR_PATH", "/usr/share/pear/"); | |
153 | if (stristr(PHP_OS, 'darwin')) {\r | |
154 | ini_set("include_path", ".:" . APP_PEAR_PATH);\r | |
155 | } elseif (stristr(PHP_OS, 'win')) {\r | |
156 | --- misc/cli/include/class.command_line.php 2005-01-05 01:06:03.000000000 +0200 | |
157 | +++ ./misc/cli/include/class.command_line.php 2005-01-25 15:48:56.000000000 +0200 | |
158 | @@ -29,7 +29,7 @@ | |
159 | //\r | |
160 | \r | |
161 | include_once(APP_INC_PATH . "class.misc.php");\r | |
162 | -include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");\r | |
163 | +include_once('/usr/share/pear/XML/RPC.php'); | |
164 | \r | |
165 | $_displayed_confirmation = false;\r | |
166 | \r |