---- eventum-1.4/setup/index.php~ 2005-01-14 19:23:25.334500007 +0200
-+++ eventum-1.4/setup/index.php 2005-01-14 19:23:32.743136482 +0200
-@@ -417,23 +417,8 @@
- $tpl->assign('is_imap_enabled', function_exists('imap_open'));\r
- }\r
- \r
--\r
--$full_url = dirname($HTTP_SERVER_VARS['PHP_SELF']);\r
--$pieces = explode("/", $full_url);\r
--$relative_url = array();\r
--$relative_url[] = '';\r
--foreach ($pieces as $piece) {\r
-- if ((!empty($piece)) && ($piece != 'setup')) {\r
-- $relative_url[] = $piece;\r
-- }\r
--}\r
--$relative_url[] = '';\r
--$relative_url = implode("/", $relative_url);\r
--\r
--if (substr($HTTP_SERVER_VARS['DOCUMENT_ROOT'], -1) == '/') {\r
-- $HTTP_SERVER_VARS['DOCUMENT_ROOT'] = substr($HTTP_SERVER_VARS['DOCUMENT_ROOT'], 0, -1);\r
--}\r
--$installation_path = $HTTP_SERVER_VARS['DOCUMENT_ROOT'] . $relative_url;\r
-+$installation_path = "/usr/share/eventum";\r
-+$relative_url = "/eventum/";\r
- \r
- $tpl->assign("phpversion", phpversion());\r
- $tpl->assign("rel_url", $relative_url);\r
---- eventum-1.4.c/setup/config.inc.php 2005-01-05 01:05:58.000000000 +0200
-+++ eventum-1.4/setup/config.inc.php 2005-01-24 17:21:52.000000000 +0200
-@@ -56,10 +56,10 @@
- @define("APP_INC_PATH", APP_PATH . "include/");\r
- @define("APP_PEAR_PATH", APP_INC_PATH . "pear/");\r
- @define("APP_TPL_PATH", APP_PATH . "templates/");\r
--@define("APP_SMARTY_PATH", APP_INC_PATH . "Smarty/");\r
-+@define("APP_SMARTY_PATH", "/usr/share/pear/Smarty/");\r
- @define("APP_JPGRAPH_PATH", APP_INC_PATH . "jpgraph/");\r
--@define("APP_LOG_PATH", APP_PATH . "logs/");\r
--@define("APP_LOCKS_PATH", APP_PATH . "locks/");\r
-+@define("APP_LOG_PATH", "/var/log/eventum/");\r
-+@define("APP_LOCKS_PATH", "/var/run/eventum/");\r
- if (stristr(PHP_OS, 'darwin')) {\r
- ini_set("include_path", ".:" . APP_PEAR_PATH);\r
- } elseif (stristr(PHP_OS, 'win')) {\r
-@@ -153,4 +153,4 @@
- \r
- // set charset\r
- header("content-type: text/html;charset=" . APP_CHARSET);\r
--?>
-\ No newline at end of file
-+?>\r
---- ./misc/cli/eventum~ 2005-01-19 02:47:20.000000000 +0200
-+++ ./misc/cli/eventum 2005-01-19 03:02:40.119100405 +0200
-@@ -11,7 +11,7 @@
- //\r
- // @(#) $Id$\r
- //\r
--include_once("config.inc.php");\r
-+include_once("/etc/eventum/cli.php");\r
- include_once(APP_INC_PATH . "class.command_line.php");\r
- include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");\r
- \r
---- eventum-1.4/misc/cli/config.inc.php~ 2005-01-05 01:06:01.000000000 +0200
-+++ eventum-1.4/misc/cli/config.inc.php 2005-01-19 03:25:10.000000000 +0200
-@@ -45,7 +45,7 @@
- }\r
- \r
- // definitions of path related variables\r
--@define("APP_PATH", dirname(__FILE__) . '/');\r
-+@define("APP_PATH", '/usr/share/eventum/misc/cli/');\r
- @define("APP_INC_PATH", APP_PATH . "include/");\r
- @define("APP_PEAR_PATH", APP_INC_PATH . "pear/");\r
- if (stristr(PHP_OS, 'darwin')) {\r
-@@ -57,4 +57,4 @@
- }\r
- \r
- @define("APP_BENCHMARK", false);\r
--?>
-\ No newline at end of file
-+?>\r
---- eventum-1.4.c/include/class.template.php 2005-01-05 01:05:59.000000000 +0200
-+++ eventum-1.4/include/class.template.php 2005-01-24 17:22:35.000000000 +0200
-@@ -60,7 +60,7 @@
- {\r
- $this->smarty = new Smarty;\r
- $this->smarty->template_dir = APP_PATH . "templates/" . APP_CURRENT_LANG;\r
-- $this->smarty->compile_dir = APP_PATH . "templates_c";\r
-+ $this->smarty->compile_dir = "/var/cache/eventum";\r
- $this->smarty->config_dir = '';\r
- $this->smarty->register_modifier("activateLinks", array('Link_Filter', 'processText'));\r
- }\r
---- index.php 2005-01-24 17:39:51.000000000 +0200
-+++ eventum-1.4/setup/index.php 2005-01-24 17:42:33.000000000 +0200
-@@ -118,7 +118,7 @@
- if (!empty($error)) {\r
- $errors[] = $error;\r
- }\r
-- $error = checkPermissions('../logs', "Directory 'logs'", TRUE);\r
-+ $error = checkPermissions('/var/log/eventum', "Directory '/var/log/eventum'", TRUE);
- if (!empty($error)) {\r
- $errors[] = $error;\r
- }\r
-@@ -130,7 +130,7 @@
- if (!empty($error)) {\r
- $errors[] = $error;\r
- }\r
-- $error = checkPermissions('../logs/errors.log', "File 'logs/errors.log'");\r
-+ $error = checkPermissions('/var/log/eventum/errors.log', "File '/var/log/eventum/errors.log'");
- if (!empty($error)) {\r
- $errors[] = $error;\r
- }\r
-@@ -199,11 +199,11 @@
- }\r
- \r
- ini_set("include_path", '.');\r
--include_once("../include/Smarty/Smarty.class.php");\r
-+include_once('/usr/share/pear/Smarty/Smarty.class.php');
- \r
- $tpl = new Smarty();\r
- $tpl->template_dir = '../templates/en';\r
--$tpl->compile_dir = "../templates_c";\r
-+$tpl->compile_dir = "/var/cache/eventum";
- $tpl->config_dir = '';\r
- \r
- function replace_table_prefix($str)\r
+--- ./lib/eventum/class.monitor.php~ 2005-02-22 21:50:49.000000000 +0200
++++ ./lib/eventum/class.monitor.php 2005-02-22 23:04:50.000000000 +0200
+@@ -157,6 +165,7 @@
+ 'permission' => 100,
+ ),
+ );
++ $required_directories = array();
+ foreach ($required_directories as $dir_path => $options) {
+ // check if directory exists
+ if (!file_exists($dir_path)) {
+--- ./cli/eventum 2009-06-27 19:46:44.401524716 +0300
++++ ./cli/eventum 2009-06-27 19:45:22.781438493 +0300
+@@ -12,9 +12,8 @@
+ // @(#) $Id$
+
+ // definitions of path related variables
+-define('APP_PATH', dirname(__FILE__) . '/');
+-define('APP_INC_PATH', APP_PATH . '/lib/eventum');
+-define('APP_PEAR_PATH', APP_PATH . '/lib/pear');
++define('APP_PATH', '/usr/share/eventum');
++define('APP_INC_PATH', APP_PATH . '/cli');
+
+ if (defined('APP_PEAR_PATH')) {
+ set_include_path(APP_PEAR_PATH . PATH_SEPARATOR . get_include_path());
+--- trunk/init.php~ 2009-06-27 17:31:32.000000000 +0300
++++ trunk/init.php 2009-06-27 17:33:35.745565456 +0300
+@@ -26,7 +26,7 @@
+ // | Authors: Elan Ruusamäe <glen@delfi.ee> |
+ // +----------------------------------------------------------------------+
+
+-if (!file_exists(dirname(__FILE__) . '/config/config.php')) {
++if (!file_exists('/etc/webapps/eventum/config.php')) {
+ Header('Location: setup/');
+ exit;
+ }
+@@ -46,7 +46,7 @@
+
+ // define base path
+ define('APP_PATH', realpath(dirname(__FILE__)));
+-define('APP_CONFIG_PATH', APP_PATH . '/config');
++define('APP_CONFIG_PATH', '/etc/webapps/eventum');
+
+ // include local site config. may override any default
+ require_once APP_CONFIG_PATH . '/config.php';
+@@ -61,19 +61,15 @@
+ }
+
+ if (!defined('APP_TPL_COMPILE_PATH')) {
+- define('APP_TPL_COMPILE_PATH', APP_PATH . '/templates_c');
++ define('APP_TPL_COMPILE_PATH', '/var/cache/eventum');
+ }
+
+ if (!defined('APP_INC_PATH')) {
+ define('APP_INC_PATH', APP_PATH . '/lib/eventum');
+ }
+
+-if (!defined('APP_PEAR_PATH')) {
+- define('APP_PEAR_PATH', APP_PATH . '/lib/pear');
+-}
+-
+ if (!defined('APP_SMARTY_PATH')) {
+- define('APP_SMARTY_PATH', APP_PATH . '/lib/Smarty');
++ define('APP_SMARTY_PATH', '/usr/share/php/Smarty');
+ }
+
+ if (!defined('APP_JPGRAPH_PATH')) {
+@@ -81,7 +77,7 @@
+ }
+
+ if (!defined('APP_LOCKS_PATH')) {
+- define('APP_LOCKS_PATH', APP_PATH . '/locks');
++ define('APP_LOCKS_PATH', '/var/run/eventum/');
+ }
+
+ if (!defined('APP_SQL_PATCHES_PATH')) {
+@@ -89,7 +85,7 @@
+ }
+
+ if (!defined('APP_LOG_PATH')) {
+- define('APP_LOG_PATH', APP_PATH . '/logs');
++ define('APP_LOG_PATH', '/var/log/eventum');
+ }
+
+ if (!defined('APP_ROUTED_MAILS_SAVEDIR')) {
+--- trunk/htdocs/setup/index.php~ 2009-06-27 17:34:22.000000000 +0300
++++ trunk/htdocs/setup/index.php 2009-06-27 17:35:07.108898271 +0300
+@@ -42,14 +42,14 @@
+ define('APP_PATH', realpath(dirname(__FILE__) . '/../..'));
+ define('APP_INC_PATH', APP_PATH . '/lib/eventum');
+ define('APP_PEAR_PATH', APP_INC_PATH . '/lib/pear');
+-define('APP_SMARTY_PATH', APP_INC_PATH . '/lib/Smarty');
+-define('APP_CONFIG_PATH', APP_PATH . '/config');
++define('APP_SMARTY_PATH', '/usr/share/php/Smarty');
++define('APP_CONFIG_PATH', '/etc/webapps/eventum');
+ define('APP_SETUP_FILE', APP_CONFIG_PATH . '/setup.php');
+ define('APP_TPL_PATH', APP_PATH . '/templates');
+-define('APP_TPL_COMPILE_PATH', APP_PATH . '/templates_c');
+-define('APP_LOG_PATH', APP_PATH . '/logs');
++define('APP_TPL_COMPILE_PATH', '/var/cache/eventum');
++define('APP_LOG_PATH', '/var/log/eventum');
+ define('APP_ERROR_LOG', APP_LOG_PATH . '/errors.log');
+-define('APP_LOCKS_PATH', APP_PATH . '/locks');
++define('APP_LOCKS_PATH', '/var/run/eventum');
+
+ header('Content-Type: text/html; charset=' . APP_CHARSET);
+
+@@ -192,10 +192,6 @@
+ if (ini_get('file_uploads') != "1") {
+ $errors[] = "The 'file_uploads' directive needs to be enabled in your PHP.INI file in order for Eventum to work properly.";
+ }
+- $error = checkPermissions(APP_CONFIG_PATH, "Directory '" . APP_CONFIG_PATH . "'", TRUE);
+- if (!empty($error)) {
+- $errors[] = $error;
+- }
+ $error = checkPermissions(APP_LOCKS_PATH, "Directory '" . APP_LOCKS_PATH . "'", TRUE);
+ if (!empty($error)) {
+ $errors[] = $error;
+@@ -329,10 +325,6 @@
+ $setup_file_path = APP_SETUP_FILE;
+
+ clearstatcache();
+- // check if config directory is writable
+- if (!is_writable(APP_CONFIG_PATH)) {
+- return "The file '" . APP_CONFIG_PATH . "' directory needs to be writable by the web server user. Please correct this problem and try again.";
+- }
+ // need to create a random private key variable
+ $private_key = '<?php
+ $private_key = "' . md5(microtime()) . '";
+--- eventum-2.2/irc/eventum-irc-bot~ 2009-07-23 14:03:41.422211655 +0300
++++ eventum-2.2/irc/eventum-irc-bot 2009-07-23 13:54:22.000000000 +0300
+@@ -32,7 +32,7 @@
+
+ ini_set('memory_limit', '1024M');
+
+-require_once dirname(__FILE__) . '/../init.php';
++require_once '/usr/share/eventum/init.php';
+
+ if (!file_exists(APP_CONFIG_PATH . '/irc_config.php')) {
+ fwrite(STDERR, "ERROR: No config specified. Please see setup/irc_config.php for config information.\n\n");
projects / packages / eventum.git / blobdiff