--- 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')); } - -$full_url = dirname($HTTP_SERVER_VARS['PHP_SELF']); -$pieces = explode("/", $full_url); -$relative_url = array(); -$relative_url[] = ''; -foreach ($pieces as $piece) { - if ((!empty($piece)) && ($piece != 'setup')) { - $relative_url[] = $piece; - } -} -$relative_url[] = ''; -$relative_url = implode("/", $relative_url); - -if (substr($HTTP_SERVER_VARS['DOCUMENT_ROOT'], -1) == '/') { - $HTTP_SERVER_VARS['DOCUMENT_ROOT'] = substr($HTTP_SERVER_VARS['DOCUMENT_ROOT'], 0, -1); -} -$installation_path = $HTTP_SERVER_VARS['DOCUMENT_ROOT'] . $relative_url; +$installation_path = "/usr/share/eventum"; +$relative_url = "/eventum/"; $tpl->assign("phpversion", phpversion()); $tpl->assign("rel_url", $relative_url); --- eventum-1.4.orig/setup/config.inc.php 2005-01-05 01:05:58.000000000 +0200 +++ eventum-1.4/setup/config.inc.php 2005-01-19 02:28:23.000000000 +0200 @@ -56,9 +56,9 @@ @define("APP_INC_PATH", APP_PATH . "include/"); @define("APP_PEAR_PATH", APP_INC_PATH . "pear/"); @define("APP_TPL_PATH", APP_PATH . "templates/"); -@define("APP_SMARTY_PATH", APP_INC_PATH . "Smarty/"); +@define("APP_SMARTY_PATH", "/usr/share/pear/Smarty/"); @define("APP_JPGRAPH_PATH", APP_INC_PATH . "jpgraph/"); -@define("APP_LOG_PATH", APP_PATH . "logs/"); +@define("APP_LOG_PATH", "/var/log/eventum/"); @define("APP_LOCKS_PATH", APP_PATH . "locks/"); if (stristr(PHP_OS, 'darwin')) { ini_set("include_path", ".:" . APP_PEAR_PATH); --- ./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 @@ // // @(#) $Id$ // -include_once("config.inc.php"); +include_once("/etc/eventum/cli.php"); include_once(APP_INC_PATH . "class.command_line.php"); include_once(APP_PEAR_PATH . "XML_RPC/RPC.php"); --- 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 @@ } // definitions of path related variables -@define("APP_PATH", dirname(__FILE__) . '/'); +@define("APP_PATH", '/usr/share/eventum/misc/cli/'); @define("APP_INC_PATH", APP_PATH . "include/"); @define("APP_PEAR_PATH", APP_INC_PATH . "pear/"); if (stristr(PHP_OS, 'darwin')) { @@ -57,4 +57,4 @@ } @define("APP_BENCHMARK", false); -?> \ No newline at end of file +?>