extern time_t TIME;
-char* ModeParser::GiveOps(userrec *user,char *dest,chanrec *chan,int status)
+userrec* ModeParser::SanityChecks(userrec *user,char *dest,chanrec *chan,int status)
{
userrec *d;
-
if ((!user) || (!dest) || (!chan) || (!*dest))
{
- log(DEFAULT,"*** BUG *** GiveOps was given an invalid parameter");
return NULL;
}
d = Find(dest);
if (!d)
{
- log(DEFAULT,"the target nickname given to GiveOps couldnt be found");
WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
return NULL;
}
- else
+ return d;
+}
+
+char* ModeParser::Grant(userrec *d,chanrec *chan,int MASK)
+{
+ if (!chan)
+ return NULL;
+
+ for (std::vector<ucrec*>::const_iterator i = d->chans.begin(); i != d->chans.end(); i++)
{
- if (user->server == d->server)
+ if (((ucrec*)(*i))->channel == chan)
{
- int MOD_RESULT = 0;
- FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_OP));
-
- if (MOD_RESULT == ACR_DENY)
+ if (((ucrec*)(*i))->uc_modes & MASK)
+ {
return NULL;
- if (MOD_RESULT == ACR_DEFAULT)
+ }
+ ((ucrec*)(*i))->uc_modes = ((ucrec*)(*i))->uc_modes | MASK;
+ switch (MASK)
{
- if ((status < STATUS_OP) && (!is_uline(user->server)) && (IS_LOCAL(user)))
- {
- log(DEBUG,"%s cant give ops to %s because they nave status %d and needs %d",user->nick,dest,status,STATUS_OP);
- WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name);
- return NULL;
- }
+ case UCMODE_OP:
+ ((ucrec*)(*i))->channel->AddOppedUser(d);
+ break;
+ case UCMODE_HOP:
+ ((ucrec*)(*i))->channel->AddHalfoppedUser(d);
+ break;
+ case UCMODE_VOICE:
+ ((ucrec*)(*i))->channel->AddVoicedUser(d);
+ break;
}
+ log(DEBUG,"grant: %s %s",((ucrec*)(*i))->channel->name,d->nick);
+ return d->nick;
}
+ }
+ return NULL;
+}
+char* ModeParser::Revoke(userrec *d,chanrec *chan,int MASK)
+{
+ if (!chan)
+ return NULL;
- for (unsigned int i = 0; i < d->chans.size(); i++)
+ for (std::vector<ucrec*>::const_iterator i = d->chans.begin(); i != d->chans.end(); i++)
+ {
+ if (((ucrec*)(*i))->channel == chan)
{
- if ((d->chans[i].channel != NULL) && (chan != NULL))
- if (!strcasecmp(d->chans[i].channel->name,chan->name))
+ if ((((ucrec*)(*i))->uc_modes & MASK) == 0)
{
- if (d->chans[i].uc_modes & UCMODE_OP)
- {
- /* mode already set on user, dont allow multiple */
- return NULL;
- }
- d->chans[i].uc_modes = d->chans[i].uc_modes | UCMODE_OP;
- d->chans[i].channel->AddOppedUser((char*)d);
- log(DEBUG,"gave ops: %s %s",d->chans[i].channel->name,d->nick);
- return d->nick;
+ return NULL;
+ }
+ ((ucrec*)(*i))->uc_modes ^= MASK;
+ switch (MASK)
+ {
+ case UCMODE_OP:
+ ((ucrec*)(*i))->channel->DelOppedUser(d);
+ break;
+ case UCMODE_HOP:
+ ((ucrec*)(*i))->channel->DelHalfoppedUser(d);
+ break;
+ case UCMODE_VOICE:
+ ((ucrec*)(*i))->channel->DelVoicedUser(d);
+ break;
}
+ log(DEBUG,"revoke: %s %s",((ucrec*)(*i))->channel->name,d->nick);
+ return d->nick;
}
- log(DEFAULT,"The target channel given to GiveOps was not in the users mode list");
}
return NULL;
}
-char* ModeParser::GiveHops(userrec *user,char *dest,chanrec *chan,int status)
+char* ModeParser::GiveOps(userrec *user,char *dest,chanrec *chan,int status)
{
- userrec *d;
+ userrec *d = this->SanityChecks(user,dest,chan,status);
- if ((!user) || (!dest) || (!chan) || (!*dest))
- {
- log(DEFAULT,"*** BUG *** GiveHops was given an invalid parameter");
- return NULL;
- }
-
- d = Find(dest);
- if (!d)
+ if (d)
{
- WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
- return NULL;
- }
- else
- {
- if (user->server == d->server)
+ if (IS_LOCAL(user))
{
int MOD_RESULT = 0;
- FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_HALFOP));
-
+ FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_OP));
+
if (MOD_RESULT == ACR_DENY)
return NULL;
if (MOD_RESULT == ACR_DEFAULT)
{
- if ((status < STATUS_OP) && (!is_uline(user->server)) && (IS_LOCAL(user)))
+ if ((status < STATUS_OP) && (!is_uline(user->server)))
{
WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name);
return NULL;
}
}
- for (unsigned int i = 0; i < d->chans.size(); i++)
+ return this->Grant(d,chan,UCMODE_OP);
+ }
+ return NULL;
+}
+
+char* ModeParser::GiveHops(userrec *user,char *dest,chanrec *chan,int status)
+{
+ userrec *d = this->SanityChecks(user,dest,chan,status);
+
+ if (d)
+ {
+ if (IS_LOCAL(user))
{
- if ((d->chans[i].channel != NULL) && (chan != NULL))
- if (!strcasecmp(d->chans[i].channel->name,chan->name))
+ int MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_HALFOP));
+
+ if (MOD_RESULT == ACR_DENY)
+ return NULL;
+ if (MOD_RESULT == ACR_DEFAULT)
{
- if (d->chans[i].uc_modes & UCMODE_HOP)
+ if ((status < STATUS_OP) && (!is_uline(user->server)))
{
- /* mode already set on user, dont allow multiple */
+ WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name);
return NULL;
}
- d->chans[i].uc_modes = d->chans[i].uc_modes | UCMODE_HOP;
- d->chans[i].channel->AddHalfoppedUser((char*)d);
- log(DEBUG,"gave h-ops: %s %s",d->chans[i].channel->name,d->nick);
- return d->nick;
}
}
+
+ return this->Grant(d,chan,UCMODE_HOP);
}
return NULL;
}
char* ModeParser::GiveVoice(userrec *user,char *dest,chanrec *chan,int status)
{
- userrec *d;
+ userrec *d = this->SanityChecks(user,dest,chan,status);
- if ((!user) || (!dest) || (!chan) || (!*dest))
- {
- log(DEFAULT,"*** BUG *** GiveVoice was given an invalid parameter");
- return NULL;
- }
-
- d = Find(dest);
- if (!d)
- {
- WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
- return NULL;
- }
- else
+ if (d)
{
- if (user->server == d->server)
+ if (IS_LOCAL(user))
{
int MOD_RESULT = 0;
FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_VOICE));
return NULL;
if (MOD_RESULT == ACR_DEFAULT)
{
- if ((status < STATUS_HOP) && (!is_uline(user->server)) && (IS_LOCAL(user)))
+ if ((status < STATUS_HOP) && (!is_uline(user->server)))
{
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 NULL;
}
}
- for (unsigned int i = 0; i < d->chans.size(); i++)
- {
- if ((d->chans[i].channel != NULL) && (chan != NULL))
- if (!strcasecmp(d->chans[i].channel->name,chan->name))
- {
- if (d->chans[i].uc_modes & UCMODE_VOICE)
- {
- /* mode already set on user, dont allow multiple */
- return NULL;
- }
- d->chans[i].uc_modes = d->chans[i].uc_modes | UCMODE_VOICE;
- d->chans[i].channel->AddVoicedUser((char*)d);
- log(DEBUG,"gave voice: %s %s",d->chans[i].channel->name,d->nick);
- return d->nick;
- }
- }
+ return this->Grant(d,chan,UCMODE_VOICE);
}
return NULL;
}
char* ModeParser::TakeOps(userrec *user,char *dest,chanrec *chan,int status)
{
- userrec *d;
+ userrec *d = this->SanityChecks(user,dest,chan,status);
- if ((!user) || (!dest) || (!chan) || (!*dest))
+ if (d)
{
- log(DEFAULT,"*** BUG *** TakeOps was given an invalid parameter");
- return NULL;
- }
-
- d = Find(dest);
- if (!d)
- {
- log(DEBUG,"TakeOps couldnt resolve the target nickname: %s",dest);
- WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
- return NULL;
- }
- else
- {
- if (user->server == d->server)
+ if (IS_LOCAL(user))
{
int MOD_RESULT = 0;
FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEOP));
return NULL;
if (MOD_RESULT == ACR_DEFAULT)
{
- if ((status < STATUS_OP) && (!is_uline(user->server)) && (IS_LOCAL(user)) && (IS_LOCAL(user)))
+ if ((status < STATUS_OP) && (!is_uline(user->server)) && (IS_LOCAL(user)))
{
WriteServ(user->fd,"482 %s %s :You are not a channel operator",user->nick, chan->name);
return NULL;
}
}
- for (unsigned int i = 0; i < d->chans.size(); i++)
- {
- if ((d->chans[i].channel != NULL) && (chan != NULL))
- if (!strcasecmp(d->chans[i].channel->name,chan->name))
- {
- if ((d->chans[i].uc_modes & UCMODE_OP) == 0)
- {
- /* mode already set on user, dont allow multiple */
- return NULL;
- }
- d->chans[i].uc_modes ^= UCMODE_OP;
- d->chans[i].channel->DelOppedUser((char*)d);
- log(DEBUG,"took ops: %s %s",d->chans[i].channel->name,d->nick);
- return d->nick;
- }
- }
- log(DEBUG,"TakeOps couldnt locate the target channel in the target users list");
+ return this->Revoke(d,chan,UCMODE_OP);
}
return NULL;
}
char* ModeParser::TakeHops(userrec *user,char *dest,chanrec *chan,int status)
{
- userrec *d;
+ userrec *d = this->SanityChecks(user,dest,chan,status);
- if ((!user) || (!dest) || (!chan) || (!*dest))
- {
- log(DEFAULT,"*** BUG *** TakeHops was given an invalid parameter");
- return NULL;
- }
-
- d = Find(dest);
- if (!d)
- {
- WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
- return NULL;
- }
- else
+ if (d)
{
- if (user->server == d->server)
+ if (IS_LOCAL(user))
{
int MOD_RESULT = 0;
FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEHALFOP));
if (MOD_RESULT == ACR_DEFAULT)
{
/* Tweak by Brain suggested by w00t, allow a halfop to dehalfop themselves */
- if ((user != d) && ((status < STATUS_OP) && (!is_uline(user->server))) && (IS_LOCAL(user)))
+ if ((user != d) && ((status < STATUS_OP) && (!is_uline(user->server))))
{
WriteServ(user->fd,"482 %s %s :You are not a channel operator",user->nick, chan->name);
return NULL;
}
}
- for (unsigned int i = 0; i < d->chans.size(); i++)
- {
- if ((d->chans[i].channel != NULL) && (chan != NULL))
- if (!strcasecmp(d->chans[i].channel->name,chan->name))
- {
- if ((d->chans[i].uc_modes & UCMODE_HOP) == 0)
- {
- /* mode already set on user, dont allow multiple */
- return NULL;
- }
- d->chans[i].uc_modes ^= UCMODE_HOP;
- d->chans[i].channel->DelHalfoppedUser((char*)d);
- log(DEBUG,"took h-ops: %s %s",d->chans[i].channel->name,d->nick);
- return d->nick;
- }
- }
+ return this->Revoke(d,chan,UCMODE_HOP);
}
return NULL;
}
char* ModeParser::TakeVoice(userrec *user,char *dest,chanrec *chan,int status)
{
- userrec *d;
-
- if ((!user) || (!dest) || (!chan) || (!*dest))
- {
- log(DEFAULT,"*** BUG *** TakeVoice was given an invalid parameter");
- return NULL;
- }
+ userrec *d = this->SanityChecks(user,dest,chan,status);
- d = Find(dest);
- if (!d)
- {
- WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
- return NULL;
- }
- else
+ if (d)
{
- if (user->server == d->server)
+ if (IS_LOCAL(user))
{
int MOD_RESULT = 0;
FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEVOICE));
return NULL;
if (MOD_RESULT == ACR_DEFAULT)
{
- if ((status < STATUS_HOP) && (!is_uline(user->server)) && (IS_LOCAL(user)))
+ if ((status < STATUS_HOP) && (!is_uline(user->server)))
{
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 NULL;
}
}
- for (unsigned int i = 0; i < d->chans.size(); i++)
- {
- if ((d->chans[i].channel != NULL) && (chan != NULL))
- if (!strcasecmp(d->chans[i].channel->name,chan->name))
- {
- if ((d->chans[i].uc_modes & UCMODE_VOICE) == 0)
- {
- /* mode already set on user, dont allow multiple */
- return NULL;
- }
- d->chans[i].uc_modes ^= UCMODE_VOICE;
- d->chans[i].channel->DelVoicedUser((char*)d);
- log(DEBUG,"took voice: %s %s",d->chans[i].channel->name,d->nick);
- return d->nick;
- }
- }
+ return this->Revoke(d,chan,UCMODE_VOICE);
}
return NULL;
}
strlcpy(b.data,dest,MAXBUF);
if (*user->nick)
{
- strlcpy(b.set_by,user->nick,NICKMAX);
+ strlcpy(b.set_by,user->nick,NICKMAX-1);
}
else
{
- strlcpy(b.set_by,Srv->GetServerName().c_str(),NICKMAX);
+ strlcpy(b.set_by,Config->ServerName,NICKMAX-1);
}
chan->bans.push_back(b);
return dest;
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;
}
void ModeParser::ProcessModes(char **parameters,userrec* user,chanrec *chan,int status, int pcnt, bool servermode, bool silent, bool local)
{
- if (!parameters) {
- log(DEFAULT,"*** BUG *** process_modes was given an invalid parameter");
+ if ((!parameters) || (pcnt < 2)) {
return;
}
- char modelist[MAXBUF];
char outlist[MAXBUF];
- char outstr[MAXBUF];
- char outpars[32][MAXBUF];
+ char mlist[MAXBUF];
+ char *outpars[32];
int param = 2;
int pc = 0;
int ptr = 0;
char* r = NULL;
bool k_set = false, l_set = false, previously_set_l = false, previously_unset_l = false, previously_set_k = false, previously_unset_k = false;
- if (pcnt < 2)
- {
- return;
- }
-
int MOD_RESULT = 0;
if (IS_LOCAL(user))
return;
}
- log(DEBUG,"process_modes: start: parameters=%d",pcnt);
+ std::string tidied = this->CompressModes(parameters[1],true);
+ strlcpy(mlist,tidied.c_str(),MAXBUF);
+ char* modelist = mlist;
- strlcpy(modelist,parameters[1],MAXBUF); /* mode list, e.g. +oo-o *
- * parameters[2] onwards are parameters for
- * modes that require them :) */
- *outlist = '+';
- *(outlist+1) = 0;
- mdir = 1;
+ *outlist = *modelist;
+ char* outl = outlist+1;
- log(DEBUG,"process_modes: modelist: %s",modelist);
+ mdir = (*modelist == '+');
- std::string tidied = this->CompressModes(modelist,true);
- strlcpy(modelist,tidied.c_str(),MAXBUF);
+ log(DEBUG,"process_modes: modelist: %s",modelist);
int len = tidied.length();
while (modelist[len-1] == ' ')
modelist[--len] = '\0';
- for (char* modechar = modelist; *modechar; ptr++, modechar++)
+ for (char* modechar = (modelist + 1); *modechar; ptr++, modechar++)
{
r = NULL;
- {
- switch (*modechar)
- {
- case '-':
- if (mdir != 0)
- {
- int t = strlen(outlist)-1;
- if ((outlist[t] == '+') || (outlist[t] == '-'))
- {
- outlist[t] = '-';
- }
- else
- {
- strcat(outlist,"-");
- }
- }
- mdir = 0;
-
- break;
+ /* If we have more than MAXMODES changes in one line,
+ * drop all after the MAXMODES
+ */
+ if (pc > MAXMODES-1)
+ break;
- case '+':
- if (mdir != 1)
- {
- int t = strlen(outlist)-1;
- if ((outlist[t] == '+') || (outlist[t] == '-'))
- {
- outlist[t] = '+';
- }
- else
- {
- strcat(outlist,"+");
- }
- }
- mdir = 1;
- break;
- case 'o':
- log(DEBUG,"Ops");
- if ((param >= pcnt)) break;
- log(DEBUG,"Enough parameters left");
- if (mdir == 1)
- {
- MOD_RESULT = 0;
- FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'o', parameters[param], true, 1));
- if (!MOD_RESULT)
- {
- log(DEBUG,"calling GiveOps");
- r = GiveOps(user,parameters[param++],chan,status);
- }
- else param++;
- }
- else
+
+ switch (*modechar)
+ {
+ case '-':
+ *outl++ = '-';
+ mdir = 0;
+ break;
+
+ case '+':
+ *outl++ = '+';
+ mdir = 1;
+ break;
+
+ case 'o':
+ log(DEBUG,"Ops");
+ if ((param >= pcnt)) break;
+ log(DEBUG,"Enough parameters left");
+ r = NULL;
+ if (mdir == 1)
+ {
+ MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'o', parameters[param], true, 1));
+ if (!MOD_RESULT)
{
- MOD_RESULT = 0;
- FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'o', parameters[param], false, 1));
- if (!MOD_RESULT)
- {
- log(DEBUG,"calling TakeOps");
- r = TakeOps(user,parameters[param++],chan,status);
- }
- else param++;
+ r = GiveOps(user,parameters[param++],chan,status);
}
- if (r)
- {
- strlcat(outlist,"o",MAXBUF);
- strlcpy(outpars[pc++],r,MAXBUF);
+ else param++;
+ }
+ else
+ {
+ MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'o', parameters[param], false, 1));
+ if (!MOD_RESULT)
+ {
+ r = TakeOps(user,parameters[param++],chan,status);
}
- break;
+ else param++;
+ }
+ if (r)
+ {
+ *outl++ = 'o';
+ outpars[pc++] = r;
+ }
+ break;
- case 'h':
- if (((param >= pcnt)) || (!Config->AllowHalfop)) break;
- if (mdir == 1)
- {
- MOD_RESULT = 0;
- FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'h', parameters[param], true, 1));
- if (!MOD_RESULT)
- {
- r = GiveHops(user,parameters[param++],chan,status);
- }
- else param++;
- }
- else
- {
- MOD_RESULT = 0;
- FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'h', parameters[param], false, 1));
- if (!MOD_RESULT)
- {
- r = TakeHops(user,parameters[param++],chan,status);
- }
- else param++;
+ case 'h':
+ if (((param >= pcnt)) || (!Config->AllowHalfop)) break;
+ r = NULL;
+ if (mdir == 1)
+ {
+ MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'h', parameters[param], true, 1));
+ if (!MOD_RESULT)
+ {
+ r = GiveHops(user,parameters[param++],chan,status);
}
- if (r)
- {
- strlcat(outlist,"h",MAXBUF);
- strlcpy(outpars[pc++],r,MAXBUF);
+ else param++;
+ }
+ else
+ {
+ MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'h', parameters[param], false, 1));
+ if (!MOD_RESULT)
+ {
+ r = TakeHops(user,parameters[param++],chan,status);
}
- break;
+ else param++;
+ }
+ if (r)
+ {
+ *outl++ = 'h';
+ outpars[pc++] = r;
+ }
+ break;
- case 'v':
+ case 'v':
if ((param >= pcnt)) break;
+ r = NULL;
if (mdir == 1)
{
MOD_RESULT = 0;
}
if (r)
{
- strlcat(outlist,"v",MAXBUF);
- strlcpy(outpars[pc++],r,MAXBUF);
+ *outl++ = 'v';
+ outpars[pc++] = r;
}
- break;
+ break;
- case 'b':
- if ((param >= pcnt)) break;
- if (mdir == 1)
- {
- MOD_RESULT = 0;
- FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'b', parameters[param], true, 1));
- if (!MOD_RESULT)
- {
- r = AddBan(user,parameters[param++],chan,status);
- }
- else param++;
- }
- else
- {
- MOD_RESULT = 0;
- FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'b', parameters[param], false, 1));
- if (!MOD_RESULT)
- {
- r = TakeBan(user,parameters[param++],chan,status);
- }
- else param++;
+ case 'b':
+ if ((param >= pcnt)) break;
+ r = NULL;
+ if (mdir == 1)
+ {
+ MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'b', parameters[param], true, 1));
+ if (!MOD_RESULT)
+ {
+ r = AddBan(user,parameters[param++],chan,status);
}
- if (r)
- {
- strlcat(outlist,"b",MAXBUF);
- strlcpy(outpars[pc++],parameters[param-1],MAXBUF);
+ else param++;
+ }
+ else
+ {
+ MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'b', parameters[param], false, 1));
+ if (!MOD_RESULT)
+ {
+ r = TakeBan(user,parameters[param++],chan,status);
}
- break;
+ else param++;
+ }
+ if (r)
+ {
+ *outl++ = 'b';
+ outpars[pc++] = parameters[param-1];
+ }
+ break;
- case 'k':
- if ((param >= pcnt))
- break;
+ case 'k':
+ if ((param >= pcnt))
+ break;
- if (mdir == 1)
- {
- if (k_set)
- break;
+ if (mdir == 1)
+ {
+ if (k_set)
+ break;
- if (previously_unset_k)
- break;
- previously_set_k = true;
+ if (previously_unset_k)
+ break;
+ previously_set_k = true;
- if (!*chan->key)
- {
- MOD_RESULT = 0;
- FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'k', parameters[param], true, 1));
- if (!MOD_RESULT)
- {
- strcat(outlist,"k");
- char key[MAXBUF];
- strlcpy(key,parameters[param++],32);
- strlcpy(outpars[pc++],key,MAXBUF);
- strlcpy(chan->key,key,MAXBUF);
- k_set = true;
- }
- else param++;
- }
- }
- else
+ if (!*chan->key)
{
- /* checks on -k are case sensitive and only accurate to the
- first 32 characters */
- if (previously_set_k)
- break;
- previously_unset_k = true;
-
- char key[MAXBUF];
MOD_RESULT = 0;
- FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'k', parameters[param], false, 1));
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'k', parameters[param], true, 1));
if (!MOD_RESULT)
{
+ *outl++ = 'k';
+ char key[MAXBUF];
strlcpy(key,parameters[param++],32);
- /* only allow -k if correct key given */
- if (!strcmp(chan->key,key))
- {
- strlcat(outlist,"k",MAXBUF);
- strlcpy(chan->key,"",MAXBUF);
- strlcpy(outpars[pc++],key,MAXBUF);
- }
+ outpars[pc++] = key;
+ strlcpy(chan->key,key,MAXBUF);
+ k_set = true;
}
else param++;
}
- break;
-
- case 'l':
- if (mdir == 0)
- {
- if (previously_set_l)
- break;
- previously_unset_l = true;
- MOD_RESULT = 0;
- FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'l', "", false, 0));
- if (!MOD_RESULT)
- {
- if (chan->limit)
- {
- strcat(outlist,"l");
- chan->limit = 0;
- }
- }
- }
-
- if ((param >= pcnt)) break;
- if (mdir == 1)
- {
- if (l_set)
- break;
- if (previously_unset_l)
- break;
- previously_set_l = true;
- bool invalid = false;
- for (char* f = parameters[param]; *f; f++)
- {
- if ((*f < '0') || (*f > '9'))
- {
- invalid = true;
- }
- }
- /* If the limit is < 1, or the new limit is the current limit, dont allow */
- if ((atoi(parameters[param]) < 1) || ((chan->limit > 0) && (atoi(parameters[param]) == chan->limit)))
- {
- invalid = true;
- }
-
- if (invalid)
- break;
+ }
+ else
+ {
+ /* checks on -k are case sensitive and only accurate to the
+ first 32 characters */
+ if (previously_set_k)
+ break;
+ previously_unset_k = true;
- MOD_RESULT = 0;
- FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'l', parameters[param], true, 1));
- if (!MOD_RESULT)
- {
-
- chan->limit = atoi(parameters[param]);
-
- // reported by mech: large values cause underflow
- if (chan->limit < 0)
- chan->limit = 0x7FFF;
- }
-
- if (chan->limit)
+ char key[MAXBUF];
+ MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'k', parameters[param], false, 1));
+ if (!MOD_RESULT)
+ {
+ strlcpy(key,parameters[param++],32);
+ /* only allow -k if correct key given */
+ if (!strcmp(chan->key,key))
{
- strlcat(outlist,"l",MAXBUF);
- strlcpy(outpars[pc++],parameters[param++],MAXBUF);
- l_set = true;
+ *outl++ = 'k';
+ *chan->key = 0;
+ outpars[pc++] = key;
}
}
- break;
+ else param++;
+ }
+ break;
- case 'i':
+ case 'l':
+ if (mdir == 0)
+ {
+ if (previously_set_l)
+ break;
+ previously_unset_l = true;
MOD_RESULT = 0;
- FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'i', "", mdir, 0));
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'l', "", false, 0));
if (!MOD_RESULT)
{
- if (mdir)
+ if (chan->limit)
{
- if (!(chan->binarymodes & CM_INVITEONLY)) strlcat(outlist,"i",MAXBUF);
- chan->binarymodes |= CM_INVITEONLY;
+ *outl++ = 'l';
+ chan->limit = 0;
}
- else
+ }
+ }
+
+ if ((param >= pcnt)) break;
+ if (mdir == 1)
+ {
+ if (l_set)
+ break;
+ if (previously_unset_l)
+ break;
+ previously_set_l = true;
+ bool invalid = false;
+ for (char* f = parameters[param]; *f; f++)
+ {
+ if ((*f < '0') || (*f > '9'))
{
- if (chan->binarymodes & CM_INVITEONLY) strlcat(outlist,"i",MAXBUF);
- chan->binarymodes &= ~CM_INVITEONLY;
+ invalid = true;
}
}
- break;
-
- case 't':
+ /* If the limit is < 1, or the new limit is the current limit, dont allow */
+ if ((atoi(parameters[param]) < 1) || ((chan->limit > 0) && (atoi(parameters[param]) == chan->limit)))
+ {
+ invalid = true;
+ }
+
+ if (invalid)
+ break;
+
MOD_RESULT = 0;
- FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 't', "", mdir, 0));
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'l', parameters[param], true, 1));
if (!MOD_RESULT)
{
- if (mdir)
- {
- if (!(chan->binarymodes & CM_TOPICLOCK)) strlcat(outlist,"t",MAXBUF);
- chan->binarymodes |= CM_TOPICLOCK;
- }
- else
- {
- if (chan->binarymodes & CM_TOPICLOCK) strlcat(outlist,"t",MAXBUF);
- chan->binarymodes &= ~CM_TOPICLOCK;
- }
+
+ chan->limit = atoi(parameters[param]);
+
+ // reported by mech: large values cause underflow
+ if (chan->limit < 0)
+ chan->limit = 0x7FFF;
}
- break;
+
+ if (chan->limit)
+ {
+ *outl++ = 'l';
+ outpars[pc++] = parameters[param++];
+ l_set = true;
+ }
+ }
+ break;
- case 'n':
- MOD_RESULT = 0;
- FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'n', "", mdir, 0));
- if (!MOD_RESULT)
- {
- if (mdir)
- {
- if (!(chan->binarymodes & CM_NOEXTERNAL)) strlcat(outlist,"n",MAXBUF);
- chan->binarymodes |= CM_NOEXTERNAL;
- }
- else
- {
- if (chan->binarymodes & CM_NOEXTERNAL) strlcat(outlist,"n",MAXBUF);
- chan->binarymodes &= ~CM_NOEXTERNAL;
- }
+ case 'i':
+ MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'i', "", mdir, 0));
+ if (!MOD_RESULT)
+ {
+ if (mdir)
+ {
+ if (!(chan->binarymodes & CM_INVITEONLY)) *outl++ = 'i';
+ chan->binarymodes |= CM_INVITEONLY;
}
- break;
+ else
+ {
+ if (chan->binarymodes & CM_INVITEONLY) *outl++ = 'i';
+ chan->binarymodes &= ~CM_INVITEONLY;
+ }
+ }
+ break;
- case 'm':
- MOD_RESULT = 0;
- FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'm', "", mdir, 0));
- if (!MOD_RESULT)
+ case 't':
+ MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 't', "", mdir, 0));
+ if (!MOD_RESULT)
+ {
+ if (mdir)
{
- if (mdir)
- {
- if (!(chan->binarymodes & CM_MODERATED)) strlcat(outlist,"m",MAXBUF);
- chan->binarymodes |= CM_MODERATED;
- }
- else
- {
- if (chan->binarymodes & CM_MODERATED) strlcat(outlist,"m",MAXBUF);
- chan->binarymodes &= ~CM_MODERATED;
- }
- }
- break;
+ if (!(chan->binarymodes & CM_TOPICLOCK)) *outl++ = 't';
+ chan->binarymodes |= CM_TOPICLOCK;
+ }
+ else
+ {
+ if (chan->binarymodes & CM_TOPICLOCK) *outl++ = 't';
+ chan->binarymodes &= ~CM_TOPICLOCK;
+ }
+ }
+ break;
- case 's':
- MOD_RESULT = 0;
- FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 's', "", mdir, 0));
- if (!MOD_RESULT)
+ case 'n':
+ MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'n', "", mdir, 0));
+ if (!MOD_RESULT)
+ {
+ if (mdir)
+ {
+ if (!(chan->binarymodes & CM_NOEXTERNAL)) *outl++ = 'n';
+ chan->binarymodes |= CM_NOEXTERNAL;
+ }
+ else
+ {
+ if (chan->binarymodes & CM_NOEXTERNAL) *outl++ = 'n';
+ chan->binarymodes &= ~CM_NOEXTERNAL;
+ }
+ }
+ break;
+
+ case 'm':
+ MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'm', "", mdir, 0));
+ if (!MOD_RESULT)
+ {
+ if (mdir)
{
- if (mdir)
+ if (!(chan->binarymodes & CM_MODERATED)) *outl++ = 'm';
+ chan->binarymodes |= CM_MODERATED;
+ }
+ else
+ {
+ if (chan->binarymodes & CM_MODERATED) *outl++ = 'm';
+ chan->binarymodes &= ~CM_MODERATED;
+ }
+ }
+ break;
+
+ case 's':
+ MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 's', "", mdir, 0));
+ if (!MOD_RESULT)
+ {
+ if (mdir)
+ {
+ if (!(chan->binarymodes & CM_SECRET)) *outl++ = 's';
+ chan->binarymodes |= CM_SECRET;
+ if (chan->binarymodes & CM_PRIVATE)
{
- if (!(chan->binarymodes & CM_SECRET)) strlcat(outlist,"s",MAXBUF);
- chan->binarymodes |= CM_SECRET;
- if (chan->binarymodes & CM_PRIVATE)
+ chan->binarymodes &= ~CM_PRIVATE;
+ if (mdir)
{
- chan->binarymodes &= ~CM_PRIVATE;
- if (mdir)
- {
- strlcat(outlist,"-p+",MAXBUF);
- }
+ *outl++ = '-'; *outl++ = 'p'; *outl++ = '+';
}
}
- else
- {
- if (chan->binarymodes & CM_SECRET) strlcat(outlist,"s",MAXBUF);
- chan->binarymodes &= ~CM_SECRET;
- }
- }
- break;
+ }
+ else
+ {
+ if (chan->binarymodes & CM_SECRET) *outl++ = 's';
+ chan->binarymodes &= ~CM_SECRET;
+ }
+ }
+ break;
- case 'p':
- MOD_RESULT = 0;
- FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'p', "", mdir, 0));
- if (!MOD_RESULT)
+ case 'p':
+ MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'p', "", mdir, 0));
+ if (!MOD_RESULT)
+ {
+ if (mdir)
{
- if (mdir)
+ if (!(chan->binarymodes & CM_PRIVATE)) *outl++ = 'p';
+ chan->binarymodes |= CM_PRIVATE;
+ if (chan->binarymodes & CM_SECRET)
{
- if (!(chan->binarymodes & CM_PRIVATE)) strlcat(outlist,"p",MAXBUF);
- chan->binarymodes |= CM_PRIVATE;
- if (chan->binarymodes & CM_SECRET)
+ chan->binarymodes &= ~CM_SECRET;
+ if (mdir)
{
- chan->binarymodes &= ~CM_SECRET;
- if (mdir)
- {
- strlcat(outlist,"-s+",MAXBUF);
- }
+ *outl++ = '-'; *outl++ = 's'; *outl++ = '+';
}
}
- else
- {
- if (chan->binarymodes & CM_PRIVATE) strlcat(outlist,"p",MAXBUF);
- chan->binarymodes &= ~CM_PRIVATE;
- }
- }
- break;
+ }
+ else
+ {
+ if (chan->binarymodes & CM_PRIVATE) *outl++ = 'p';
+ chan->binarymodes &= ~CM_PRIVATE;
+ }
+ }
+ break;
- default:
- log(DEBUG,"Preprocessing custom mode %c: modelist: %s",*modechar,chan->custom_modes);
- string_list p;
- p.clear();
- if (((!strchr(chan->custom_modes,*modechar)) && (!mdir)) || ((strchr(chan->custom_modes,*modechar)) && (mdir)))
+ default:
+ string_list p;
+ p.clear();
+ bool x = chan->custom_modes[*modechar-65];
+ if ((!x && !mdir) || (x && mdir))
+ {
+ if (!ModeIsListMode(*modechar,MT_CHANNEL))
+ {
+ log(DEBUG,"Mode %c isnt set on %s but trying to remove!",*modechar,chan->name);
+ break;
+ }
+ }
+ if (ModeDefined(*modechar,MT_CHANNEL))
+ {
+ /* A module has claimed this mode */
+ if (param<pcnt)
{
- if (!ModeIsListMode(*modechar,MT_CHANNEL))
+ if ((ModeDefinedOn(*modechar,MT_CHANNEL)>0) && (mdir))
+ {
+ p.push_back(parameters[param]);
+ }
+ if ((ModeDefinedOff(*modechar,MT_CHANNEL)>0) && (!mdir))
{
- log(DEBUG,"Mode %c isnt set on %s but trying to remove!",*modechar,chan->name);
- break;
+ p.push_back(parameters[param]);
}
}
- if (ModeDefined(*modechar,MT_CHANNEL))
+ bool handled = false;
+ if (param>=pcnt)
{
- log(DEBUG,"A module has claimed this mode");
- if (param<pcnt)
+ // we're supposed to have a parameter, but none was given... so dont handle the mode.
+ if (((ModeDefinedOn(*modechar,MT_CHANNEL)>0) && (mdir)) || ((ModeDefinedOff(*modechar,MT_CHANNEL)>0) && (!mdir)))
{
- if ((ModeDefinedOn(*modechar,MT_CHANNEL)>0) && (mdir))
- {
- p.push_back(parameters[param]);
- }
- if ((ModeDefinedOff(*modechar,MT_CHANNEL)>0) && (!mdir))
- {
- p.push_back(parameters[param]);
- }
- }
- bool handled = false;
- if (param>=pcnt)
- {
- // we're supposed to have a parameter, but none was given... so dont handle the mode.
- if (((ModeDefinedOn(*modechar,MT_CHANNEL)>0) && (mdir)) || ((ModeDefinedOff(*modechar,MT_CHANNEL)>0) && (!mdir)))
- {
- log(DEBUG,"Not enough parameters for module-mode %c",*modechar);
- handled = true;
- param++;
- }
- }
-
- // BIG ASS IDIOTIC CODER WARNING!
- // 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;
- 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++)
+ log(DEBUG,"Not enough parameters for module-mode %c",*modechar);
+ handled = true;
+ param++;
+ }
+ }
+ // BIG ASS IDIOTIC CODER WARNING!
+ // 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;
+ 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++)
+ {
+ if (!handled)
{
- if (!handled)
+ int t = modules[i]->OnExtendedMode(user,chan,*modechar,MT_CHANNEL,mdir,p);
+ if (t != 0)
{
- int t = modules[i]->OnExtendedMode(user,chan,*modechar,MT_CHANNEL,mdir,p);
- if (t != 0)
+ log(DEBUG,"OnExtendedMode returned nonzero for a module");
+ if (ModeIsListMode(*modechar,MT_CHANNEL))
{
- log(DEBUG,"OnExtendedMode returned nonzero for a module");
- char app[] = {*modechar, 0};
- if (ModeIsListMode(*modechar,MT_CHANNEL))
+ if (t == -1)
{
- if (t == -1)
- {
- //pc++;
- param++;
- }
- else
- {
- if (ptr>0)
- {
- strlcat(outlist, app,MAXBUF);
- }
- strlcpy(outpars[pc++],parameters[param++],MAXBUF);
- }
+ //pc++;
+ param++;
}
else
{
- if (ptr>0)
+ if (param < pcnt)
{
- if ((modelist[ptr-1] == '+') || (modelist[ptr-1] == '-'))
- {
- strlcat(outlist, app,MAXBUF);
- }
- else if (!strchr(outlist,*modechar))
- {
- strlcat(outlist, app,MAXBUF);
- }
+ *outl++ = *modechar;
}
- chan->SetCustomMode(*modechar,mdir);
- // include parameters in output if mode has them
- if ((ModeDefinedOn(*modechar,MT_CHANNEL)>0) && (mdir))
+ outpars[pc++] = parameters[param++];
+ }
+ }
+ else
+ {
+ *outl++ = *modechar;
+ chan->SetCustomMode(*modechar,mdir);
+ // include parameters in output if mode has them
+ if ((ModeDefinedOn(*modechar,MT_CHANNEL)>0) && (mdir))
+ {
+ if (param < pcnt)
{
- chan->SetCustomModeParam(modelist[ptr],parameters[param],mdir);
- strlcpy(outpars[pc++],parameters[param++],MAXBUF);
+ chan->SetCustomModeParam(*modechar,parameters[param],mdir);
+ outpars[pc++] = parameters[param++];
}
}
- // break, because only one module can handle the mode.
- handled = true;
- }
- }
- }
+ }
+ // break, because only one module can handle the mode.
+ handled = true;
+ }
+ }
}
- }
- else
- {
- WriteServ(user->fd,"472 %s %c :is unknown mode char to me",user->nick,*modechar);
}
- break;
-
- }
+ }
+ else
+ {
+ WriteServ(user->fd,"472 %s %c :is unknown mode char to me",user->nick,*modechar);
+ }
+ break;
}
}
- /* this ensures only the *valid* modes are sent out onto the network */
- int xt = strlen(outlist)-1;
- while ((outlist[xt] == '-') || (outlist[xt] == '+'))
- {
- outlist[xt] = '\0';
- xt = strlen(outlist)-1;
- }
- if (outlist[0])
+ /* Null terminate it now we're done */
+ *outl = 0;
+
+
+ /************ Fast, but confusing string tidying ************/
+ outl = outlist;
+ while (*outl && (*outl < 'A'))
+ outl++;
+ /* outl now points to the first mode character after +'s and -'s */
+ outl--;
+ /* Now points at first mode-modifier + or - symbol */
+ char* trim = outl;
+ /* Now we tidy off any trailing -'s etc */
+ while (*trim++);
+ trim--;
+ while ((*--trim == '+') || (*trim == '-'))
+ *trim = 0;
+ /************ Done wih the string tidy functions ************/
+
+
+ /* The mode change must be at least two characters long (+ or - and at least one mode) */
+ if (((*outl == '+') || (*outl == '-')) && *(outl+1))
{
- strlcpy(outstr,outlist,MAXBUF);
for (ptr = 0; ptr < pc; ptr++)
{
- strlcat(outstr," ",MAXBUF);
- strlcat(outstr,outpars[ptr],MAXBUF);
+ charlcat(outl,' ',MAXBUF);
+ strlcat(outl,outpars[ptr],MAXBUF-1);
}
if (local)
{
log(DEBUG,"Local mode change");
- WriteChannelLocal(chan, user, "MODE %s %s",chan->name,outstr);
- FOREACH_MOD(I_OnMode,OnMode(user, chan, TYPE_CHANNEL, outstr));
+ WriteChannelLocal(chan, user, "MODE %s %s",chan->name,outl);
+ FOREACH_MOD(I_OnMode,OnMode(user, chan, TYPE_CHANNEL, outl));
}
else
{
{
if (!silent)
{
- WriteChannelWithServ(Config->ServerName,chan,"MODE %s %s",chan->name,outstr);
+ WriteChannelWithServ(Config->ServerName,chan,"MODE %s %s",chan->name,outl);
}
}
{
if (!silent)
{
- WriteChannel(chan,user,"MODE %s %s",chan->name,outstr);
- FOREACH_MOD(I_OnMode,OnMode(user, chan, TYPE_CHANNEL, outstr));
+ WriteChannel(chan,user,"MODE %s %s",chan->name,outl);
+ FOREACH_MOD(I_OnMode,OnMode(user, chan, TYPE_CHANNEL, outl));
}
}
}
bool ModeParser::AllowedUmode(char umode, char* sourcemodes,bool adding,bool serveroverride)
{
+ bool sourceoper = (strchr(sourcemodes,'o') != NULL);
log(DEBUG,"Allowed_umode: %c %s",umode,sourcemodes);
// Servers can +o and -o arbitrarily
if ((serveroverride == true) && (umode == 'o'))
// RFC1459 specified modes
if ((umode == 'w') || (umode == 's') || (umode == 'i'))
{
- log(DEBUG,"umode %c allowed by RFC1459 scemantics",umode);
+ /* umode allowed by RFC1459 scemantics */
return true;
}
- // user may not +o themselves or others, but an oper may de-oper other opers or themselves
- if ((strchr(sourcemodes,'o')) && (!adding))
+ /* user may not +o themselves or others, but an oper may de-oper other opers or themselves */
+ if (sourceoper && !adding)
{
- log(DEBUG,"umode %c allowed by RFC1459 scemantics",umode);
return true;
}
else if (umode == 'o')
{
- log(DEBUG,"umode %c allowed by RFC1459 scemantics",umode);
+ /* Bad oper, bad bad! */
return false;
}
- // process any module-defined modes that need oper
- if ((ModeDefinedOper(umode,MT_CLIENT)) && (strchr(sourcemodes,'o')))
+ /* process any module-defined modes that need oper */
+ if ((ModeDefinedOper(umode,MT_CLIENT)) && (sourceoper))
{
log(DEBUG,"umode %c allowed by module handler (oper only mode)",umode);
return true;
}
- else
- if (ModeDefined(umode,MT_CLIENT))
+ else if (ModeDefined(umode,MT_CLIENT))
{
// process any module-defined modes that don't need oper
log(DEBUG,"umode %c allowed by module handler (non-oper mode)",umode);
- if ((ModeDefinedOper(umode,MT_CLIENT)) && (!strchr(sourcemodes,'o')))
+ if ((ModeDefinedOper(umode,MT_CLIENT)) && (!sourceoper))
{
// no, this mode needs oper, and this user 'aint got what it takes!
return false;
if (!source)
{
s2 = new userrec;
- strlcpy(s2->nick,Config->ServerName,NICKMAX);
- strlcpy(s2->modes,"o",52);
+ strlcpy(s2->nick,Config->ServerName,NICKMAX-1);
+ *s2->modes = 'o';
+ *(s2->modes+1) = 0;
s2->fd = -1;
source = s2;
faked = true;
void cmd_mode::Handle (char **parameters, int pcnt, userrec *user)
{
chanrec* Ptr;
- userrec* dest;
+ userrec* dest = Find(parameters[0]);
int can_change;
int direction = 1;
char outpars[MAXBUF];
-
- dest = Find(parameters[0]);
+ bool next_ok = true;
if (!user)
- {
return;
- }
if ((dest) && (pcnt == 1))
{
WriteServ(user->fd,"221 %s :+%s",dest->nick,dest->modes);
return;
}
-
- if ((dest) && (pcnt > 1))
+ else if ((dest) && (pcnt > 1))
{
std::string tidied = ServerInstance->ModeGrok->CompressModes(parameters[1],false);
parameters[1] = (char*)tidied.c_str();
char dmodes[MAXBUF];
- strlcpy(dmodes,dest->modes,52);
+ strlcpy(dmodes,dest->modes,MAXMODES);
log(DEBUG,"pulled up dest user modes: %s",dmodes);
can_change = 0;
if (user != dest)
{
- if ((strchr(user->modes,'o')) || (is_uline(user->server)))
+ if ((*user->oper) || (is_uline(user->server)))
{
can_change = 1;
}
return;
}
- outpars[0] = '+';
+ outpars[0] = *parameters[1];
outpars[1] = 0;
- direction = 1;
+ direction = (*parameters[1] == '+');
- if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
+ if ((*parameters[1] != '+') && (*parameters[1] != '-'))
return;
- for (unsigned int i = 0; i < strlen(parameters[1]); i++)
+ for (char* i = parameters[1]; *i; i++)
{
- if (parameters[1][i] == ' ')
- continue;
- if (parameters[1][i] == '+')
+ if ((i != parameters[1]) && (*i != '+') && (*i != '-'))
+ next_ok = true;
+
+ switch (*i)
{
- if (direction != 1)
- {
- int t = strlen(outpars)-1;
- if ((outpars[t] == '+') || (outpars[t] == '-'))
+ case ' ':
+ continue;
+
+ case '+':
+ if ((direction != 1) && (next_ok))
{
- outpars[t] = '+';
- }
- else
+ charlcat(outpars,'+',MAXBUF);
+ next_ok = false;
+ }
+ direction = 1;
+ break;
+
+ case '-':
+ if ((direction != 0) && (next_ok))
{
- strcat(outpars,"+");
+ charlcat(outpars,'-',MAXBUF);
+ next_ok = false;
}
- }
- direction = 1;
- }
- else
- if (parameters[1][i] == '-')
- {
- if (direction != 0)
- {
- int t = strlen(outpars)-1;
- if ((outpars[t] == '+') || (outpars[t] == '-'))
+ direction = 0;
+ break;
+
+ default:
+ can_change = 0;
+ if (*user->oper)
{
- outpars[t] = '-';
+ can_change = 1;
}
else
{
- strcat(outpars,"-");
- }
- }
- direction = 0;
- }
- else
- {
- can_change = 0;
- if (strchr(user->modes,'o'))
- {
- can_change = 1;
- }
- else
- {
- if ((parameters[1][i] == 'i') || (parameters[1][i] == 'w') || (parameters[1][i] == 's') || (ServerInstance->ModeGrok->AllowedUmode(parameters[1][i],user->modes,direction,false)))
- {
- can_change = 1;
+ if ((*i == 'i') || (*i == 'w') || (*i == 's') || (ServerInstance->ModeGrok->AllowedUmode(*i,user->modes,direction,false)))
+ {
+ can_change = 1;
+ }
}
- }
- if (can_change)
- {
- if (direction == 1)
+ if (can_change)
{
- if ((!strchr(dmodes,parameters[1][i])) && (ServerInstance->ModeGrok->AllowedUmode(parameters[1][i],user->modes,true,false)))
+ if (direction == 1)
{
- char umode = parameters[1][i];
- if ((ServerInstance->ModeGrok->ProcessModuleUmode(umode, user, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
+ if ((!strchr(dmodes,*i)) && (ServerInstance->ModeGrok->AllowedUmode(*i,user->modes,true,false)))
{
- int q = strlen(dmodes);
- int r = strlen(outpars);
- dmodes[q+1]='\0';
- dmodes[q] = parameters[1][i];
- outpars[r+1]='\0';
- outpars[r] = parameters[1][i];
- if (parameters[1][i] == 'o')
+ if ((ServerInstance->ModeGrok->ProcessModuleUmode(*i, user, dest, direction)) || (*i == 'i') || (*i == 's') || (*i == 'w') || (*i == 'o'))
{
- FOREACH_MOD(I_OnGlobalOper,OnGlobalOper(dest));
+ charlcat(dmodes,*i,53);
+ charlcat(outpars,*i,MAXMODES);
+ switch (*i)
+ {
+ 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;
+ }
}
}
}
- }
- else
- {
- if ((ServerInstance->ModeGrok->AllowedUmode(parameters[1][i],user->modes,false,false)) && (strchr(dmodes,parameters[1][i])))
+ else
{
- char umode = parameters[1][i];
- if ((ServerInstance->ModeGrok->ProcessModuleUmode(umode, user, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
+ if ((ServerInstance->ModeGrok->AllowedUmode(*i,user->modes,false,false)) && (strchr(dmodes,*i)))
{
- unsigned int q = 0;
- char temp[MAXBUF];
- char moo[MAXBUF];
-
- unsigned int r = strlen(outpars);
- outpars[r+1]='\0';
- outpars[r] = parameters[1][i];
-
- *temp = 0;
- for (q = 0; q < strlen(dmodes); q++)
+ if ((ServerInstance->ModeGrok->ProcessModuleUmode(*i, user, dest, direction)) || (*i == 'i') || (*i == 's') || (*i == 'w') || (*i == 'o'))
{
- if (dmodes[q] != parameters[1][i])
+ charlcat(outpars,*i,MAXMODES);
+ charremove(dmodes,*i);
+ switch (*i)
{
- moo[0] = dmodes[q];
- moo[1] = '\0';
- strlcat(temp,moo,MAXBUF);
+ 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;
}
}
- strlcpy(dmodes,temp,52);
-
- if (umode == 'o')
- {
- *dest->oper = 0;
- DeleteOper(dest);
- }
}
}
}
- }
+ break;
}
}
- if (outpars[0])
+ if (*outpars)
{
char b[MAXBUF];
- strlcpy(b,"",MAXBUF);
- unsigned int z = 0;
- unsigned int i = 0;
- while (i < strlen (outpars))
+ char* z = b;
+
+ for (char* i = outpars; *i;)
{
- b[z++] = outpars[i++];
- b[z] = '\0';
- if (i<strlen(outpars)-1)
+ *z++ = *i++;
+ if (((*i == '-') || (*i == '+')) && ((*(i+1) == '-') || (*(i+1) == '+')))
{
- if (((outpars[i] == '-') || (outpars[i] == '+')) && ((outpars[i+1] == '-') || (outpars[i+1] == '+')))
- {
- // someones playing silly buggers and trying
- // to put a +- or -+ into the line...
- i++;
- }
+ // someones playing silly buggers and trying
+ // to put a +- or -+ into the line...
+ i++;
}
- if (i == strlen(outpars)-1)
+ if (!*(i+1))
{
- if ((outpars[i] == '-') || (outpars[i] == '+'))
+ // Someone's trying to make the last character in
+ // the line be a + or - symbol.
+ if ((*i == '-') || (*i == '+'))
{
i++;
}
}
}
+ *z = 0;
- z = strlen(b)-1;
- if ((b[z] == '-') || (b[z] == '+'))
- b[z] = '\0';
-
- if ((!b[0]) || (!strcmp(b,"+")) || (!strcmp(b,"-")))
- return;
-
- if (strcmp(b,""))
+ if ((*b) && (!IS_SINGLE(b,'+')) && (!IS_SINGLE(b,'-')))
{
WriteTo(user, dest, "MODE %s :%s", dest->nick, b);
FOREACH_MOD(I_OnMode,OnMode(user, dest, TYPE_USER, b));
}
- if (strlen(dmodes)>MAXMODES)
- {
- dmodes[MAXMODES-1] = '\0';
- }
log(DEBUG,"Stripped mode line");
log(DEBUG,"Line dest is now %s",dmodes);
- strlcpy(dest->modes,dmodes,52);
+ strlcpy(dest->modes,dmodes,MAXMODES-1);
}
return;
}
-
- Ptr = FindChan(parameters[0]);
- if (Ptr)
+ else
{
- 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);
- return;
- }
- else
- if (pcnt == 2)
+ Ptr = FindChan(parameters[0]);
+ if (Ptr)
{
- char* mode = parameters[1];
- if (*mode == '+')
- mode++;
- int MOD_RESULT = 0;
- FOREACH_RESULT(I_OnRawMode,OnRawMode(user, Ptr, *mode, "", false, 0));
- if (!MOD_RESULT)
- {
- if (*mode == 'b')
- {
-
- for (BanList::iterator i = Ptr->bans.begin(); i != Ptr->bans.end(); i++)
+ if (pcnt == 1)
+ {
+ /* just /modes #channel */
+ WriteServ(user->fd,"324 %s %s +%s",user->nick, Ptr->name, chanmodes(Ptr,Ptr->HasUser(user)));
+ WriteServ(user->fd,"329 %s %s %d", user->nick, Ptr->name, Ptr->created);
+ return;
+ }
+ else if (pcnt == 2)
+ {
+ char* mode = parameters[1];
+ if (*mode == '+')
+ mode++;
+ int MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, Ptr, *mode, "", false, 0));
+ if (!MOD_RESULT)
+ {
+ if (*mode == 'b')
{
- WriteServ(user->fd,"367 %s %s %s %s %d",user->nick, Ptr->name, i->data, i->set_by, i->set_time);
+ for (BanList::iterator i = Ptr->bans.begin(); i != Ptr->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,"368 %s %s :End of channel ban list",user->nick, Ptr->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));
+ return;
}
- WriteServ(user->fd,"368 %s %s :End of channel ban list",user->nick, Ptr->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));
- 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)
- {
- int MOD_RESULT = 0;
- FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,NULL,Ptr,AC_GENERAL_MODE));
-
- if (MOD_RESULT == ACR_DENY)
- return;
- if (MOD_RESULT == ACR_DEFAULT)
+ if ((IS_LOCAL(user)) && (!is_uline(user->server)) && (!Ptr->HasUser(user)))
+ {
+ WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, Ptr->name);
+ return;
+ }
+
+ if (Ptr)
{
- 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);
+ int MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,NULL,Ptr,AC_GENERAL_MODE));
+
+ if (MOD_RESULT == ACR_DENY)
return;
+ if (MOD_RESULT == ACR_DEFAULT)
+ {
+ if ((IS_LOCAL(user)) && (cstatus(user,Ptr) < STATUS_HOP))
+ {
+ 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;
+ }
}
+
+ ServerInstance->ModeGrok->ProcessModes(parameters,user,Ptr,cstatus(user,Ptr),pcnt,false,false,false);
}
-
- ServerInstance->ModeGrok->ProcessModes(parameters,user,Ptr,cstatus(user,Ptr),pcnt,false,false,false);
}
- }
- else
- {
- WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
+ else
+ {
+ WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
+ }
}
}
void ModeParser::ServerMode(char **parameters, int pcnt, userrec *user)
{
chanrec* Ptr;
- userrec* dest;
+ userrec* dest = Find(parameters[0]);
int can_change;
int direction = 1;
char outpars[MAXBUF];
-
- dest = Find(parameters[0]);
-
- // fix: ChroNiCk found this - we cant use this as debug if its null!
- if (dest)
- {
- log(DEBUG,"server_mode on %s",dest->nick);
- }
+ bool next_ok = true;
if ((dest) && (pcnt > 1))
{
parameters[1] = (char*)tidied.c_str();
char dmodes[MAXBUF];
- strlcpy(dmodes,dest->modes,52);
+ strlcpy(dmodes,dest->modes,MAXBUF);
- outpars[0] = '+';
+ outpars[0] = *parameters[1];
outpars[1] = 0;
- direction = 1;
+ direction = (*parameters[1] == '+');
- if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
+ if ((*parameters[1] != '+') && (*parameters[1] != '-'))
return;
- for (unsigned int i = 0; i < strlen(parameters[1]); i++)
+ for (char* i = parameters[1]; *i; i++)
{
- if (parameters[1][i] == ' ')
- continue;
- if (parameters[1][i] == '+')
- {
- if (direction != 1)
- {
- int t = strlen(outpars)-1;
- if ((outpars[t] == '+') || (outpars[t] == '-'))
- {
- outpars[t] = '+';
- }
- else
- {
- strcat(outpars,"+");
- }
- }
- direction = 1;
- }
- else
- if (parameters[1][i] == '-')
+ if ((i != parameters[1]) && (*i != '+') && (*i != '-'))
+ next_ok = true;
+
+ switch (*i)
{
- if (direction != 0)
- {
- int t = strlen(outpars)-1;
- if ((outpars[t] == '+') || (outpars[t] == '-'))
+ case ' ':
+ continue;
+
+ case '+':
+ if ((direction != 1) && (next_ok))
{
- outpars[t] = '-';
+ next_ok = false;
+ charlcat(outpars,'+',MAXBUF);
}
- else
+ direction = 1;
+ break;
+
+ case '-':
+ if ((direction != 0) && (next_ok))
{
- strcat(outpars,"-");
+ next_ok = false;
+ charlcat(outpars,'-',MAXBUF);
}
- }
- direction = 0;
- }
- else
- {
- log(DEBUG,"begin mode processing entry");
- can_change = 1;
- if (can_change)
- {
- if (direction == 1)
+ direction = 0;
+ break;
+
+ default:
+ log(DEBUG,"begin mode processing entry");
+ can_change = 1;
+ if (can_change)
{
- log(DEBUG,"umode %c being added",parameters[1][i]);
- if ((!strchr(dmodes,parameters[1][i])) && (ServerInstance->ModeGrok->AllowedUmode(parameters[1][i],user->modes,true,true)))
+ if (direction == 1)
{
- char umode = parameters[1][i];
- log(DEBUG,"umode %c is an allowed umode",umode);
- if ((ServerInstance->ModeGrok->ProcessModuleUmode(umode, user, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
+ log(DEBUG,"umode %c being added",*i);
+ if ((!strchr(dmodes,*i)) && (ServerInstance->ModeGrok->AllowedUmode(*i,user->modes,true,true)))
{
- int v1 = strlen(dmodes);
- int v2 = strlen(outpars);
- dmodes[v1+1]='\0';
- dmodes[v1] = parameters[1][i];
- outpars[v2+1]='\0';
- outpars[v2] = parameters[1][i];
+ log(DEBUG,"umode %c is an allowed umode",*i);
+ if ((*i == 'i') || (*i == 's') || (*i == 'w') || (*i == 'o') || (ServerInstance->ModeGrok->ProcessModuleUmode(*i, user, dest, direction)))
+ {
+ charlcat(dmodes,*i,MAXBUF);
+ charlcat(outpars,*i,53);
+ }
}
}
- }
- else
- {
- // can only remove a mode they already have
- log(DEBUG,"umode %c being removed",parameters[1][i]);
- if ((ServerInstance->ModeGrok->AllowedUmode(parameters[1][i],user->modes,false,true)) && (strchr(dmodes,parameters[1][i])))
+ else
{
- char umode = parameters[1][i];
- log(DEBUG,"umode %c is an allowed umode",umode);
- if ((ServerInstance->ModeGrok->ProcessModuleUmode(umode, user, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
+ // can only remove a mode they already have
+ log(DEBUG,"umode %c being removed",*i);
+ if ((ServerInstance->ModeGrok->AllowedUmode(*i,user->modes,false,true)) && (strchr(dmodes,*i)))
{
- unsigned int q = 0;
- char temp[MAXBUF];
- char moo[MAXBUF];
-
- unsigned int v1 = strlen(outpars);
- outpars[v1+1]='\0';
- outpars[v1] = parameters[1][i];
- *temp = 0;
- for (q = 0; q < strlen(dmodes); q++)
+ log(DEBUG,"umode %c is an allowed umode",*i);
+ if ((*i == 'i') || (*i == 's') || (*i == 'w') || (*i == 'o') || (ServerInstance->ModeGrok->ProcessModuleUmode(*i, user, dest, direction)))
{
- if (dmodes[q] != parameters[1][i])
- {
- moo[0] = dmodes[q];
- moo[1] = '\0';
- strlcat(temp,moo,MAXBUF);
- }
+ charlcat(outpars,*i,MAXBUF);
+ charremove(dmodes,*i);
}
- strlcpy(dmodes,temp,52);
}
}
}
- }
+ break;
}
}
- if (outpars[0])
- {
- char b[MAXBUF];
- strlcpy(b,"",MAXBUF);
- unsigned int z = 0;
- unsigned int i = 0;
- while (i < strlen (outpars))
- {
- b[z++] = outpars[i++];
- b[z] = '\0';
- if (i<strlen(outpars)-1)
- {
- if (((outpars[i] == '-') || (outpars[i] == '+')) && ((outpars[i+1] == '-') || (outpars[i+1] == '+')))
- {
- // someones playing silly buggers and trying
- // to put a +- or -+ into the line...
- i++;
- }
- }
- if (i == strlen(outpars)-1)
- {
- if ((outpars[i] == '-') || (outpars[i] == '+'))
- {
- i++;
- }
- }
- }
-
- z = strlen(b)-1;
- if ((b[z] == '-') || (b[z] == '+'))
- b[z] = '\0';
-
- if ((!b[0]) || (!strcmp(b,"+")) || (!strcmp(b,"-")))
- return;
+ if (*outpars)
+ {
+ char b[MAXBUF];
+ char* z = b;
- if (strcmp(b,""))
- {
- WriteTo(user, dest, "MODE %s :%s", dest->nick, b);
- FOREACH_MOD(I_OnMode,OnMode(user, dest, TYPE_USER, b));
- }
-
- if (strlen(dmodes)>MAXMODES)
- {
- dmodes[MAXMODES-1] = '\0';
- }
- log(DEBUG,"Stripped mode line");
- log(DEBUG,"Line dest is now %s",dmodes);
- strlcpy(dest->modes,dmodes,MAXMODES);
+ for (char* i = outpars; *i;)
+ {
+ *z++ = *i++;
+ if (((*i == '-') || (*i == '+')) && ((*(i+1) == '-') || (*(i+1) == '+')))
+ {
+ // someones playing silly buggers and trying
+ // to put a +- or -+ into the line...
+ i++;
+ }
+ if (!*(i+1))
+ {
+ // Someone's trying to make the last character in
+ // the line be a + or - symbol.
+ if ((*i == '-') || (*i == '+'))
+ {
+ i++;
+ }
+ }
+ }
+ *z = 0;
- }
+ if ((*b) && (!IS_SINGLE(b,'+')) && (!IS_SINGLE(b,'-')))
+ {
+ WriteTo(user, dest, "MODE %s :%s", dest->nick, b);
+ FOREACH_MOD(I_OnMode,OnMode(user, dest, TYPE_USER, b));
+ }
+
+ log(DEBUG,"Stripped mode line");
+ log(DEBUG,"Line dest is now %s",dmodes);
+ strlcpy(dest->modes,dmodes,MAXMODES-1);
+
+ }
return;
}