--- C:/Documents and Settings/Shireling/Desktop/mibbit_irc-6.x-1.x-dev/mibbit_irc/mibbit_irc.module	Sun Sep 28 13:13:14 2008
+++ C:/wamp/www/drupal6_module_dev-mibbit/sites/all/modules/mibbit_irc/mibbit_irc.module	Mon Sep 29 00:52:04 2008
@@ -63,8 +63,8 @@
     '#type' => 'textfield',
     '#title' => t('Channel name'),
     '#default_value' => variable_get('mibbit_irc_channel', 'mibbit_test'),
-    '#description' => t('Name of the IRC channel to access.'),
-    '#size' => 20,
+    '#description' => t('Name of the IRC channel to access (no # sign required). Add multiple channels by separating them with a comma, for example channel1,channel2,channel3.'),
+    '#size' => 30,
     '#required' => TRUE,
   );
   $form['mibbit_irc_width'] = array(
@@ -166,14 +166,17 @@
   $nick = preg_replace('/ /', '_', $user->name);
   $title = variable_get('mibbit_irc_page_title', 'Live Chat');
   $server = variable_get('mibbit_irc_server', 'irc.mibbit.com');
-  $channel = variable_get('mibbit_irc_channel', 'mibbit_test');
   $width = variable_get('mibbit_irc_width', '500');
   $height = variable_get('mibbit_irc_height', '280');
   
+	// Channels
+  $channels_list = explode(',', variable_get('mibbit_irc_channel', 'mibbit_test'));
+	$channels = implode('%2C%23',$channels_list);
+  
   $output = variable_get('mibbit_irc_welcome', '');
   $output .= '<div id="mibbit-irc" class="mibbit-irc">
 <noscript>JavaScript is required to be on for the chat window to work properly.</noscript>
-<iframe id="mibbit-irc-window" width="'. $width .'" height="'. $height .'" scrolling="no" border="0" src="http://embed.mibbit.com/e/index.html?server='. urlencode($server) .'&amp;channel=%23'. $channel .'&amp;nick='. $nick .'&amp;chatOutputShowTimes=false">You must allow frames to be rendered in your browser to see the chat window.</iframe>
+<iframe id="mibbit-irc-window" width="'. $width .'" height="'. $height .'" scrolling="no" border="0" src="http://embed.mibbit.com/e/index.html?server='. urlencode($server) .'&amp;channel=%23'. $channels .'&amp;nick='. $nick .'&amp;chatOutputShowTimes=false">You must allow frames to be rendered in your browser to see the chat window.</iframe>
 </div>';
   $output .= variable_get('mibbit_irc_help', '');