Changeset 0e7ab64 for root_commands.c

Timestamp:

2007-04-23T02:58:44Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

2d317bb

Parents:

43671b9

Message:

Got rid of one HORRIBLE stupidity called chat_by_channel(), which still
used the GLOBAL IM connections list, allowing user A to interfere with
user B's groupchats if running in daemon mode. I can't believe this was
still there...

File:

• root_commands.c (modified) (2 diffs)

root_commands.c

@@ -918 +918 @@
                 char *s;
                 
-                channel = g_strdup( chat );
+                channel = g_strdup_printf( "&%s", chat );
                 if( ( s = strchr( channel, '@' ) ) )
                         *s = 0;
@@ -928 +928 @@
         if( cmd[3] && cmd[4] && cmd[5] )
                 password = cmd[5];
+        
+        if( channel[0] != '#' && channel[0] != '&' )
+        {
+                irc_usermsg( irc, "Invalid channel name: %s", channel );
+                g_free( channel );
+                return;
+        }
+        else if( g_strcasecmp( channel, irc->channel ) == 0 || irc_chat_by_channel( irc, channel ) )
+        {
+                irc_usermsg( irc, "Channel already exists: %s", channel );
+                g_free( channel );
+                return;
+        }
         
         if( ( c = a->prpl->chat_join( ic, chat, nick, password ) ) )