char* ModeParser::Grant(userrec *d,chanrec *chan,int MASK)
{
- for (unsigned int i = 0; i < d->chans.size(); i++)
+ if (!chan)
+ return NULL;
+
+ for (std::vector<ucrec*>::const_iterator i = d->chans.begin(); i != d->chans.end(); i++)
{
- if ((d->chans[i].channel != NULL) && (chan != NULL))
- if (d->chans[i].channel == chan)
+ if (((ucrec*)(*i))->channel == chan)
{
- if (d->chans[i].uc_modes & MASK)
+ if (((ucrec*)(*i))->uc_modes & MASK)
{
return NULL;
}
- d->chans[i].uc_modes = d->chans[i].uc_modes | MASK;
+ ((ucrec*)(*i))->uc_modes = ((ucrec*)(*i))->uc_modes | MASK;
switch (MASK)
{
case UCMODE_OP:
- d->chans[i].channel->AddOppedUser((char*)d);
+ ((ucrec*)(*i))->channel->AddOppedUser(d);
break;
case UCMODE_HOP:
- d->chans[i].channel->AddHalfoppedUser((char*)d);
+ ((ucrec*)(*i))->channel->AddHalfoppedUser(d);
break;
case UCMODE_VOICE:
- d->chans[i].channel->AddVoicedUser((char*)d);
+ ((ucrec*)(*i))->channel->AddVoicedUser(d);
break;
}
- log(DEBUG,"grant: %s %s",d->chans[i].channel->name,d->nick);
+ log(DEBUG,"grant: %s %s",((ucrec*)(*i))->channel->name,d->nick);
return d->nick;
}
}
char* ModeParser::Revoke(userrec *d,chanrec *chan,int MASK)
{
- for (unsigned int i = 0; i < d->chans.size(); i++)
+ if (!chan)
+ return NULL;
+
+ for (std::vector<ucrec*>::const_iterator i = d->chans.begin(); i != d->chans.end(); i++)
{
- if ((d->chans[i].channel != NULL) && (chan != NULL))
- if (d->chans[i].channel == chan)
+ if (((ucrec*)(*i))->channel == chan)
{
- if ((d->chans[i].uc_modes & MASK) == 0)
+ if ((((ucrec*)(*i))->uc_modes & MASK) == 0)
{
return NULL;
}
- d->chans[i].uc_modes ^= MASK;
+ ((ucrec*)(*i))->uc_modes ^= MASK;
switch (MASK)
{
case UCMODE_OP:
- d->chans[i].channel->DelOppedUser((char*)d);
+ ((ucrec*)(*i))->channel->DelOppedUser(d);
break;
case UCMODE_HOP:
- d->chans[i].channel->DelHalfoppedUser((char*)d);
+ ((ucrec*)(*i))->channel->DelHalfoppedUser(d);
break;
case UCMODE_VOICE:
- d->chans[i].channel->DelVoicedUser((char*)d);
+ ((ucrec*)(*i))->channel->DelVoicedUser(d);
break;
}
- log(DEBUG,"revoke: %s %s",d->chans[i].channel->name,d->nick);
+ log(DEBUG,"revoke: %s %s",((ucrec*)(*i))->channel->name,d->nick);
return d->nick;
}
}
return NULL;
}
-// tidies up redundant modes, e.g. +nt-nt+i becomes +-+i,
-// a section further down the chain tidies up the +-+- crap.
+
+/** ModeParser::CompressModes()
+ * Tidies up redundant modes,
+ * e.g. +nt-nt+i becomes +-+i
+ * A section further down the chain tidies up the +-+- crap.
+ */
std::string ModeParser::CompressModes(std::string modes,bool channelmodes)
{
- int counts[127];
+ /*
+ * OK, iterate over the mode string and count how many times a certain mode appears in it.
+ * Then, erase all instances of any character that appears more than once.
+ * This only operates on modes with no parameters, you can still +v-v+v-v+v-v to your heart's content.
+ */
+
+ /* Do we really need an int here? Can you fit enough modes in a line to overflow a short? */
+ short counts[127];
bool active[127];
- memset(counts,0,sizeof(counts));
- memset(active,0,sizeof(active));
- for (unsigned int i = 0; i < modes.length(); i++)
+ memset(counts, 0, sizeof(counts));
+ memset(active, 0, sizeof(active));
+
+ for(unsigned char* i = (unsigned char*)modes.c_str(); *i; i++)
{
- if ((modes[i] == '+') || (modes[i] == '-'))
+ if((*i == '+') || (*i == '-'))
continue;
- if (channelmodes)
- {
- if ((strchr("itnmsp",modes[i])) || ((ModeDefined(modes[i],MT_CHANNEL)) && (ModeDefinedOn(modes[i],MT_CHANNEL)==0) && (ModeDefinedOff(modes[i],MT_CHANNEL)==0)))
- {
- log(DEBUG,"Tidy mode %c",modes[i]);
- counts[(unsigned int)modes[i]]++;
- active[(unsigned int)modes[i]] = true;
- }
- }
- else
+
+ if(!channelmodes || (channelmodes && (strchr("itnmsp", *i) || (ModeDefined(*i, MT_CHANNEL) && !ModeDefinedOn(*i,MT_CHANNEL) && !ModeDefinedOff(*i,MT_CHANNEL)))))
{
- log(DEBUG,"Tidy mode %c",modes[i]);
- counts[(unsigned int)modes[i]]++;
- active[(unsigned int)modes[i]] = true;
+ log(DEBUG,"Tidy mode %c", *i);
+ counts[*i]++;
+ active[*i] = true;
}
}
- for (int j = 65; j < 127; j++)
+
+ for(unsigned char j = 65; j < 127; j++)
{
if ((counts[j] > 1) && (active[j] == true))
{
- static char v[2];
- v[0] = (unsigned char)j;
- v[1] = '\0';
- std::string mode_str = v;
- std::string::size_type pos = modes.find(mode_str);
- if (pos != std::string::npos)
+ std::string::size_type pos;
+
+ while((pos = modes.find(j)) != std::string::npos)
{
- log(DEBUG,"all occurances of mode %c to be deleted...",(unsigned char)j);
- while (modes.find(mode_str) != std::string::npos)
- modes.erase(modes.find(mode_str),1);
- log(DEBUG,"New mode line: %s",modes.c_str());
+ log(DEBUG, "Deleting occurence of mode %c...", j);
+ modes.erase(pos, 1);
+ log(DEBUG,"New mode line: %s", modes.c_str());
}
}
}
+
return modes;
}
break;
previously_set_k = true;
- if (!*chan->key)
+ if (!chan->modes[CM_KEY])
{
MOD_RESULT = 0;
FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'k', parameters[param], true, 1));
strlcpy(key,parameters[param++],32);
outpars[pc++] = key;
strlcpy(chan->key,key,MAXBUF);
+ chan->modes[CM_KEY] = 1;
k_set = true;
}
else param++;
{
*outl++ = 'k';
*chan->key = 0;
+ chan->modes[CM_KEY] = 0;
outpars[pc++] = key;
}
}
FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'l', "", false, 0));
if (!MOD_RESULT)
{
- if (chan->limit)
+ if (chan->modes[CM_LIMIT])
{
*outl++ = 'l';
chan->limit = 0;
+ chan->modes[CM_LIMIT] = 0;
}
}
}
if (chan->limit)
{
*outl++ = 'l';
+ chan->modes[CM_LIMIT] = 1;
outpars[pc++] = parameters[param++];
l_set = true;
}
{
if (mdir)
{
- if (!(chan->binarymodes & CM_INVITEONLY)) *outl++ = 'i';
- chan->binarymodes |= CM_INVITEONLY;
+ if (!(chan->modes[CM_INVITEONLY])) *outl++ = 'i';
+ chan->modes[CM_INVITEONLY] = 1;
}
else
{
- if (chan->binarymodes & CM_INVITEONLY) *outl++ = 'i';
- chan->binarymodes &= ~CM_INVITEONLY;
+ if (chan->modes[CM_INVITEONLY]) *outl++ = 'i';
+ chan->modes[CM_INVITEONLY] = 0;
}
}
break;
{
if (mdir)
{
- if (!(chan->binarymodes & CM_TOPICLOCK)) *outl++ = 't';
- chan->binarymodes |= CM_TOPICLOCK;
+ if (!(chan->modes[CM_TOPICLOCK])) *outl++ = 't';
+ chan->modes[CM_TOPICLOCK] = 1;
}
else
{
- if (chan->binarymodes & CM_TOPICLOCK) *outl++ = 't';
- chan->binarymodes &= ~CM_TOPICLOCK;
+ if (chan->modes[CM_TOPICLOCK]) *outl++ = 't';
+ chan->modes[CM_TOPICLOCK] = 0;
}
}
break;
{
if (mdir)
{
- if (!(chan->binarymodes & CM_NOEXTERNAL)) *outl++ = 'n';
- chan->binarymodes |= CM_NOEXTERNAL;
+ if (!(chan->modes[CM_NOEXTERNAL])) *outl++ = 'n';
+ chan->modes[CM_NOEXTERNAL] = 1;
}
else
{
- if (chan->binarymodes & CM_NOEXTERNAL) *outl++ = 'n';
- chan->binarymodes &= ~CM_NOEXTERNAL;
+ if (chan->modes[CM_NOEXTERNAL]) *outl++ = 'n';
+ chan->modes[CM_NOEXTERNAL] = 0;
}
}
break;
{
if (mdir)
{
- if (!(chan->binarymodes & CM_MODERATED)) *outl++ = 'm';
- chan->binarymodes |= CM_MODERATED;
+ if (!(chan->modes[CM_MODERATED])) *outl++ = 'm';
+ chan->modes[CM_MODERATED] = 1;
}
else
{
- if (chan->binarymodes & CM_MODERATED) *outl++ = 'm';
- chan->binarymodes &= ~CM_MODERATED;
+ if (chan->modes[CM_MODERATED]) *outl++ = 'm';
+ chan->modes[CM_MODERATED] = 0;
}
}
break;
{
if (mdir)
{
- if (!(chan->binarymodes & CM_SECRET)) *outl++ = 's';
- chan->binarymodes |= CM_SECRET;
- if (chan->binarymodes & CM_PRIVATE)
+ if (!(chan->modes[CM_SECRET])) *outl++ = 's';
+ chan->modes[CM_SECRET] = 1;
+ if (chan->modes[CM_PRIVATE])
{
- chan->binarymodes &= ~CM_PRIVATE;
+ chan->modes[CM_PRIVATE] = 0;
if (mdir)
{
*outl++ = '-'; *outl++ = 'p'; *outl++ = '+';
}
else
{
- if (chan->binarymodes & CM_SECRET) *outl++ = 's';
- chan->binarymodes &= ~CM_SECRET;
+ if (chan->modes[CM_SECRET]) *outl++ = 's';
+ chan->modes[CM_SECRET] = 0;
}
}
break;
case 'p':
- MOD_RESULT = 0;
- FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'p', "", mdir, 0));
- if (!MOD_RESULT)
- {
- if (mdir)
- {
- if (!(chan->binarymodes & CM_PRIVATE)) *outl++ = 'p';
- chan->binarymodes |= CM_PRIVATE;
- if (chan->binarymodes & CM_SECRET)
- {
- chan->binarymodes &= ~CM_SECRET;
- if (mdir)
- {
- *outl++ = '-'; *outl++ = 's'; *outl++ = '+';
- }
- }
- }
- else
- {
- if (chan->binarymodes & CM_PRIVATE) *outl++ = 'p';
- chan->binarymodes &= ~CM_PRIVATE;
- }
+ MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'p', "", mdir, 0));
+ if(!MOD_RESULT)
+ {
+ if(mdir)
+ {
+ if(!(chan->modes[CM_PRIVATE]))
+ *outl++ = 'p';
+
+ chan->modes[CM_PRIVATE] = 1;
+
+ if(chan->modes[CM_SECRET])
+ {
+ chan->modes[CM_SECRET] = 0;
+
+ *outl++ = '-';
+ *outl++ = 's';
+ *outl++ = '+';
+ }
+ }
+ else
+ {
+ if(chan->modes[CM_PRIVATE])
+ *outl++ = 'p';
+
+ chan->modes[CM_PRIVATE] = 0;
+ }
}
- break;
+ break;
default:
string_list p;
p.clear();
- bool x = chan->custom_modes[*modechar-65];
+ bool x = chan->modes[*modechar-65];
if ((!x && !mdir) || (x && mdir))
{
if (!ModeIsListMode(*modechar,MT_CHANNEL))
/* A module has claimed this mode */
if (param<pcnt)
{
- if ((ModeDefinedOn(*modechar,MT_CHANNEL)>0) && (mdir))
+ if ((ModeDefinedOn(*modechar,MT_CHANNEL)>0) && (mdir))
{
p.push_back(parameters[param]);
}
// Using OnRawMode on another modules mode's behavour
// will confuse the crap out of admins! just because you CAN
// do it, doesnt mean you SHOULD!
- MOD_RESULT = 0;
+ MOD_RESULT = 0;
std::string para = "";
if (p.size())
para = p[0];
- FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, *modechar, para, mdir, pcnt));
- if (!MOD_RESULT)
- {
- for (int i = 0; i <= MODCOUNT; i++)
+
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, *modechar, para, mdir, pcnt));
+ if(!MOD_RESULT)
+ {
+ for (int i = 0; i <= MODCOUNT; i++)
{
if (!handled)
{
void cmd_mode::Handle (char **parameters, int pcnt, userrec *user)
{
- chanrec* Ptr;
+ chanrec* chan;
userrec* dest = Find(parameters[0]);
+ int MOD_RESULT;
int can_change;
int direction = 1;
char outpars[MAXBUF];
{
charlcat(dmodes,*i,53);
charlcat(outpars,*i,MAXMODES);
- if (*i == 'o')
+ switch (*i)
{
- FOREACH_MOD(I_OnGlobalOper,OnGlobalOper(dest));
+ case 'o':
+ FOREACH_MOD(I_OnGlobalOper,OnGlobalOper(dest));
+ break;
+ case 'i':
+ dest->modebits |= UM_INVISIBLE;
+ break;
+ case 's':
+ dest->modebits |= UM_SERVERNOTICE;
+ break;
+ case 'w':
+ dest->modebits |= UM_WALLOPS;
+ break;
+ default:
+ break;
}
}
}
{
charlcat(outpars,*i,MAXMODES);
charremove(dmodes,*i);
- if (*i == 'o')
+ switch (*i)
{
- *dest->oper = 0;
- DeleteOper(dest);
+ case 'o':
+ *dest->oper = 0;
+ DeleteOper(dest);
+ break;
+ case 'i':
+ dest->modebits &= ~UM_INVISIBLE;
+ break;
+ case 's':
+ dest->modebits &= ~UM_SERVERNOTICE;
+ break;
+ case 'w':
+ dest->modebits &= ~UM_WALLOPS;
+ break;
+ default:
+ break;
}
}
}
}
else
{
- Ptr = FindChan(parameters[0]);
- if (Ptr)
+ chan = FindChan(parameters[0]);
+ if(chan)
{
if (pcnt == 1)
{
/* just /modes #channel */
- WriteServ(user->fd,"324 %s %s +%s",user->nick, Ptr->name, chanmodes(Ptr,has_channel(user,Ptr)));
- WriteServ(user->fd,"329 %s %s %d", user->nick, Ptr->name, Ptr->created);
+ WriteServ(user->fd,"324 %s %s +%s",user->nick, chan->name, chanmodes(chan, chan->HasUser(user)));
+ WriteServ(user->fd,"329 %s %s %d", user->nick, chan->name, chan->created);
return;
}
else if (pcnt == 2)
{
char* mode = parameters[1];
+
+ MOD_RESULT = 0;
+
if (*mode == '+')
mode++;
- int MOD_RESULT = 0;
- FOREACH_RESULT(I_OnRawMode,OnRawMode(user, Ptr, *mode, "", false, 0));
- if (!MOD_RESULT)
- {
+
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, *mode, "", false, 0));
+ if(!MOD_RESULT)
+ {
if (*mode == 'b')
{
- for (BanList::iterator i = Ptr->bans.begin(); i != Ptr->bans.end(); i++)
+ for (BanList::iterator i = chan->bans.begin(); i != chan->bans.end(); i++)
{
- WriteServ(user->fd,"367 %s %s %s %s %d",user->nick, Ptr->name, i->data, i->set_by, i->set_time);
+ WriteServ(user->fd,"367 %s %s %s %s %d",user->nick, chan->name, i->data, i->set_by, i->set_time);
}
- WriteServ(user->fd,"368 %s %s :End of channel ban list",user->nick, Ptr->name);
+ WriteServ(user->fd,"368 %s %s :End of channel ban list",user->nick, chan->name);
return;
}
+
if ((ModeDefined(*mode,MT_CHANNEL)) && (ModeIsListMode(*mode,MT_CHANNEL)))
{
// list of items for an extmode
log(DEBUG,"Calling OnSendList for all modules, list output for mode %c",*mode);
- FOREACH_MOD(I_OnSendList,OnSendList(user,Ptr,*mode));
+ FOREACH_MOD(I_OnSendList,OnSendList(user,chan,*mode));
return;
}
}
}
- if (((Ptr) && (!has_channel(user,Ptr))) && (!is_uline(user->server)) && (IS_LOCAL(user)))
- {
- WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, Ptr->name);
- return;
- }
-
- if (Ptr)
+ if ((IS_LOCAL(user)) && (!is_uline(user->server)) && (!chan->HasUser(user)))
{
- int MOD_RESULT = 0;
- FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,NULL,Ptr,AC_GENERAL_MODE));
+ WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, chan->name);
+ return;
+ }
+
+ MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user, NULL, chan, AC_GENERAL_MODE));
- if (MOD_RESULT == ACR_DENY)
- return;
- if (MOD_RESULT == ACR_DEFAULT)
+ if(MOD_RESULT == ACR_DENY)
+ return;
+
+ if(MOD_RESULT == ACR_DEFAULT)
+ {
+ if ((IS_LOCAL(user)) && (cstatus(user,chan) < STATUS_HOP))
{
- if ((cstatus(user,Ptr) < STATUS_HOP) && (IS_LOCAL(user)))
- {
- WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, Ptr->name);
- return;
- }
+ WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, chan->name);
+ return;
}
-
- ServerInstance->ModeGrok->ProcessModes(parameters,user,Ptr,cstatus(user,Ptr),pcnt,false,false,false);
}
+
+ ServerInstance->ModeGrok->ProcessModes(parameters,user,chan,cstatus(user,chan),pcnt,false,false,false);
}
else
{
{
charlcat(dmodes,*i,MAXBUF);
charlcat(outpars,*i,53);
+ switch (*i)
+ {
+ case 'i':
+ dest->modebits |= UM_INVISIBLE;
+ break;
+ case 's':
+ dest->modebits |= UM_SERVERNOTICE;
+ break;
+ case 'w':
+ dest->modebits |= UM_WALLOPS;
+ break;
+ default:
+ break;
+ }
}
}
}
{
charlcat(outpars,*i,MAXBUF);
charremove(dmodes,*i);
+ switch (*i)
+ {
+ case 'i':
+ dest->modebits &= ~UM_INVISIBLE;
+ break;
+ case 's':
+ dest->modebits &= ~UM_SERVERNOTICE;
+ break;
+ case 'w':
+ dest->modebits &= ~UM_WALLOPS;
+ break;
+ default:
+ break;
+ }
}
}
}
projects / user / henk / code / inspircd.git / blobdiff