# HG changeset patch
# User Dan
# Date 1210385972 14400
# Node ID a802bb5b3e08cbf83c1eb88c94ed4975c082ab2e
# Parent  fcc1eac04772cd76d4f4c0d92def52dcff82c4dc
Made the channel list completely dynamic now

diff -r fcc1eac04772 -r a802bb5b3e08 config-sample.php
--- a/config-sample.php	Wed May 07 23:56:26 2008 -0400
+++ b/config-sample.php	Fri May 09 22:19:32 2008 -0400
@@ -11,5 +11,6 @@
 $mysql_user = '';
 $mysql_pass = '';
 $mysql_dbname = '';
+$channels = array('#mychan', '#yourchan', '#4chan');
 
 ?>
diff -r fcc1eac04772 -r a802bb5b3e08 enanobot.php
--- a/enanobot.php	Wed May 07 23:56:26 2008 -0400
+++ b/enanobot.php	Fri May 09 22:19:32 2008 -0400
@@ -1,5 +1,12 @@
 <?php
-define('LIBIRC_DEBUG', '');
+
+/**
+ * EnanoBot - the Enano CMS IRC logging and help automation bot
+ * GPL and no warranty, see the LICENSE file for more info
+ */
+
+// define('LIBIRC_DEBUG', '');
+
 require('libirc.php');
 require('config.php');
 
@@ -61,23 +68,30 @@
 
 mysql_reconnect();
 
+$libirc_channels = array();
+
 $irc = new Request_IRC('irc.freenode.net');
 $irc->connect($nick, $user, $name, $pass);
 $irc->set_privmsg_handler('enanobot_privmsg_event');
-$enano = $irc->join('#enano', 'enanobot_channel_event_enano');
-$enano_dev = $irc->join('#enano-dev', 'enanobot_channel_event_enanodev');
-$irc->privmsg('ChanServ', 'OP #enano EnanoBot');
-$irc->privmsg('ChanServ', 'OP #enano-dev EnanoBot');
+
+foreach ( $channels as $channel )
+{
+  $libirc_channels[$channel] = $irc->join($channel, 'enanobot_channel_event');
+  $channel_clean = preg_replace('/^[#&]/', '', $channel);
+  $libirc_channels[$channel_clean] =& $libirc_channels[$channel];
+  $irc->privmsg('ChanServ', "OP $channel $nick");
+}
 
 $irc->event_loop();
 $irc->close();
 mysql_close($mysql_conn);
 
-function enanobot_channel_event_enano($sockdata, $chan)
+function enanobot_channel_event($sockdata, $chan)
 {
   global $irc, $nick, $mysql_conn, $privileged_list;
   $sockdata = trim($sockdata);
   $message = Request_IRC::parse_message($sockdata);
+  $channelname = $chan->get_channel_name();
   enanobot_log_message($chan, $message);
   switch ( $message['action'] )
   {
@@ -85,7 +99,7 @@
       // if a known op joins the channel, send mode +o
       if ( in_array($message['nick'], $privileged_list) )
       {
-        $chan->parent->put("MODE #enano +o {$message['nick']}\r\n");
+        $chan->parent->put("MODE $channelname +o {$message['nick']}\r\n");
       }
       break;
     case 'PRIVMSG':
@@ -94,25 +108,6 @@
   }
 }
 
-function enanobot_channel_event_enanodev($sockdata, $chan)
-{
-  global $irc, $privileged_list;
-  $sockdata = trim($sockdata);
-  $message = Request_IRC::parse_message($sockdata);
-  enanobot_log_message($chan, $message);
-  switch ( $message['action'] )
-  {
-    case 'JOIN':
-      // if dandaman32 joins the channel, use mode +o
-      if ( in_array($message['nick'], $privileged_list) )
-        $chan->parent->put("MODE #enano-dev +o {$message['nick']}\r\n");
-      break;
-    case 'PRIVMSG':
-      enanobot_process_channel_message($sockdata, $chan, $message);
-      break;
-  }
-}
-
 function enanobot_process_channel_message($sockdata, $chan, $message)
 {
   global $irc, $nick, $mysql_conn, $privileged_list;
@@ -229,14 +224,14 @@
 
 function enanobot_privmsg_event($message)
 {
-  global $privileged_list, $irc;
+  global $privileged_list, $irc, $nick;
   static $part_cache = array();
   if ( in_array($message['nick'], $privileged_list) && $message['message'] == 'Suspend' && $message['action'] == 'PRIVMSG' )
   {
     foreach ( $irc->channels as $channel )
     {
       $part_cache[] = array($channel->get_channel_name(), $channel->get_handler());
-      $channel->msg("I've received a request to stop logging messages and responding to requests from {$message['nick']}. Don't forget to unsuspend me with /msg EnanoBot Resume when finished.", true);
+      $channel->msg("I've received a request to stop logging messages and responding to requests from {$message['nick']}. Don't forget to unsuspend me with /msg $nick Resume when finished.", true);
       $channel->part("Logging and presence suspended by {$message['nick']}", true);
     }
   }
@@ -257,10 +252,14 @@
     $irc->close("Remote bot shutdown ordered by {$message['nick']}", true);
     return 'BREAK';
   }
-  else if ( in_array($message['nick'], $privileged_list) && preg_match('/^\!echo-enano /', $message['message']) )
+  else if ( in_array($message['nick'], $privileged_list) && preg_match("/^\!echo-([^\007, \r\n\a\t]+) /", $message['message'], $match) )
   {
-    global $enano;
-    $enano->msg(preg_replace('/^\!echo-enano /', '', $message['message']), true);
+    global $libirc_channels;
+    $channel_name =& $match[1];
+    if ( isset($libirc_channels[$channel_name]) && is_object($libirc_channels[$channel_name]) )
+    {
+      $libirc_channels[$channel_name]->msg(preg_replace("/^\!echo-([^\007, \r\n\a\t]+) /", '', $message['message']), true);
+    }
   }
 }