Changes in irc.c [3183c21:39f93f0]

File:

• irc.c (modified) (4 diffs)

irc.c

@@ -38 +38 @@
         irc_t *irc = set->data;
         
-        if( irc->status & USTATUS_IDENTIFIED && value )
+        if( irc->status & USTATUS_IDENTIFIED )
         {
                 irc_setpass( irc, value );
@@ -239 +239 @@
         
         if( irc->status & USTATUS_IDENTIFIED && set_getbool( &irc->set, "save_on_quit" ) ) 
-                if( storage_save( irc, NULL, TRUE ) != STORAGE_OK )
+                if( storage_save( irc, TRUE ) != STORAGE_OK )
                         irc_usermsg( irc, "Error while saving settings!" );
         
@@ -781 +781 @@
         irc_reply( irc,   3, ":%s", IRCD_INFO );
         irc_reply( irc,   4, "%s %s %s %s", irc->myhost, BITLBEE_VERSION, UMODES UMODES_PRIV, CMODES );
-        irc_reply( irc,   5, "PREFIX=(ov)@+ CHANTYPES=#& CHANMODES=,,,%s NICKLEN=%d NETWORK=BitlBee CASEMAPPING=rfc1459 MAXTARGETS=1 WATCH=128 :are supported by this server", CMODES, MAX_NICK_LENGTH - 1 );
+        irc_reply( irc,   5, "PREFIX=(ov)@+ CHANTYPES=%s CHANMODES=,,,%s NICKLEN=%d NETWORK=BitlBee "
+                             "CASEMAPPING=rfc1459 MAXTARGETS=1 WATCH=128 :are supported by this server",
+                             CTYPES, CMODES, MAX_NICK_LENGTH - 1 );
         irc_motd( irc );
         irc->umode[0] = '\0';
@@ -1022 +1024 @@
         user_t *u = NULL;
         
-        if( *nick == '#' || *nick == '&' )
+        if( strchr( CTYPES, *nick ) )
         {
                 if( !( c = irc_chat_by_channel( irc, nick ) ) )