ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/trunk/src/channel.c
(Generate patch)

Comparing ircd-hybrid/trunk/src/channel.c (file contents):
Revision 3932 by michael, Sun Jun 8 13:10:20 2014 UTC vs.
Revision 3933 by michael, Mon Jun 9 17:56:42 2014 UTC

# Line 487 | Line 487 | add_invite(struct Channel *chptr, struct
487     * Delete last link in chain if the list is max length
488     */
489    if (dlink_list_length(&who->localClient->invited) >=
490 <      ConfigChannel.max_chans_per_user)
490 >      ConfigChannel.max_channels)
491      del_invite(who->localClient->invited.tail->data, who);
492  
493    /* Add client to channel invite list */
# Line 955 | Line 955 | channel_do_join(struct Client *source_p,
955    char *chan = NULL;
956    struct Channel *chptr = NULL;
957    struct MaskItem *conf = NULL;
958 +  const struct ClassItem *class = get_class_ptr(&source_p->localClient->confs);
959    int i = 0;
960    unsigned int flags = 0;
961  
# Line 994 | Line 995 | channel_do_join(struct Client *source_p,
995      }
996  
997      if (dlink_list_length(&source_p->channel) >=
998 <        (HasUMode(source_p, UMODE_OPER) ?
998 <         ConfigChannel.max_chans_per_oper :
999 <         ConfigChannel.max_chans_per_user))
998 >        ((class->max_channels) ? class->max_channels : ConfigChannel.max_channels))
999      {
1000        sendto_one_numeric(source_p, &me, ERR_TOOMANYCHANNELS, chan);
1001        break;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines