SOURCES: eventum-irc-config.patch - adjust for memory patch - fix ...

[glen]

Author: glen                         Date: Thu Dec 29 23:21:52 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- adjust for memory patch
- fix channels parsing

---- Files affected:
SOURCES:
   eventum-irc-config.patch (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SOURCES/eventum-irc-config.patch
diff -u SOURCES/eventum-irc-config.patch:1.10 SOURCES/eventum-irc-config.patch:1.11
--- SOURCES/eventum-irc-config.patch:1.10	Wed Dec 21 00:25:04 2005
+++ SOURCES/eventum-irc-config.patch	Fri Dec 30 00:21:47 2005
@@ -1,16 +1,5 @@
 --- eventum-1.6.1/misc/irc/bot.php.orig	2005-09-17 17:28:04.000000000 +0300
 +++ eventum-1.6.1/misc/irc/bot.php	2005-09-17 17:49:09.000000000 +0300
-@@ -27,8 +27,9 @@
- //
- // @(#) $Id$
- //
-+require_once('/etc/webapps/eventum/core.php');
-+include_once('/etc/webapps/eventum/irc.php');
- 
--include_once("../../config.inc.php");
- include_once(APP_INC_PATH . "db_access.php");
- include_once(APP_INC_PATH . "class.auth.php");
- include_once(APP_INC_PATH . "class.lock.php");
 @@ -38,22 +39,19 @@
  
  ini_set("memory_limit", "256M");
@@ -40,7 +29,7 @@
 +$channels = array();
 +foreach ($irc_channels as $proj => $chan) {
 +    $proj_id = Project::getID($proj);
-+    $channels[$proj_id] = $chan;
++    $channels[$proj_id] = is_array($chan) ? $chan : array($chan);
 +}
  
  // ============================================
@@ -76,3 +65,13 @@
 -?>
 \ No newline at end of file
 +?>
+--- eventum-1.7.0/misc/irc/bot.php~	2005-12-30 00:22:37.000000000 +0200
++++ eventum-1.7.0/misc/irc/bot.php	2005-12-30 00:23:17.000000000 +0200
+@@ -31,6 +31,7 @@
+ ini_set("memory_limit", "256M");
+ 
+ include_once("../../config.inc.php");
++include_once('/etc/webapps/eventum/irc.php');
+ include_once(APP_INC_PATH . "db_access.php");
+ include_once(APP_INC_PATH . "class.auth.php");
+ include_once(APP_INC_PATH . "class.lock.php");
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/eventum-irc-config.patch?r1=1.10&r2=1.11&f=u