---- eventum-1.4/setup/config.inc.php~ 2005-01-25 23:50:53.000000000 +0200
-+++ eventum-1.4/setup/config.inc.php 2005-01-25 23:51:23.000000000 +0200
-@@ -54,9 +54,9 @@
- }
- @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", APP_PEAR_PATH . "Smarty/");
- @define("APP_JPGRAPH_PATH", APP_INC_PATH . "jpgraph/");
- @define("APP_LOG_PATH", "/var/log/eventum/");
- @define("APP_LOCKS_PATH", "/var/run/eventum/");
--- ./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 @@
$old['iss_description'] = explode("\n", $old['iss_description']);
$new['description'] = explode("\n", $new['description']);
$diff = &new Text_Diff($old["iss_description"], $new["description"]);
+--- eventum/misc/cli/eventum~ 2007-01-30 20:29:08.299995813 +0200
++++ eventum/misc/cli/eventum 2007-01-30 20:29:37.750658504 +0200
+@@ -14,5 +14,5 @@
+ require_once(dirname(__FILE__) . '/config.inc.php');
+ require_once(APP_INC_PATH . 'class.command_line.php');
+-require_once(APP_PEAR_PATH . 'XML_RPC/RPC.php');
++require_once(APP_PEAR_PATH . 'XML/RPC.php');
+
+ list($user_email, $user_password, $url, $port, $relative_url) = Command_Line::getEnvironmentSettings();
+--- eventum/misc/cli/include/class.command_line.php~ 2007-01-30 20:29:08.299995813 +0200
++++ eventum/misc/cli/include/class.command_line.php 2007-01-30 20:31:39.333394375 +0200
+@@ -30,7 +30,7 @@
+
+ require_once(APP_INC_PATH . 'class.misc.php');
+ require_once(APP_PEAR_PATH . 'PEAR.php');
+-require_once(APP_PEAR_PATH . 'XML_RPC/RPC.php');
++require_once(APP_PEAR_PATH . 'XML/RPC.php');
+
+ $_displayed_confirmation = false;
+
+++ /dev/null
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-// +----------------------------------------------------------------------+
-// | Eventum - Issue Tracking System |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 2003, 2004, 2005 MySQL AB |
-// | |
-// | This program is free software; you can redistribute it and/or modify |
-// | it under the terms of the GNU General Public License as published by |
-// | the Free Software Foundation; either version 2 of the License, or |
-// | (at your option) any later version. |
-// | |
-// | This program is distributed in the hope that it will be useful, |
-// | but WITHOUT ANY WARRANTY; without even the implied warranty of |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
-// | GNU General Public License for more details. |
-// | |
-// | You should have received a copy of the GNU General Public License |
-// | along with this program; if not, write to: |
-// | |
-// | Free Software Foundation, Inc. |
-// | 59 Temple Place - Suite 330 |
-// | Boston, MA 02111-1307, USA. |
-// +----------------------------------------------------------------------+
-// | Authors: João Prado Maia <jpm@mysql.com> |
-// +----------------------------------------------------------------------+
-//
-// @(#) $Id$
-//
-
-// definitions of SQL variables
-define('APP_SQL_DBTYPE', 'mysql');
-define('APP_SQL_DBHOST', '%{APP_SQL_DBHOST}%');
-define('APP_SQL_DBPORT', 3306);
-define('APP_SQL_DBNAME', '%{APP_SQL_DBNAME}%');
-define('APP_SQL_DBUSER', '%{APP_SQL_DBUSER}%');
-define('APP_SQL_DBPASS', '%{APP_SQL_DBPASS}%');
-
-define('APP_DEFAULT_DB', APP_SQL_DBNAME);
-define('APP_TABLE_PREFIX', '%{APP_TABLE_PREFIX}%');
-
-define('APP_NAME', 'Eventum');
-define('APP_SHORT_NAME', APP_NAME); // used in the subject of notification emails
-define('APP_URL', 'http://www.mysql.com/products/eventum/');
-define('APP_HOSTNAME', '%{APP_HOSTNAME}%');
-define('APP_SITE_NAME', APP_NAME);
-define('APP_RELATIVE_URL', '%{APP_RELATIVE_URL}%');
-define('APP_BASE_URL', '%{PROTOCOL_TYPE}%' . APP_HOSTNAME . APP_RELATIVE_URL);
-define('APP_COOKIE_URL', APP_RELATIVE_URL);
-define('APP_COOKIE_DOMAIN', APP_HOSTNAME);
-define('APP_COOKIE', 'eventum');
-define('APP_COOKIE_EXPIRE', time() + (60 * 60 * 8));
-define('APP_PROJECT_COOKIE', 'eventum_project');
-define('APP_PROJECT_COOKIE_EXPIRE', time() + (60 * 60 * 24));
-
-define('APP_DEFAULT_PAGER_SIZE', 5);
-define('APP_DEFAULT_REFRESH_RATE', 5); // in minutes
-
-// new users will use these for default preferences
-define('APP_DEFAULT_ASSIGNED_EMAILS', 1); // if the user will recieve an email when an issue is assigned to him
-define('APP_DEFAULT_NEW_EMAILS', 0); // if the user will recieve an email when ANY issue is created
-
-define('APP_CHARSET', 'UTF-8');
-define('APP_DEFAULT_LOCALE', 'en_US');
-
-// define colors used by eventum
-define('APP_CELL_COLOR', '#255282');
-define('APP_LIGHT_COLOR', '#DDDDDD');
-define('APP_MIDDLE_COLOR', '#CACACA');
-define('APP_DARK_COLOR', '#CACACA');
-define('APP_CYCLE_COLORS', '#DDDDDD,#CACACA');
-define('APP_INTERNAL_COLOR', '#9C494B');
-
-define('APP_BENCHMARK', false);
-// if full text searching is enabled
-define('APP_ENABLE_FULLTEXT', %{APP_ENABLE_FULLTEXT}%);
-
-// define the type of password hashing to use (MD5, MD5-64)
-define('APP_HASH_TYPE', 'MD5');
+++ /dev/null
-<?php
-/*
- * Eventum setup for PLD Linux.
- *
- * This configuration file sets up system paths for Eventum.
- * You should not change anything in this file.
- *
- * All changes should go to %{SYSCONFDIR}%/config.php instead.
- *
- * But, if You do need to change something in this config, open bug on that in
- * http://bugs.pld-linux.org.
- */
-
-set_time_limit(0);
-set_magic_quotes_runtime(0);
-
-// prevent session from messing up the browser cache
-ini_set('session.cache_limiter', 'nocache');
-
-// definitions of path related variables
-define('APP_PATH', '%{APP_PATH}%/htdocs/');
-define('APP_INC_PATH', '%{APP_PATH}%/include/');
-define('APP_PEAR_PATH', '%{PHP_PEAR_DIR}%/');
-define('APP_TPL_PATH', '%{APP_PATH}%/templates/');
-define('APP_SMARTY_PATH', '%{SMARTY_DIR}%/');
-define('APP_JPGRAPH_PATH', APP_INC_PATH . 'jpgraph/');
-define('APP_LOG_PATH', '/var/log/eventum/');
-define('APP_LOCKS_PATH', '/var/run/eventum/');
-ini_set('include_path', '.:' . APP_PEAR_PATH);
-
-define('APP_SETUP_PATH', APP_PATH);
-define('APP_SETUP_FILE', '%{SYSCONFDIR}%/setup.php');
-
-define('APP_ERROR_LOG', APP_LOG_PATH . 'errors.log');
-define('APP_CLI_LOG', APP_LOG_PATH . 'cli.log');
-define('APP_IRC_LOG', APP_LOG_PATH . 'irc_bot.log');
-define('APP_LOGIN_LOG', APP_LOG_PATH . 'login_attempts.log');
-
-define('APP_VERSION', '%{APP_VERSION}%');
-
-# include site config
-include_once '%{SYSCONFDIR}%/config.php';
-
-// define the user_id of system user
-if (!defined('APP_SYSTEM_USER_ID')) {
- define('APP_SYSTEM_USER_ID', 1);
-}
-
-// if full text searching is enabled
-if (!defined('APP_ENABLE_FULLTEXT')) {
- define('APP_ENABLE_FULLTEXT', false);
-}
-
-if (!defined('APP_BENCHMARK')) {
- define('APP_BENCHMARK', false);
-}
-
-if (!defined('APP_DEFAULT_ASSIGNED_EMAILS')) {
- define('APP_DEFAULT_ASSIGNED_EMAILS', 1);
-}
-if (!defined('APP_DEFAULT_NEW_EMAILS')) {
- define('APP_DEFAULT_NEW_EMAILS', 0);
-}
-if (!defined('APP_COOKIE_URL')) {
- define('APP_COOKIE_URL', APP_RELATIVE_URL);
-}
-if (!defined('APP_COOKIE_DOMAIN')) {
- define('APP_COOKIE_DOMAIN', APP_HOSTNAME);
-}
-if (!defined('APP_HASH_TYPE')) {
- define('APP_HASH_TYPE', 'MD5');
-}
-if (!defined('APP_DEFAULT_LOCALE')) {
- define('APP_DEFAULT_LOCALE', 'en_US');
-}
-if (!defined('APP_EMAIL_ENCODING')) {
- if (APP_CHARSET == 'UTF-8') {
- define('APP_EMAIL_ENCODING', '8bit');
- } else {
- define('APP_EMAIL_ENCODING', '7bit');
- }
-}
-
-if (APP_BENCHMARK) {
- // always benchmark the scripts
- require_once 'Benchmark/Timer.php';
- $bench = new Benchmark_Timer;
- $bench->start();
-}
-
-// handle the language preferences now
-$avail_langs = array(
- 'en_US' => 'English',
-# 'ru_RU' => 'Russian',
-# 'de_DE' => 'German',
-# 'fr_FR' => 'French',
- 'it_IT' => 'Italian',
-# 'fi_FI' => 'Finish',
-# 'es_ES' => 'Spanish',
-# 'nl_NL' => 'Dutch',
- 'sv_SE' => 'Swedish',
-);
-
-include_once(APP_INC_PATH . 'class.language.php');
-include_once(APP_INC_PATH . 'db_access.php');
-include_once(APP_INC_PATH . 'class.auth.php');
-include_once(APP_INC_PATH . 'class.misc.php');
-
-// fix magic_quote_gpc'ed values
-if (get_magic_quotes_gpc()) {
- $_GET = Misc::dispelMagicQuotes($_GET);
- $_POST = Misc::dispelMagicQuotes($_POST);
- $_REQUEST = Misc::dispelMagicQuotes($_REQUEST);
-}
-
-Language::setup();
-
-// set charset
-Header('Content-Type: text/html; charset=' . APP_CHARSET);
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 encoding=utf-8: */
---- eventum/misc/irc/bot.php 2007-01-16 21:23:53.759467491 +0200
-+++ eventum/misc/irc/bot.php 2007-01-16 21:30:11.757917329 +0200
-@@ -30,35 +30,8 @@
+--- eventum/misc/irc/bot.php~ 2007-01-30 18:59:36.349169654 +0200
++++ eventum/misc/irc/bot.php 2007-01-30 19:00:12.409985378 +0200
+@@ -30,13 +30,8 @@
ini_set('memory_limit', '256M');
--require_once('../../config.inc.php');
+-require_once('../../init.php');
-
--// IRC server address
--$irc_server_hostname = 'localhost';
--$irc_server_port = 6667;
--
--// the following is the list of IRC channels that the bot should connect to,
--// and the associated project name
--$irc_channels = array(
-- # Project Name -> IRC Channel(s)
-- 'Default Project' => '#issues',
--# 'Second Project' => array('#issues_2', '#byrocrate'),
--);
--
--$nickname = 'EventumBOT';
--$realname = 'Eventum Issue Tracking System';
--
--// do you need a username/password to connect to this server? if
--// so, fill in the next two variables
--$username = '';
--$password = '';
--
--
--// ============================================
--// ============================================
--// NO NEED TO UPDATE ANYTHING BELOW THIS LINE
--// ============================================
--// ============================================
+-if (!file_exists(APP_CONFIG_PATH . 'irc_config.php')) {
+- echo "ERROR: No config specified. Please see setup/irc_config.php for config information.\n\n";
+- exit;
+-}
-
+require_once('/etc/webapps/eventum/core.php');
+require_once('/etc/eventum/irc.php');
- require_once(APP_INC_PATH . 'db_access.php');
- require_once(APP_INC_PATH . 'class.auth.php');
- require_once(APP_INC_PATH . 'class.lock.php');
+
+ // ============================================
+ // ============================================
---- ./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$
- //
--require_once("config.inc.php");
-+require_once("/etc/eventum/cli.php");
- require_once(APP_INC_PATH . "class.command_line.php");
- require_once(APP_PEAR_PATH . "XML_RPC/RPC.php");
-
---- eventum/misc/cli/config.inc.php~ 2007-01-16 09:40:00.453108697 +0200
-+++ eventum/misc/cli/config.inc.php 2007-01-16 09:39:31.922469000 +0200
-@@ -45,15 +45,9 @@
- }
+--- eventum/misc/cli/config.inc.php 2007-01-30 20:32:58.965186306 +0200
++++ eventum/misc/cli/config.inc.php 2007-01-30 20:57:01.887651515 +0200
+@@ -32,9 +32,8 @@
+ set_time_limit(0);
// definitions of path related variables
--@define("APP_PATH", dirname(__FILE__) . '/');
--@define("APP_INC_PATH", APP_PATH . "include/");
-+@define("APP_PATH", '/usr/share/eventum/cli/');
-+@define("APP_INC_PATH", APP_PATH);
- @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);
---- ./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 @@
- //
- require_once("/etc/webapps/eventum/cli.php");
- require_once(APP_INC_PATH . "class.command_line.php");
--require_once(APP_PEAR_PATH . "XML_RPC/RPC.php");
-+require_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 @@
- //
-
- require_once(APP_INC_PATH . "class.misc.php");
--require_once(APP_PEAR_PATH . "XML_RPC/RPC.php");
-+require_once(APP_PEAR_PATH . "XML/RPC.php");
-
- $_displayed_confirmation = false;
-
---- eventum-localization-dev/include/class.template.php~ 2006-04-10 23:48:12.740151749 +0300
-+++ eventum-localization-dev/include/class.template.php 2006-04-10 23:48:16.310231300 +0300
-@@ -60,7 +60,7 @@
- {
+-define('APP_PATH', dirname(__FILE__) . '/');
+-define('APP_INC_PATH', APP_PATH . 'include/');
+-define('APP_PEAR_PATH', APP_INC_PATH . 'pear/');
++define('APP_INC_PATH', '/usr/share/eventum/cli/');
++define('APP_PEAR_PATH', '/usr/share/pear/');
+ define('APP_BENCHMARK', false);
+
+ set_include_path(get_include_path() . PATH_SEPARATOR . APP_PEAR_PATH);
+--- eventum/include/class.template.php~ 2007-01-30 18:52:59.020179406 +0200
++++ eventum/include/class.template.php 2007-01-30 18:53:24.620759076 +0200
+@@ -61,6 +61,7 @@
$this->smarty = new Smarty;
$this->smarty->template_dir = APP_TPL_PATH;
-- $this->smarty->compile_dir = APP_PATH . "templates_c";
-+ $this->smarty->compile_dir = '/var/cache/eventum';
+ $this->smarty->compile_dir = APP_TPL_COMPILE_PATH;
++ $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'));
foreach ($required_directories as $dir_path => $options) {
// check if directory exists
if (!file_exists($dir_path)) {
---- eventum-20060717/setup/index.php~ 2006-07-18 00:20:57.530267420 +0300
-+++ eventum-20060717/setup/index.php 2006-07-18 00:22:06.301805247 +0300
-@@ -121,31 +121,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/webapps/eventum/config.php', "File '/etc/webapps/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/webapps/eventum/setup.php', "File '/etc/webapps/eventum/setup.php'");
- if (!empty($error)) {
- $errors[] = $error;
- }
-- $error = checkPermissions('../include/private_key.php', "File 'include/private_key.php'");
-+ $error = checkPermissions('/etc/webapps/eventum/private_key.php', "File '/etc/webapps/eventum/private_key.php'");
- if (!empty($error)) {
- $errors[] = $error;
+--- ./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)
+ {
+- require_once(APP_SMARTY_PATH . "plugins/modifier.highlight_quoted.php");
++ require_once(APP_INC_PATH. "smarty/modifier.highlight_quoted.php");
+ return smarty_modifier_highlight_quoted($text);
}
---- eventum-20060918/setup/index.php~ 2006-09-19 00:15:15.216195060 +0300
-+++ eventum-20060918/setup/index.php 2006-09-19 00:15:18.346265301 +0300
-@@ -276,8 +276,8 @@
- 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/webapps/eventum/config.php')) {
-+ return "The file '/etc/webapps/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($_POST['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/webapps/eventum/private_key.php')) {
-+ return "The file '/etc/webapps/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/webapps/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/webapps/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/webapps/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
-@@ -429,18 +429,7 @@
- $tpl->assign('is_imap_enabled', function_exists('imap_open'));
+--- eventum/init.php 2007-01-30 19:05:56.897776515 +0200
++++ eventum/init.php 2007-01-30 20:12:31.017572265 +0200
+@@ -27,5 +27,5 @@
+ // +----------------------------------------------------------------------+
+
+-if (!file_exists(dirname(__FILE__) . '/config/config.php')) {
++if (!file_exists('/etc/webapps/eventum/config.php')) {
+ Header('Location: setup/');
+ exit;
+@@ -43,31 +43,31 @@
+ define('APP_VERSION', '2.0-alpha');
+
+ // define base path
+-define('APP_PATH', realpath(dirname(__FILE__)) . '/');
+-define('APP_CONFIG_PATH', APP_PATH . 'config/');
++define('APP_PATH', '/usr/share/eventum/htdocs/');
++define('APP_CONFIG_PATH', '/etc/webapps/eventum/');
+
+ // include local site config
+ require_once APP_CONFIG_PATH . 'config.php';
+
+ // define other paths
+ if (!defined('APP_INC_PATH')) {
+- define('APP_INC_PATH', APP_PATH . 'include/');
++ define('APP_INC_PATH', '/usr/share/eventum/include/');
}
--
--$full_url = dirname($_SERVER['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);
-+$relative_url = '/eventum/';
+ if (!defined('APP_PEAR_PATH')) {
+- define('APP_PEAR_PATH', APP_INC_PATH . 'pear/');
++ define('APP_PEAR_PATH', '/usr/share/pear/');
+ }
- $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 @@
- require_once(APP_INC_PATH . "db_access.php");
+ if (!defined('APP_TPL_PATH')) {
+- define('APP_TPL_PATH', APP_PATH . 'templates/');
++ define('APP_TPL_PATH', '/usr/share/eventum/templates/');
+ }
- // 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_TPL_COMPILE_PATH')) {
+- define('APP_TPL_COMPILE_PATH', APP_PATH . 'templates_c');
++ define('APP_TPL_COMPILE_PATH', '/var/cache/eventum/');
}
---- ../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');
---- eventum-20051221/include/class.draft.php~ 2005-12-21 17:56:27.000000000 +0200
-+++ eventum-20051221/include/class.draft.php 2005-12-21 17:59:26.000000000 +0200
-@@ -40,7 +40,7 @@
- */
- function saveRoutedMessage($message)
- {
-- $path = APP_PATH . "misc/routed_drafts/";
-+ $path = "/var/lib/eventum/routed_drafts/";
- list($usec,) = explode(" ", microtime());
- $filename = date('dmY.His.') . $usec . '.draft.txt';
- $fp = @fopen($path . $filename, 'w');
---- eventum-20051221/include/class.note.php~ 2005-12-21 17:56:27.000000000 +0200
-+++ eventum-20051221/include/class.note.php 2005-12-21 17:59:57.000000000 +0200
-@@ -255,7 +255,7 @@
- */
- function saveRoutedNote($message)
- {
-- $path = APP_PATH . "misc/routed_notes/";
-+ $path = "/var/lib/eventum/routed_notes/";
- list($usec,) = explode(" ", microtime());
- $filename = date('dmY.His.') . $usec . '.note.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
-@@ -417,7 +417,7 @@
- $config_contents = str_replace("%{APP_ENABLE_FULLTEXT}%", "false", $config_contents);
- }
-- $fp = @fopen('../config.inc.php', 'w');
-+ $fp = @fopen('/etc/webapps/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-localization-dev2/setup/index.php~ 2006-06-02 00:58:11.321514674 +0300
-+++ eventum-localization-dev2/setup/index.php 2006-06-02 00:58:46.032294537 +0300
-@@ -208,11 +208,11 @@
- exit;
+ if (!defined('APP_SMARTY_PATH')) {
+- define('APP_SMARTY_PATH', APP_INC_PATH . 'Smarty/');
++ define('APP_SMARTY_PATH', '/usr/share/php/Smarty/');
}
--require_once("../include/Smarty/Smarty.class.php");
-+require_once("/usr/share/pear/Smarty/Smarty.class.php");
+ if (!defined('APP_JPGRAPH_PATH')) {
+@@ -75,7 +75,7 @@
+ }
- $tpl = new Smarty();
--$tpl->template_dir = '../templates/';
--$tpl->compile_dir = "../templates_c";
-+$tpl->template_dir = '/usr/share/eventum/templates';
-+$tpl->compile_dir = "/var/cache/eventum";
- $tpl->config_dir = '';
+ if (!defined('APP_LOCKS_PATH')) {
+- define('APP_LOCKS_PATH', APP_PATH . 'locks/');
++ define('APP_LOCKS_PATH', '/var/run/eventum/');
+ }
- function replace_table_prefix($str)
---- 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_SETUP_FILE')) {
+@@ -83,7 +83,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/");
- require_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-localization-dev/include/class.template.php~ 2006-04-11 00:16:59.258616656 +0300
-+++ eventum-localization-dev/include/class.template.php 2006-04-11 00:17:23.649160189 +0300
-@@ -61,6 +61,7 @@
- $this->smarty = new Smarty;
- $this->smarty->template_dir = APP_TPL_PATH;
- $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)
- {
-- require_once(APP_SMARTY_PATH . "plugins/modifier.highlight_quoted.php");
-+ require_once(APP_INC_PATH. "smarty/modifier.highlight_quoted.php");
- return smarty_modifier_highlight_quoted($text);
+ if (!defined('APP_ERROR_LOG')) {
+--- eventum/setup/index.php~ 2007-01-30 20:04:32.306824546 +0200
++++ eventum/setup/index.php 2007-01-30 20:14:43.880555938 +0200
+@@ -38,17 +38,17 @@
+ set_time_limit(0);
+ define('APP_CHARSET', 'UTF-8');
+ define('APP_DEFAULT_LOCALE', 'en_US');
+-define('APP_PATH', realpath(dirname(__FILE__) . '/..') . '/');
++define('APP_PATH', realpath(dirname(__FILE__) . '/../..') . '/');
+ define('APP_INC_PATH', APP_PATH . 'include/');
+ define('APP_PEAR_PATH', APP_INC_PATH . 'pear/');
+-define('APP_SMARTY_PATH', APP_INC_PATH . '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/');
+
+ define('APP_BENCHMARK', false);
+
+@@ -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/misc/cli/eventum~ 2007-01-30 20:33:31.435916994 +0200
++++ eventum/misc/cli/eventum 2007-01-30 20:34:58.717881130 +0200
+@@ -13,3 +13,3 @@
+ //
+-require_once(dirname(__FILE__) . '/config.inc.php');
++require_once('/etc/eventum/cli.php');
+ require_once(APP_INC_PATH . 'class.command_line.php');
+++ /dev/null
-diff -ur eventum-20051221/include/class.draft.php eventum-20051221.perms/include/class.draft.php
---- eventum-20051221/include/class.draft.php 2005-12-21 17:54:59.000000000 +0200
-+++ eventum-20051221.perms/include/class.draft.php 2005-12-21 17:54:24.000000000 +0200
-@@ -46,7 +46,7 @@
- $fp = @fopen($path . $filename, 'w');
- @fwrite($fp, $message);
- @fclose($fp);
-- @chmod($path . $filename, 0777);
-+ @chmod($path . $filename, 0750);
- }
-
-
-diff -ur eventum-20051221/include/class.misc.php eventum-20051221.perms/include/class.misc.php
---- eventum-20051221/include/class.misc.php 2005-12-21 17:55:00.000000000 +0200
-+++ eventum-20051221.perms/include/class.misc.php 2005-12-21 17:53:59.000000000 +0200
-@@ -577,7 +577,7 @@
- if (!is_writable($file)) {
- if (!stristr(PHP_OS, "win")) {
- // let's try to change the permissions ourselves
-- @chmod($file, 0777);
-+ @chmod($file, 0750);
- clearstatcache();
- if (!is_writable($file)) {
- return false;
-diff -ur eventum-20051221/include/class.note.php eventum-20051221.perms/include/class.note.php
---- eventum-20051221/include/class.note.php 2005-12-21 17:55:00.000000000 +0200
-+++ eventum-20051221.perms/include/class.note.php 2005-12-21 17:54:30.000000000 +0200
-@@ -261,7 +261,7 @@
- $fp = @fopen($path . $filename, 'w');
- @fwrite($fp, $message);
- @fclose($fp);
-- @chmod($path . $filename, 0777);
-+ @chmod($path . $filename, 0750);
- }
-
-
-diff -ur eventum-20051221/include/class.support.php eventum-20051221.perms/include/class.support.php
---- eventum-20051221/include/class.support.php 2005-12-21 17:55:00.000000000 +0200
-+++ eventum-20051221.perms/include/class.support.php 2005-12-21 17:49:55.000000000 +0200
-@@ -264,7 +264,6 @@
- $fp = @fopen($path . $filename, 'w');
- @fwrite($fp, $message);
- @fclose($fp);
-- @chmod($path . $filename, 0777);
- return $filename;
- }
-
-diff -ur eventum-20051221/include/jpgraph/jpgraph.php eventum-20051221.perms/include/jpgraph/jpgraph.php
---- eventum-20051221/include/jpgraph/jpgraph.php 2005-12-21 17:54:59.000000000 +0200
-+++ eventum-20051221.perms/include/jpgraph/jpgraph.php 2005-12-21 17:53:53.000000000 +0200
-@@ -4086,7 +4086,7 @@
- $aFile = dirname($aFile);
- }
- for ($i = sizeof($dirs)-1; $i>=0; $i--) {
-- if(! @mkdir($dirs[$i],0777) )
-+ if(! @mkdir($dirs[$i],0750) )
- JpGraphError::Raise("<b>JpGraph Error:</b> Can't create directory in $aFile. Permission problems?");
-
- // We also specify mode here after we have changed group.
-@@ -4096,7 +4096,7 @@
- if( CACHE_FILE_GROUP != "" ) {
- $res=true;
- $res =@chgrp($dirs[$i],CACHE_FILE_GROUP);
-- $res &= @chmod($dirs[$i],0777);
-+ $res &= @chmod($dirs[$i],0750);
- if( !$res )
- JpGraphError::Raise("<b>JpGraph Error:</b> Can't set permissions for $aFile. Permission problems?");
- }
-diff -ur eventum-20051221/setup/index.php eventum-20051221.perms/setup/index.php
---- eventum-20051221/setup/index.php 2005-12-21 17:55:00.000000000 +0200
-+++ eventum-20051221.perms/setup/index.php 2005-12-21 17:53:18.000000000 +0200
-@@ -68,7 +68,7 @@
- if (!is_writable($file)) {
- if (!stristr(PHP_OS, "win")) {
- // let's try to change the permissions ourselves
-- @chmod($file, 0777);
-+ @chmod($file, 0750);
- clearstatcache();
- if (!is_writable($file)) {
- return "$desc is not writable";
%bcond_with qmail # build the router-qmail subpackage
#define _snap 20060921
-%define _svn 20070122.3203
+%define _svn 20070130.3228
#define _rc RC3
-%define _rel 5.156
+%define _rel 5.175
%include /usr/lib/rpm/macros.php
Summary: Eventum Issue / Bug tracking system
Group: Applications/WWW
#Source0: http://downloads.mysql.com/snapshots/eventum/%{name}-nightly-%{_snap}.tar.gz
Source0: %{name}-%{_svn}.tar.bz2
-# Source0-md5: e44e34a426b56f59a00777fcf8b777ee
+# Source0-md5: 0c4bb49fefc34dffc29d035d57196fa7
Source1: %{name}-apache.conf
Source2: %{name}-mail-queue.cron
Source3: %{name}-mail-download.cron
Source7: %{name}-irc.php
Source8: %{name}-irc.init
Source9: %{name}-irc.sysconfig
-Source10: %{name}-config.php
+
Source11: %{name}-router-qmail.sh
-Source12: %{name}-config-setup.php
+
Source13: %{name}-upgrade.sh
Source14: %{name}-router-postfix.sh
Source15: %{name}.logrotate
Source16: %{name}-lighttpd.conf
Patch0: %{name}-lf.patch
-Patch1: %{name}-perms.patch
+
Patch2: %{name}-timetracking-advanced-logic.patch
Patch3: %{name}-email-notify-display.patch
Patch4: %{name}-backtraces.patch
# undos the source
find . -type f -print0 | xargs -0 sed -i -e 's,\r$,,'
-rm setup.conf.php # not to be installed by *.php glob
rm benchmark.php
rm -r misc/upgrade/*v1.[123]* # too old to support in PLD Linux
rm misc/upgrade/flush_compiled_templates.php
# bug fixes.
%patch0 -p1
-%patch1 -p1
%patch2 -p1
%patch3 -p1
chmod +x misc/*.php
mv include/private_key.php private_key.php.in
-# replace in remaining scripts config.inc.php to system one
-grep -rl 'require_once(".*config.inc.php")' . | xargs sed -i -e '
- s,require_once(".*config.inc.php"),require_once("%{_webappdir}/core.php"),
-'
-
grep -rl 'APP_INC_PATH..*"private_key.php"' . | xargs sed -i -e '
s,require_once(APP_INC_PATH.*"private_key.php"),require_once("%{_webappdir}/private_key.php"),
'
cp -a misc/upgrade $RPM_BUILD_ROOT%{_appdir}
cp -a favicon.ico $RPM_BUILD_ROOT%{_appdir}/htdocs/favicon.ico
-install %{SOURCE12} $RPM_BUILD_ROOT%{_appdir}/htdocs/setup/config.inc.php
install %{SOURCE13} $RPM_BUILD_ROOT%{_appdir}/upgrade/upgrade.sh
# cli
cp -a private_key.php.in $RPM_BUILD_ROOT%{_webappdir}/private_key.php
touch $RPM_BUILD_ROOT%{_webappdir}/htpasswd
-install %{SOURCE1} $RPM_BUILD_ROOT%{_webappdir}/apache.conf
-install %{SOURCE1} $RPM_BUILD_ROOT%{_webappdir}/httpd.conf
-install %{SOURCE16} $RPM_BUILD_ROOT%{_webappdir}/lighttpd.conf
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.d/%{name}-mail-queue
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/cron.d/%{name}-mail-download
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/cron.d/%{name}-reminder
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/cron.d/%{name}-monitor
-install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/irc.php
-install %{SOURCE8} $RPM_BUILD_ROOT/etc/rc.d/init.d/eventum-irc
-install %{SOURCE9} $RPM_BUILD_ROOT/etc/sysconfig/eventum-irc
-
-sed -e '
-s,%%{APP_VERSION}%%,%{version}%{?_snap:-%{_snap}}%{?_rc:-%{_rc}}%{?_svn:-%{_svn}},
-s,%%{PHP_PEAR_DIR}%%,%{php_pear_dir},
-s,%%{APP_PATH}%%,%{_appdir},
-s,%%{SMARTY_DIR}%%,%{_smartydir},
-s,%%{SYSCONFDIR}%%,%{_webappdir},
-' %{SOURCE10} > $RPM_BUILD_ROOT%{_webappdir}/core.php
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_webappdir}/apache.conf
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_webappdir}/httpd.conf
+cp -a %{SOURCE16} $RPM_BUILD_ROOT%{_webappdir}/lighttpd.conf
+cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.d/%{name}-mail-queue
+cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/cron.d/%{name}-mail-download
+cp -a %{SOURCE4} $RPM_BUILD_ROOT/etc/cron.d/%{name}-reminder
+cp -a %{SOURCE5} $RPM_BUILD_ROOT/etc/cron.d/%{name}-monitor
+cp -a %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/irc.php
+cp -a %{SOURCE8} $RPM_BUILD_ROOT/etc/rc.d/init.d/eventum-irc
+cp -a %{SOURCE9} $RPM_BUILD_ROOT/etc/sysconfig/eventum-irc
+
+
+%{__sed} -i -e "/define('APP_VERSION'/ {
+ idefine('APP_VERSION', '%{version}%{?_snap:-%{_snap}}%{?_rc:-%{_rc}}%{?_svn:-%{_svn}}');
+ d
+
+}" $RPM_BUILD_ROOT%{_appdir}/htdocs/init.php
# config
> $RPM_BUILD_ROOT%{_webappdir}/setup.php
-mv $RPM_BUILD_ROOT{%{_appdir}/htdocs/config.inc,%{_webappdir}/config}.php
+> $RPM_BUILD_ROOT%{_webappdir}/config.php
install -d $RPM_BUILD_ROOT%{_smartyplugindir}
# These plugins are not in Smarty package (Smarty-2.6.2-3)
fi
ln -sf process_cvs_commits $RPM_BUILD_ROOT%{_libdir}/scm
+%triggerpostun -- eventum < eventum-1.7.1-5.165
+%{__sed} -i -e '
+ /define.*APP_URL/d
+' %{_webappdir}/config.php
+
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc ChangeLog FAQ INSTALL README UPGRADE CONTRIB
%attr(640,root,eventum) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/private_key.php
%attr(660,root,eventum) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/setup.php
%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/htpasswd
-%attr(640,root,eventum) %config %verify(not mtime) %{_webappdir}/core.php
%dir %attr(731,root,eventum) /var/log/%{name}
%attr(620,root,eventum) %ghost /var/log/%{name}/*