Author: glen Date: Tue Jan 30 19:17:21 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- update to 20070130.3228
---- Files affected:
SOURCES:
eventum-paths.patch (1.34 -> 1.35) , eventum-irc-config.patch (1.18 -> 1.19)
, eventum-PEAR.patch (1.4 -> 1.5) , eventum-perms.patch (1.1 -> NONE)
(REMOVED), eventum-config-setup.php (1.11 -> NONE) (REMOVED),
eventum-config.php (1.27 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: SOURCES/eventum-paths.patch
diff -u SOURCES/eventum-paths.patch:1.34 SOURCES/eventum-paths.patch:1.35
--- SOURCES/eventum-paths.patch:1.34 Tue Jan 16 08:52:31 2007
+++ SOURCES/eventum-paths.patch Tue Jan 30 20:17:16 2007
@@ -1,65 +1,24 @@
---- ./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
[EMAIL PROTECTED]("APP_PATH", dirname(__FILE__) . '/');
[EMAIL PROTECTED]("APP_INC_PATH", APP_PATH . "include/");
[EMAIL PROTECTED]("APP_PATH", '/usr/share/eventum/cli/');
[EMAIL PROTECTED]("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'));
@@ -73,211 +32,135 @@
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/';
-
- $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");
-
- // 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_PEAR_PATH')) {
+- define('APP_PEAR_PATH', APP_INC_PATH . 'pear/');
++ define('APP_PEAR_PATH', '/usr/share/pear/');
}
---- ../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_TPL_PATH')) {
+- define('APP_TPL_PATH', APP_PATH . 'templates/');
++ define('APP_TPL_PATH', '/usr/share/eventum/templates/');
}
--require_once("../include/Smarty/Smarty.class.php");
-+require_once("/usr/share/pear/Smarty/Smarty.class.php");
+ if (!defined('APP_TPL_COMPILE_PATH')) {
+- define('APP_TPL_COMPILE_PATH', APP_PATH . 'templates_c');
++ define('APP_TPL_COMPILE_PATH', '/var/cache/eventum/');
+ }
- $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 = '';
-
- 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_SMARTY_PATH')) {
+- define('APP_SMARTY_PATH', APP_INC_PATH . 'Smarty/');
++ define('APP_SMARTY_PATH', '/usr/share/php/Smarty/');
}
--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");
-
- $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_JPGRAPH_PATH')) {
+@@ -75,7 +75,7 @@
+ }
+
+ if (!defined('APP_LOCKS_PATH')) {
+- define('APP_LOCKS_PATH', APP_PATH . 'locks/');
++ define('APP_LOCKS_PATH', '/var/run/eventum/');
+ }
+
+ if (!defined('APP_SETUP_FILE')) {
+@@ -83,7 +83,7 @@
+ }
+ if (!defined('APP_LOG_PATH')) {
+- define('APP_LOG_PATH', APP_PATH . 'logs/');
++ define('APP_LOG_PATH', '/var/log/eventum/');
+ }
+
+ 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');
================================================================
Index: SOURCES/eventum-irc-config.patch
diff -u SOURCES/eventum-irc-config.patch:1.18
SOURCES/eventum-irc-config.patch:1.19
--- SOURCES/eventum-irc-config.patch:1.18 Tue Jan 16 20:32:06 2007
+++ SOURCES/eventum-irc-config.patch Tue Jan 30 20:17:16 2007
@@ -1,40 +1,18 @@
---- 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');
+
+ // ============================================
+ // ============================================
================================================================
Index: SOURCES/eventum-PEAR.patch
diff -u SOURCES/eventum-PEAR.patch:1.4 SOURCES/eventum-PEAR.patch:1.5
--- SOURCES/eventum-PEAR.patch:1.4 Thu Dec 7 21:11:37 2006
+++ SOURCES/eventum-PEAR.patch Tue Jan 30 20:17:16 2007
@@ -1,17 +1,3 @@
---- 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/");
[EMAIL PROTECTED]("APP_PEAR_PATH", APP_INC_PATH . "pear/");
[EMAIL PROTECTED]("APP_PEAR_PATH", "/usr/share/pear/");
- @define("APP_TPL_PATH", APP_PATH . "templates/");
[EMAIL PROTECTED]("APP_SMARTY_PATH", APP_INC_PATH . "Smarty/");
[EMAIL PROTECTED]("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 @@
@@ -38,3 +24,23 @@
$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;
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/eventum-paths.patch?r1=1.34&r2=1.35&f=u
http://cvs.pld-linux.org/SOURCES/eventum-irc-config.patch?r1=1.18&r2=1.19&f=u
http://cvs.pld-linux.org/SOURCES/eventum-PEAR.patch?r1=1.4&r2=1.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
