---- ./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.orig/misc/cli/config.inc.php 2005-01-26 00:00:58.000000000 +0200
-+++ eventum-1.4/misc/cli/config.inc.php 2005-01-25 23:57:39.000000000 +0200
-@@ -45,16 +45,10 @@
- }
-
- // definitions of path related variables
--@define("APP_PATH", dirname(__FILE__) . '/');
-+@define("APP_PATH", '/usr/share/eventum/cli/');
- @define("APP_INC_PATH", APP_PATH . "include/");
- @define("APP_PEAR_PATH", APP_INC_PATH . "pear/");
--if (stristr(PHP_OS, 'darwin')) {
-- ini_set("include_path", ".:" . APP_PEAR_PATH);
--} elseif (stristr(PHP_OS, 'win')) {
-- ini_set("include_path", ".;" . APP_PEAR_PATH);
--} else {
-- ini_set("include_path", ".:" . APP_PEAR_PATH);
--}
-+ini_set("include_path", ".:" . APP_PEAR_PATH);
-
- @define("APP_BENCHMARK", false);
- ?>
---- eventum-1.4/misc/cli/config.inc.php~ 2005-02-22 21:35:52.000000000 +0200
-+++ eventum-1.4/misc/cli/config.inc.php 2005-02-22 21:44:10.000000000 +0200
-@@ -46,9 +46,9 @@
-
- // definitions of path related variables
- @define("APP_PATH", '/usr/share/eventum/cli/');
--@define("APP_INC_PATH", APP_PATH . "include/");
-+@define("APP_INC_PATH", APP_PATH);
- @define("APP_PEAR_PATH", APP_INC_PATH . "pear/");
- ini_set("include_path", ".:" . APP_PEAR_PATH);
-
- @define("APP_BENCHMARK", false);
--?>
-\ No newline at end of file
-+?>
---- ./misc/cli/config.inc.php~ 2005-02-22 21:49:37.000000000 +0200
-+++ ./misc/cli/config.inc.php 2005-02-22 21:50:01.000000000 +0200
-@@ -47,7 +47,7 @@
// definitions of path related variables
- @define("APP_PATH", '/usr/share/eventum/cli/');
- @define("APP_INC_PATH", APP_PATH);
--@define("APP_PEAR_PATH", APP_INC_PATH . "pear/");
-+@define("APP_PEAR_PATH", "/usr/share/pear/");
- ini_set("include_path", ".:" . APP_PEAR_PATH);
-
- @define("APP_BENCHMARK", false);
---- ./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 @@
- //
+-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());
+--- 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 @@
- 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");
+ // define base path
+ define('APP_PATH', realpath(dirname(__FILE__)));
+-define('APP_CONFIG_PATH', APP_PATH . '/config');
++define('APP_CONFIG_PATH', '/etc/webapps/eventum');
- $_displayed_confirmation = false;
+ // include local site config. may override any default
+ require_once APP_CONFIG_PATH . '/config.php';
+@@ -61,19 +61,15 @@
+ }
---- ./include/class.template.php~ 2005-02-27 17:49:54.000000000 +0200
-+++ ./include/class.template.php 2005-02-27 17:51:00.000000000 +0200
-@@ -60,7 +60,7 @@
- {
- $this->smarty = new Smarty;
- $this->smarty->template_dir = APP_TPL_PATH . 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', 'activateLinks'));
- }
---- ./include/class.monitor.php~ 2005-02-22 21:50:49.000000000 +0200
-+++ ./include/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)) {
---- ./setup/index.php 2005-04-16 05:53:27.000000000 +0300
-+++ eventum-1.5.2.patched/setup/index.php 2005-04-16 05:53:05.000000000 +0300
-@@ -118,31 +118,31 @@
- 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;
- }
-- $error = checkPermissions('../config.inc.php', "File 'config.inc.php'");
-+ $error = checkPermissions('/etc/eventum/config.php', "File '/etc/eventum/config.php'");
- 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;
- }
-- $error = checkPermissions('../setup.conf.php', "File 'setup.conf.php'");
-+ $error = checkPermissions('/etc/eventum/setup.php', "File '/etc/eventum/setup.php'");
- if (!empty($error)) {
- $errors[] = $error;
- }
-- $error = checkPermissions('../include/private_key.php', "File 'include/private_key.php'");
-+ $error = checkPermissions('/etc/eventum/private_key.php', "File '/etc/eventum/private_key.php'");
- if (!empty($error)) {
- $errors[] = $error;
- }
-@@ -276,8 +276,8 @@
+ if (!defined('APP_TPL_COMPILE_PATH')) {
+- define('APP_TPL_COMPILE_PATH', APP_PATH . '/templates_c');
++ define('APP_TPL_COMPILE_PATH', '/var/cache/eventum');
+ }
- clearstatcache();
- // check if config.inc.php in the root directory is writable
-- if (!is_writable('../config.inc.php')) {
-- return "The file 'config.inc.php' in Eventum's root directory needs to be writable by the web server user. Please correct this problem and try again.";
-+ if (!is_writable('/etc/eventum/config.php')) {
-+ return "The file '/etc/eventum/config.php' needs to be writable by the web server user. Please correct this problem and try again.";
- }
- // gotta check and see if the provided installation path really exists...
- if (!file_exists($HTTP_POST_VARS['path'])) {
-@@ -287,16 +287,16 @@
- $private_key = '<?php
- $private_key = "' . md5(microtime()) . '";
- ?>';
-- if (!is_writable('../include/private_key.php')) {
-- return "The file 'include/private_key.php' needs to be writable by the web server user. Please correct this problem and try again.";
-+ if (!is_writable('/etc/eventum/private_key.php')) {
-+ return "The file '/etc/eventum/private_key.php' needs to be writable by the web server user. Please correct this problem and try again.";
- }
-- $fp = @fopen('../include/private_key.php', 'w');
-+ $fp = @fopen('/etc/eventum/private_key.php', 'w');
- if ($fp === FALSE) {
-- return "Could not open the file 'include/private_key.php' for writing. The permissions on the file should be set as to allow the user that the web server runs as to open it. Please correct this problem and try again.";
-+ return "Could not open the file '/etc/eventum/private_key.php' for writing. The permissions on the file should be set as to allow the user that the web server runs as to open it. Please correct this problem and try again.";
- }
- $res = fwrite($fp, $private_key);
- if ($fp === FALSE) {
-- return "Could not write the configuration information to 'include/private_key.php'. The file should be writable by the user that the web server runs as. Please correct this problem and try again.";
-+ return "Could not write the configuration information to '/etc/eventum/private_key.php'. The file should be writable by the user that the web server runs as. Please correct this problem and try again.";
- }
- fclose($fp);
- // check if we can connect
-@@ -425,23 +425,8 @@
- $tpl->assign('is_imap_enabled', function_exists('imap_open'));
+ if (!defined('APP_INC_PATH')) {
+ define('APP_INC_PATH', APP_PATH . '/lib/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_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);
---- ./index.php~ 2005-04-22 18:33:06.556398818 +0300
-+++ ./index.php 2005-04-22 18:33:07.885180913 +0300
-@@ -33,8 +33,8 @@
- include_once(APP_INC_PATH . "db_access.php");
-
- // check if templates_c is writable by the web server user
--if (!Misc::isWritableDirectory(APP_PATH . 'templates_c')) {
-- $errors = array("Directory 'templates_c' is not writable.");
-+if (!Misc::isWritableDirectory('/var/cache/eventum')) {
-+ $errors = array("Directory '/var/cache/eventum' is not writable.");
- Misc::displayRequirementErrors($errors);
- exit;
+ if (!defined('APP_SMARTY_PATH')) {
+- define('APP_SMARTY_PATH', APP_PATH . '/lib/Smarty');
++ define('APP_SMARTY_PATH', '/usr/share/php/Smarty');
}
---- ../include/class.support.php~ 2005-07-10 15:40:57.000000000 +0300
-+++ ../include/class.support.php 2005-07-14 22:47:58.665843734 +0300
-@@ -259,7 +259,7 @@
- */
- function saveRoutedEmail($message)
- {
-- $path = APP_PATH . "misc/routed_emails/";
-+ $path = "/var/lib/eventum/routed_emails/";
- list($usec,) = explode(" ", microtime());
- $filename = date('dmY.His.') . $usec . '.email.txt';
- $fp = @fopen($path . $filename, 'w');
---- ../setup/index.php~ 2005-07-26 18:49:37.000000000 +0300
-+++ ../setup/index.php 2005-07-26 19:12:57.000000000 +0300
-@@ -213,11 +213,11 @@
- exit;
- }
-
--include_once("../include/Smarty/Smarty.class.php");
-+include_once("/usr/share/pear/Smarty/Smarty.class.php");
- $tpl = new Smarty();
--$tpl->template_dir = '../templates/en';
--$tpl->compile_dir = "../templates_c";
-+$tpl->template_dir = '/usr/share/eventum/templates/en';
-+$tpl->compile_dir = "/var/cache/eventum";
- $tpl->config_dir = '';
+ if (!defined('APP_JPGRAPH_PATH')) {
+@@ -81,7 +77,7 @@
+ }
- function replace_table_prefix($str)
-@@ -417,7 +417,7 @@
- $config_contents = str_replace("%{APP_ENABLE_FULLTEXT}%", "false", $config_contents);
- }
+ if (!defined('APP_LOCKS_PATH')) {
+- define('APP_LOCKS_PATH', APP_PATH . '/locks');
++ define('APP_LOCKS_PATH', '/var/run/eventum/');
+ }
-- $fp = @fopen('../config.inc.php', 'w');
-+ $fp = @fopen('/etc/eventum/config.php', 'w');
- if ($fp === FALSE) {
- return "Could not open the file 'config.inc.php' for writing. The permissions on the file should be set as to allow the user that the web server runs as to open it. Please correct this problem and try again.";
- }
---- eventum-1.5.5/setup/index.php~ 2005-07-26 20:22:06.000000000 +0300
-+++ eventum-1.5.5/setup/index.php 2005-07-26 20:35:31.000000000 +0300
-@@ -198,13 +198,7 @@
- return $html;
+ if (!defined('APP_SQL_PATCHES_PATH')) {
+@@ -89,7 +85,7 @@
}
--if (stristr(PHP_OS, 'darwin')) {
-- ini_set("include_path", ".:./../include/pear/");
--} elseif (stristr(PHP_OS, 'win')) {
-- ini_set("include_path", ".;./../include/pear/");
--} else {
-- ini_set("include_path", ".:./../include/pear/");
--}
-+ini_set("include_path", ".:../../include/pear/");
- include_once("File/Util.php");
+ if (!defined('APP_LOG_PATH')) {
+- define('APP_LOG_PATH', APP_PATH . '/logs');
++ define('APP_LOG_PATH', '/var/log/eventum');
+ }
- $html = checkRequirements();
---- eventum-20051130/include/class.template.php~ 2005-11-30 17:51:55.000000000 +0200
-+++ eventum-20051130/include/class.template.php 2005-11-30 17:53:15.000000000 +0200
-@@ -61,6 +61,7 @@
- $this->smarty = new Smarty;
- $this->smarty->template_dir = APP_TPL_PATH . APP_CURRENT_LANG;
- $this->smarty->compile_dir = "/var/cache/eventum";
-+ $this->smarty->plugins_dir = array('/usr/share/eventum/include/smarty', 'plugins');
- $this->smarty->config_dir = '';
- $this->smarty->register_modifier("activateLinks", array('Link_Filter', 'activateLinks'));
- $this->smarty->register_modifier("formatCustomValue", array('Custom_Field', 'formatValue'));
---- ./include/class.misc.php 2005-10-26 17:17:17.000000000 +0300
-+++ /tmp/class.misc.php 2005-10-26 17:30:12.000000000 +0300
-@@ -607,7 +607,7 @@
- */
- function highlightQuotedReply($text)
- {
-- include_once(APP_SMARTY_PATH . "plugins/modifier.highlight_quoted.php");
-+ include_once(APP_INC_PATH. "smarty/modifier.highlight_quoted.php");
- return smarty_modifier_highlight_quoted($text);
- }
+ 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