Author: glen Date: Tue Jul 26 17:55:22 2005 GMT
Module: SOURCES Tag: DEVEL
---- Log message:
- updated to 1.5.5
---- Files affected:
SOURCES:
eventum-paths.patch (1.22.2.1 -> 1.22.2.2) , eventum-irc-config.patch (1.4
-> 1.4.2.1)
---- Diffs:
================================================================
Index: SOURCES/eventum-paths.patch
diff -u SOURCES/eventum-paths.patch:1.22.2.1
SOURCES/eventum-paths.patch:1.22.2.2
--- SOURCES/eventum-paths.patch:1.22.2.1 Tue Jul 19 17:15:47 2005
+++ SOURCES/eventum-paths.patch Tue Jul 26 19:55:17 2005
@@ -140,21 +140,6 @@
if (!empty($error)) {
$errors[] = $error;
}
-@@ -203,11 +203,11 @@
- }
-
- ini_set("include_path", '.');
--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 = '';
-
- function replace_table_prefix($str)
@@ -276,8 +276,8 @@
clearstatcache();
@@ -188,15 +173,6 @@
}
fclose($fp);
// check if we can connect
-@@ -396,7 +396,7 @@
- $protocol_type = 'http://';
- }
- $config_contents = str_replace("%{PROTOCOL_TYPE}%", $protocol_type,
$config_contents);
-- $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.";
- }
@@ -425,23 +425,8 @@
$tpl->assign('is_imap_enabled', function_exists('imap_open'));
}
@@ -247,3 +223,46 @@
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 = '';
+
+ function replace_table_prefix($str)
+@@ -417,7 +417,7 @@
+ $config_contents = str_replace("%{APP_ENABLE_FULLTEXT}%", "false",
$config_contents);
+ }
+
+- $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 (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");
+
+ $html = checkRequirements();
================================================================
Index: SOURCES/eventum-irc-config.patch
diff -u SOURCES/eventum-irc-config.patch:1.4
SOURCES/eventum-irc-config.patch:1.4.2.1
--- SOURCES/eventum-irc-config.patch:1.4 Wed Mar 30 11:04:00 2005
+++ SOURCES/eventum-irc-config.patch Tue Jul 26 19:55:17 2005
@@ -14,18 +14,6 @@
)
);
-@@ -355,9 +357,8 @@
- $irc->registerActionhandler(SMARTIRC_TYPE_QUERY, '^!?list-clocked-in', $bot,
'listClockedInUsers');
- $irc->registerActionhandler(SMARTIRC_TYPE_QUERY, '^!?list-quarantined', $bot,
'listQuarantinedIssues');
-
--
--$irc->connect('localhost', 6667);
--$irc->login('EventumBOT', 'EventumBOT', 0, 'EventumBOT');
-+$irc->connect($irc_host, $irc_port);
-+$irc->login($irc_nick, $irc_realname, 0, $irc_username, $irc_password);
- foreach ($channels as $prj_id => $channel_list) {
- $irc->join($channel_list);
- }
--- ./misc/irc/bot.php~ 2005-03-14 14:47:40.000000000 +0200
+++ ./misc/irc/bot.php 2005-03-28 20:58:31.000000000 +0300
@@ -56,7 +56,7 @@
@@ -37,3 +25,21 @@
$irc_default_channel,
)
);
+--- ./misc/irc/bot.php~ 2005-07-26 19:15:02.000000000 +0300
++++ ./misc/irc/bot.php 2005-07-26 19:15:45.000000000 +0300
+@@ -395,11 +395,11 @@
+ $irc->registerActionhandler(SMARTIRC_TYPE_QUERY, '^!?list-quarantined', $bot,
'listQuarantinedIssues');
+
+
+-$irc->connect('localhost', 6667);
+-$irc->login('EventumBOT', 'EventumBOT', 0, 'EventumBOT');
++$irc->connect($irc_host, $irc_port);
++$irc->login($irc_nick, $irc_realname, 0, $irc_username, $irc_password);
+ $irc->listen();
+ $irc->disconnect();
+
+ // release the lock
+ Lock::release('irc_bot');
+-?>
+\ No newline at end of file
++?>
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/eventum-paths.patch?r1=1.22.2.1&r2=1.22.2.2&f=u
http://cvs.pld-linux.org/SOURCES/eventum-irc-config.patch?r1=1.4&r2=1.4.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
