---- eventum-1.4.d/setup/config.inc.php 2005-01-05 01:05:58.000000000 +0200
-+++ eventum-1.4/setup/config.inc.php 2005-01-25 17:09:33.000000000 +0200
-@@ -54,12 +54,12 @@
- }
- @define("APP_PATH", $app_path);
- @define("APP_INC_PATH", APP_PATH . "include/");
--@define("APP_PEAR_PATH", APP_INC_PATH . "pear/");
-+@define("APP_PEAR_PATH", "/usr/share/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_LOCKS_PATH", APP_PATH . "locks/");
-+@define("APP_LOG_PATH", "/var/log/eventum/");
-+@define("APP_LOCKS_PATH", "/var/run/eventum/");
- if (stristr(PHP_OS, 'darwin')) {
- ini_set("include_path", ".:" . APP_PEAR_PATH);
- } elseif (stristr(PHP_OS, 'win')) {
---- ./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 @@
- //
+--- ./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$
- //
--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_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');
- @define("APP_BENCHMARK", false);
--?>
-\ No newline at end of file
-+?>
---- 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 @@
- {
- $this->smarty = new Smarty;
- $this->smarty->template_dir = APP_PATH . "templates/" . APP_CURRENT_LANG;
-- $this->smarty->compile_dir = APP_PATH . "templates_c";
-+ $this->smarty->compile_dir = "/var/cache/eventum";
- $this->smarty->config_dir = '';
- $this->smarty->register_modifier("activateLinks", array('Link_Filter', 'processText'));
- }
---- index.php 2005-01-05 01:05:52.000000000 +0200
-+++ eventum-1.4/setup/index.php 2005-01-24 17:47:16.000000000 +0200
-@@ -114,15 +114,15 @@
- if (ini_get('allow_call_time_pass_reference') != "1") {
- $errors[] = "The 'allow_call_time_pass_reference' directive needs to be enabled in your PHP.INI file in order for Eventum to work properly.";
- }
-- $error = checkPermissions('../locks', "Directory 'locks'", TRUE);
-+ $error = checkPermissions('/var/run/eventum', "Directory '/var/run/eventum'", TRUE);
- if (!empty($error)) {
- $errors[] = $error;
- }
-- $error = checkPermissions('../logs', "Directory 'logs'", TRUE);
-+ $error = checkPermissions('/var/log/eventum', "Directory '/var/log/eventum'", TRUE);
- if (!empty($error)) {
- $errors[] = $error;
- }
-- $error = checkPermissions('../templates_c', "Directory 'templates_c'", TRUE);
-+ $error = checkPermissions('/var/cache/eventum', "Directory '/var/cache/eventum'", TRUE);
- if (!empty($error)) {
- $errors[] = $error;
- }
-@@ -130,7 +130,7 @@
- if (!empty($error)) {
- $errors[] = $error;
- }
-- $error = checkPermissions('../logs/errors.log', "File 'logs/errors.log'");
-+ $error = checkPermissions('/var/log/eventum/errors.log', "File '/var/log/eventum/errors.log'");
- if (!empty($error)) {
- $errors[] = $error;
- }
-@@ -199,11 +199,11 @@
+ if (defined('APP_PEAR_PATH')) {
+ set_include_path(APP_PEAR_PATH . PATH_SEPARATOR . get_include_path());
+--- eventum-2.2/init.php~ 2009-10-12 22:40:04.000000000 +0300
++++ eventum-2.2/init.php 2009-10-12 22:40:41.619219457 +0300
+@@ -27,7 +27,7 @@
+ // | Authors: Elan Ruusamäe <glen@delfi.ee> |
+ // +----------------------------------------------------------------------+
+
+-if (!file_exists(dirname(__FILE__) . '/config/config.php') || !filesize(dirname(__FILE__) . '/config/config.php')) {
++if (!file_exists('/etc/webapps/eventum/config.php') || !filesize('/etc/webapps/eventum/config.php')) {
+ Header('Location: setup/');
+ exit(0);
}
+@@ -46,7 +46,7 @@
- ini_set("include_path", '.');
--include_once("../include/Smarty/Smarty.class.php");
-+include_once('/usr/share/pear/Smarty/Smarty.class.php');
+ // define base path
+ define('APP_PATH', realpath(dirname(__FILE__)));
+-define('APP_CONFIG_PATH', APP_PATH . '/config');
++define('APP_CONFIG_PATH', '/etc/webapps/eventum');
- $tpl = new Smarty();
- $tpl->template_dir = '../templates/en';
--$tpl->compile_dir = "../templates_c";
-+$tpl->compile_dir = "/var/cache/eventum";
- $tpl->config_dir = '';
+ // include local site config. may override any default
+ require_once APP_CONFIG_PATH . '/config.php';
+@@ -61,19 +61,15 @@
+ }
- function replace_table_prefix($str)
-@@ -417,23 +417,8 @@
- $tpl->assign('is_imap_enabled', function_exists('imap_open'));
+ if (!defined('APP_TPL_COMPILE_PATH')) {
+- define('APP_TPL_COMPILE_PATH', APP_PATH . '/templates_c');
++ define('APP_TPL_COMPILE_PATH', '/var/cache/eventum');
}
--
--$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;
-- }
+ 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');
-}
--$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);
---- ./misc/cli/config.inc.php~ 2005-01-24 17:49:25.000000000 +0200
-+++ ./misc/cli/config.inc.php 2005-01-25 15:52:07.000000000 +0200
-@@ -47,7 +47,7 @@
- // definitions of path related variables
- @define("APP_PATH", '/usr/share/eventum/misc/cli/');
- @define("APP_INC_PATH", APP_PATH . "include/");
--@define("APP_PEAR_PATH", APP_INC_PATH . "pear/");
-+@define("APP_PEAR_PATH", "/usr/share/pear/");
- if (stristr(PHP_OS, 'darwin')) {
- ini_set("include_path", ".:" . APP_PEAR_PATH);
- } elseif (stristr(PHP_OS, 'win')) {
---- ./misc/cli/eventum~ 2005-01-24 17:49:25.000000000 +0200
-+++ ./misc/cli/eventum 2005-01-25 15:48:56.000000000 +0200
-@@ -13,7 +13,7 @@
- //
- include_once("/etc/eventum/cli.php");
- include_once(APP_INC_PATH . "class.command_line.php");
--include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");
-+include_once(APP_PEAR_PATH . "XML/RPC.php");
-
- list($user_email, $user_password, $url, $port, $relative_url) = Command_Line::getEnvironmentSettings();
- if (empty($port)) {
---- ./misc/cli/include/class.command_line.php 2005-01-05 01:06:03.000000000 +0200
-+++ ./misc/cli/include/class.command_line.php 2005-01-25 15:48:56.000000000 +0200
-@@ -29,7 +29,7 @@
- //
-
- include_once(APP_INC_PATH . "class.misc.php");
--include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");
-+include_once(APP_PEAR_PATH . "XML/RPC.php");
-
- $_displayed_confirmation = false;
-
---- ./rpc/xmlrpc.php~ 2005-01-05 01:06:19.000000000 +0200
-+++ ./rpc/xmlrpc.php 2005-01-25 16:35:14.000000000 +0200
-@@ -41,7 +41,7 @@
- include_once(APP_INC_PATH . "class.template.php");
- include_once(APP_INC_PATH . "class.customer.php");
- error_reporting(0);
--include_once(APP_PEAR_PATH . "XML_RPC/Server.php");
-+include_once(APP_PEAR_PATH . "XML/RPC/Server.php");
-
- function authenticate($email, $password)
- {
---- ./include/class.notification.php~ 2005-01-05 01:06:19.000000000 +0200
-+++ ./include/class.notification.php 2005-01-25 16:41:23.000000000 +0200
-@@ -613,9 +613,9 @@
- }
- if ($old["iss_description"] != $new["description"]) {
- // need real diff engine here
-- include_once 'Text_Diff/Diff.php';
-- include_once 'Text_Diff/Diff/Renderer.php';
-- include_once 'Text_Diff/Diff/Renderer/unified.php';
-+ include_once 'Text/Diff.php';
-+ include_once 'Text/Diff/Renderer.php';
-+ include_once 'Text/Diff/Renderer/unified.php';
- $old['iss_description'] = explode("\n", $old['iss_description']);
- $new['description'] = explode("\n", $new['description']);
- $diff = &new Text_Diff($old["iss_description"], $new["description"]);
+ 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')) {
+--- eventum-2.2/htdocs/setup/index.php~ 2010-07-28 12:09:26.000000000 +0300
++++ eventum-2.2/htdocs/setup/index.php 2010-07-28 12:09:48.715993083 +0300
+@@ -42,14 +42,14 @@
+ define('APP_PATH', realpath(dirname(__FILE__) . '/../..'));
+ define('APP_INC_PATH', APP_PATH . '/lib/eventum');
+ define('APP_PEAR_PATH', APP_PATH . '/lib/pear');
+-define('APP_SMARTY_PATH', APP_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);
+
+@@ -252,10 +252,6 @@
+ "You need to install this extension for optimal operation. If you do not install this extension some unicode data will be corrupted.";
+ }
+
+- $error = checkPermissions(APP_CONFIG_PATH, "Directory '" . APP_CONFIG_PATH . "'", TRUE);
+- if (!empty($error)) {
+- $errors[] = $error;
+- }
+ $error = checkPermissions(APP_SETUP_FILE, "File '" . APP_SETUP_FILE. "'");
+ 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");
+--- eventum/crons/monitor.php 2010-11-24 17:24:23.000000000 +0200
++++ eventum/crons/monitor.php 2010-11-24 18:23:09.664934996 +0200
+@@ -37,17 +37,17 @@
+ $required_files = array(
+ APP_CONFIG_PATH . '/config.php' => array(
+ 'check_owner' => true,
+- 'owner' => 'apache',
++ 'owner' => 'root',
+ 'check_group' => true,
+- 'group' => 'apache',
++ 'group' => 'http',
+ 'check_permission' => true,
+ 'permission' => 640,
+ ),
+ APP_CONFIG_PATH . '/setup.php' => array(
+ 'check_owner' => true,
+- 'owner' => 'apache',
++ 'owner' => 'root',
+ 'check_group' => true,
+- 'group' => 'apache',
++ 'group' => 'http',
+ 'check_permission' => true,
+ 'permission' => 660,
+ 'check_filesize' => true,
projects / packages / eventum.git / blobdiff