* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
* E-mail:
* <brain@chatspike.net>
* <Craig@chatspike.net>
{
userrec *d;
- if ((!user) || (!dest) || (!chan))
+ if ((!user) || (!dest) || (!chan) || (!*dest))
{
log(DEFAULT,"*** BUG *** GiveOps was given an invalid parameter");
return NULL;
}
-
- if (!isnick(dest))
- {
- log(DEFAULT,"the target nickname given to GiveOps was invalid");
- WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
- return NULL;
- }
d = Find(dest);
if (!d)
{
{
int MOD_RESULT = 0;
- FOREACH_RESULT(OnAccessCheck(user,d,chan,AC_OP));
+ FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_OP));
if (MOD_RESULT == ACR_DENY)
return NULL;
{
userrec *d;
- if ((!user) || (!dest) || (!chan))
+ if ((!user) || (!dest) || (!chan) || (!*dest))
{
log(DEFAULT,"*** BUG *** GiveHops was given an invalid parameter");
return NULL;
}
d = Find(dest);
- if (!isnick(dest))
- {
- WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
- return NULL;
- }
if (!d)
{
WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
else
{
int MOD_RESULT = 0;
- FOREACH_RESULT(OnAccessCheck(user,d,chan,AC_HALFOP));
+ FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_HALFOP));
if (MOD_RESULT == ACR_DENY)
return NULL;
{
userrec *d;
- if ((!user) || (!dest) || (!chan))
+ if ((!user) || (!dest) || (!chan) || (!*dest))
{
log(DEFAULT,"*** BUG *** GiveVoice was given an invalid parameter");
return NULL;
}
d = Find(dest);
- if (!isnick(dest))
- {
- WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
- return NULL;
- }
if (!d)
{
WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
else
{
int MOD_RESULT = 0;
- FOREACH_RESULT(OnAccessCheck(user,d,chan,AC_VOICE));
+ FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_VOICE));
if (MOD_RESULT == ACR_DENY)
return NULL;
{
userrec *d;
- if ((!user) || (!dest) || (!chan))
+ if ((!user) || (!dest) || (!chan) || (!*dest))
{
log(DEFAULT,"*** BUG *** TakeOps was given an invalid parameter");
return NULL;
}
d = Find(dest);
- if (!isnick(dest))
- {
- log(DEBUG,"TakeOps was given an invalid target nickname of %s",dest);
- WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
- return NULL;
- }
if (!d)
{
log(DEBUG,"TakeOps couldnt resolve the target nickname: %s",dest);
else
{
int MOD_RESULT = 0;
- FOREACH_RESULT(OnAccessCheck(user,d,chan,AC_DEOP));
+ FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEOP));
if (MOD_RESULT == ACR_DENY)
return NULL;
{
userrec *d;
- if ((!user) || (!dest) || (!chan))
+ if ((!user) || (!dest) || (!chan) || (!*dest))
{
log(DEFAULT,"*** BUG *** TakeHops was given an invalid parameter");
return NULL;
}
d = Find(dest);
- if (!isnick(dest))
- {
- WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
- return NULL;
- }
if (!d)
{
WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
else
{
int MOD_RESULT = 0;
- FOREACH_RESULT(OnAccessCheck(user,d,chan,AC_DEHALFOP));
+ FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEHALFOP));
if (MOD_RESULT == ACR_DENY)
return NULL;
if (MOD_RESULT == ACR_DEFAULT)
{
- if ((status < STATUS_OP) && (!is_uline(user->server)))
+ /* Tweak by Brain suggested by w00t, allow a halfop to dehalfop themselves */
+ 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;
{
userrec *d;
- if ((!user) || (!dest) || (!chan))
+ if ((!user) || (!dest) || (!chan) || (!*dest))
{
log(DEFAULT,"*** BUG *** TakeVoice was given an invalid parameter");
return NULL;
}
d = Find(dest);
- if (!isnick(dest))
- {
- WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
- return NULL;
- }
if (!d)
{
WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
else
{
int MOD_RESULT = 0;
- FOREACH_RESULT(OnAccessCheck(user,d,chan,AC_DEVOICE));
+ FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEVOICE));
if (MOD_RESULT == ACR_DENY)
return NULL;
char* ModeParser::AddBan(userrec *user,char *dest,chanrec *chan,int status)
{
- if ((!user) || (!dest) || (!chan)) {
+ BanItem b;
+ int toomanyexclamation = 0;
+ int toomanyat = 0;
+
+ if ((!user) || (!dest) || (!chan) || (!*dest))
+ {
log(DEFAULT,"*** BUG *** AddBan was given an invalid parameter");
return NULL;
}
- BanItem b;
- if ((!user) || (!dest) || (!chan))
- return NULL;
- unsigned int l = strlen(dest);
- if (strchr(dest,'!')==0)
- return NULL;
- if (strchr(dest,'@')==0)
- return NULL;
- for (unsigned int i = 0; i < l; i++)
- if (dest[i] < 32)
- return NULL;
- for (unsigned int i = 0; i < l; i++)
- if (dest[i] > 126)
+ for (char* i = dest; *i; i++)
+ {
+ if ((*i < 32) || (*i > 126))
+ {
return NULL;
- int c = 0;
- for (unsigned int i = 0; i < l; i++)
- if (dest[i] == '!')
- c++;
- if (c>1)
- return NULL;
- c = 0;
- for (unsigned int i = 0; i < l; i++)
- if (dest[i] == '@')
- c++;
- if (c>1)
+ }
+ else if (*i == '!')
+ {
+ toomanyexclamation++;
+ }
+ else if (*i == '@')
+ {
+ toomanyat++;
+ }
+ }
+
+ if (toomanyexclamation != 1 || toomanyat != 1)
+ /*
+ * this stops sillyness like n!u!u!u@h, though note that most
+ * ircds don't actually verify banmask validity. --w00t
+ */
return NULL;
long maxbans = GetMaxBans(chan->name);
log(DEBUG,"AddBan: %s %s",chan->name,user->nick);
int MOD_RESULT = 0;
- FOREACH_RESULT(OnAddBan(user,chan,dest));
+ FOREACH_RESULT(I_OnAddBan,OnAddBan(user,chan,dest));
if (MOD_RESULT)
return NULL;
char* ModeParser::TakeBan(userrec *user,char *dest,chanrec *chan,int status)
{
- if ((!user) || (!dest) || (!chan)) {
+ if ((!user) || (!dest) || (!chan) || (!*dest)) {
log(DEFAULT,"*** BUG *** TakeBan was given an invalid parameter");
return 0;
}
if (!strcasecmp(i->data,dest))
{
int MOD_RESULT = 0;
- FOREACH_RESULT(OnDelBan(user,chan,dest));
+ FOREACH_RESULT(I_OnDelBan,OnDelBan(user,chan,dest));
if (MOD_RESULT)
return NULL;
chan->bans.erase(i);
}
int MOD_RESULT = 0;
- FOREACH_RESULT(OnAccessCheck(user,NULL,chan,AC_GENERAL_MODE));
+ FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,NULL,chan,AC_GENERAL_MODE));
if (MOD_RESULT == ACR_DENY)
return;
strlcpy(modelist,parameters[1],MAXBUF); /* mode list, e.g. +oo-o *
* parameters[2] onwards are parameters for
* modes that require them :) */
- strlcpy(outlist,"+",MAXBUF);
+ *outlist = '+';
+ *(outlist+1) = 0;
mdir = 1;
log(DEBUG,"process_modes: modelist: %s",modelist);
std::string tidied = this->CompressModes(modelist,true);
strlcpy(modelist,tidied.c_str(),MAXBUF);
- int len = strlen(modelist);
+ int len = tidied.length();
while (modelist[len-1] == ' ')
modelist[--len] = '\0';
- for (ptr = 0; ptr < len; ptr++)
+
+ for (char* modechar = modelist; *modechar; ptr++, modechar++)
{
r = NULL;
{
- log(DEBUG,"process_modes: modechar: %c",modelist[ptr]);
-
- char modechar = modelist[ptr];
- switch (modelist[ptr])
+ switch (*modechar)
{
case '-':
if (mdir != 0)
if (mdir == 1)
{
MOD_RESULT = 0;
- FOREACH_RESULT(OnRawMode(user, chan, 'o', parameters[param], true, 1));
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'o', parameters[param], true, 1));
if (!MOD_RESULT)
{
log(DEBUG,"calling GiveOps");
else
{
MOD_RESULT = 0;
- FOREACH_RESULT(OnRawMode(user, chan, 'o', parameters[param], false, 1));
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'o', parameters[param], false, 1));
if (!MOD_RESULT)
{
log(DEBUG,"calling TakeOps");
if (mdir == 1)
{
MOD_RESULT = 0;
- FOREACH_RESULT(OnRawMode(user, chan, 'h', parameters[param], true, 1));
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'h', parameters[param], true, 1));
if (!MOD_RESULT)
{
r = GiveHops(user,parameters[param++],chan,status);
else
{
MOD_RESULT = 0;
- FOREACH_RESULT(OnRawMode(user, chan, 'h', parameters[param], false, 1));
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'h', parameters[param], false, 1));
if (!MOD_RESULT)
{
r = TakeHops(user,parameters[param++],chan,status);
if (mdir == 1)
{
MOD_RESULT = 0;
- FOREACH_RESULT(OnRawMode(user, chan, 'v', parameters[param], true, 1));
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'v', parameters[param], true, 1));
if (!MOD_RESULT)
{
r = GiveVoice(user,parameters[param++],chan,status);
else
{
MOD_RESULT = 0;
- FOREACH_RESULT(OnRawMode(user, chan, 'v', parameters[param], false, 1));
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'v', parameters[param], false, 1));
if (!MOD_RESULT)
{
r = TakeVoice(user,parameters[param++],chan,status);
if (mdir == 1)
{
MOD_RESULT = 0;
- FOREACH_RESULT(OnRawMode(user, chan, 'b', parameters[param], true, 1));
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'b', parameters[param], true, 1));
if (!MOD_RESULT)
{
r = AddBan(user,parameters[param++],chan,status);
else
{
MOD_RESULT = 0;
- FOREACH_RESULT(OnRawMode(user, chan, 'b', parameters[param], false, 1));
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'b', parameters[param], false, 1));
if (!MOD_RESULT)
{
r = TakeBan(user,parameters[param++],chan,status);
break;
previously_set_k = true;
- if (!strcmp(chan->key,""))
+ if (!*chan->key)
{
MOD_RESULT = 0;
- FOREACH_RESULT(OnRawMode(user, chan, 'k', parameters[param], true, 1));
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'k', parameters[param], true, 1));
if (!MOD_RESULT)
{
strcat(outlist,"k");
char key[MAXBUF];
MOD_RESULT = 0;
- FOREACH_RESULT(OnRawMode(user, chan, 'k', parameters[param], false, 1));
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'k', parameters[param], false, 1));
if (!MOD_RESULT)
{
strlcpy(key,parameters[param++],32);
break;
previously_unset_l = true;
MOD_RESULT = 0;
- FOREACH_RESULT(OnRawMode(user, chan, 'l', "", false, 0));
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'l', "", false, 0));
if (!MOD_RESULT)
{
if (chan->limit)
break;
MOD_RESULT = 0;
- FOREACH_RESULT(OnRawMode(user, chan, 'l', parameters[param], true, 1));
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'l', parameters[param], true, 1));
if (!MOD_RESULT)
{
case 'i':
MOD_RESULT = 0;
- FOREACH_RESULT(OnRawMode(user, chan, 'i', "", mdir, 0));
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'i', "", mdir, 0));
if (!MOD_RESULT)
{
if (mdir)
case 't':
MOD_RESULT = 0;
- FOREACH_RESULT(OnRawMode(user, chan, 't', "", mdir, 0));
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 't', "", mdir, 0));
if (!MOD_RESULT)
{
if (mdir)
case 'n':
MOD_RESULT = 0;
- FOREACH_RESULT(OnRawMode(user, chan, 'n', "", mdir, 0));
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'n', "", mdir, 0));
if (!MOD_RESULT)
{
if (mdir)
case 'm':
MOD_RESULT = 0;
- FOREACH_RESULT(OnRawMode(user, chan, 'm', "", mdir, 0));
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'm', "", mdir, 0));
if (!MOD_RESULT)
{
if (mdir)
case 's':
MOD_RESULT = 0;
- FOREACH_RESULT(OnRawMode(user, chan, 's', "", mdir, 0));
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 's', "", mdir, 0));
if (!MOD_RESULT)
{
if (mdir)
case 'p':
MOD_RESULT = 0;
- FOREACH_RESULT(OnRawMode(user, chan, 'p', "", mdir, 0));
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'p', "", mdir, 0));
if (!MOD_RESULT)
{
if (mdir)
break;
default:
- log(DEBUG,"Preprocessing custom mode %c: modelist: %s",modechar,chan->custom_modes);
+ 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)))
+ if (((!strchr(chan->custom_modes,*modechar)) && (!mdir)) || ((strchr(chan->custom_modes,*modechar)) && (mdir)))
{
- if (!ModeIsListMode(modechar,MT_CHANNEL))
+ if (!ModeIsListMode(*modechar,MT_CHANNEL))
{
- log(DEBUG,"Mode %c isnt set on %s but trying to remove!",modechar,chan->name);
+ log(DEBUG,"Mode %c isnt set on %s but trying to remove!",*modechar,chan->name);
break;
}
}
- if (ModeDefined(modechar,MT_CHANNEL))
+ if (ModeDefined(*modechar,MT_CHANNEL))
{
log(DEBUG,"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]);
}
- if ((ModeDefinedOff(modechar,MT_CHANNEL)>0) && (!mdir))
+ if ((ModeDefinedOff(*modechar,MT_CHANNEL)>0) && (!mdir))
{
p.push_back(parameters[param]);
}
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)) || ((ModeDefinedOff(*modechar,MT_CHANNEL)>0) && (!mdir)))
{
- log(DEBUG,"Not enough parameters for module-mode %c",modechar);
+ log(DEBUG,"Not enough parameters for module-mode %c",*modechar);
handled = true;
param++;
}
std::string para = "";
if (p.size())
para = p[0];
- FOREACH_RESULT(OnRawMode(user, chan, modechar, para, mdir, pcnt));
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, *modechar, para, mdir, pcnt));
if (!MOD_RESULT)
{
for (int i = 0; i <= MODCOUNT; i++)
{
if (!handled)
{
- int t = modules[i]->OnExtendedMode(user,chan,modechar,MT_CHANNEL,mdir,p);
+ int t = modules[i]->OnExtendedMode(user,chan,*modechar,MT_CHANNEL,mdir,p);
if (t != 0)
{
log(DEBUG,"OnExtendedMode returned nonzero for a module");
- char app[] = {modechar, 0};
- if (ModeIsListMode(modechar,MT_CHANNEL))
+ char app[] = {*modechar, 0};
+ if (ModeIsListMode(*modechar,MT_CHANNEL))
{
if (t == -1)
{
{
strlcat(outlist, app,MAXBUF);
}
- else if (!strchr(outlist,modechar))
+ else if (!strchr(outlist,*modechar))
{
strlcat(outlist, app,MAXBUF);
}
}
- chan->SetCustomMode(modechar,mdir);
+ chan->SetCustomMode(*modechar,mdir);
// include parameters in output if mode has them
- if ((ModeDefinedOn(modechar,MT_CHANNEL)>0) && (mdir))
+ if ((ModeDefinedOn(*modechar,MT_CHANNEL)>0) && (mdir))
{
chan->SetCustomModeParam(modelist[ptr],parameters[param],mdir);
strlcpy(outpars[pc++],parameters[param++],MAXBUF);
}
else
{
- WriteServ(user->fd,"472 %s %c :is unknown mode char to me",user->nick,modechar);
+ WriteServ(user->fd,"472 %s %c :is unknown mode char to me",user->nick,*modechar);
}
break;
{
log(DEBUG,"Local mode change");
WriteChannelLocal(chan, user, "MODE %s %s",chan->name,outstr);
- FOREACH_MOD OnMode(user, chan, TYPE_CHANNEL, outstr);
+ FOREACH_MOD(I_OnMode,OnMode(user, chan, TYPE_CHANNEL, outstr));
}
else
{
if (!silent)
{
WriteChannel(chan,user,"MODE %s %s",chan->name,outstr);
- FOREACH_MOD OnMode(user, chan, TYPE_CHANNEL, outstr);
+ FOREACH_MOD(I_OnMode,OnMode(user, chan, TYPE_CHANNEL, outstr));
}
}
}
}
}
-void handle_mode(char **parameters, int pcnt, userrec *user)
+void cmd_mode::Handle (char **parameters, int pcnt, userrec *user)
{
chanrec* Ptr;
userrec* dest;
return;
}
- strcpy(outpars,"+");
+ outpars[0] = '+';
+ outpars[1] = 0;
direction = 1;
if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
outpars[r] = parameters[1][i];
if (parameters[1][i] == 'o')
{
- FOREACH_MOD OnGlobalOper(dest);
+ FOREACH_MOD(I_OnGlobalOper,OnGlobalOper(dest));
}
}
}
outpars[r+1]='\0';
outpars[r] = parameters[1][i];
- strcpy(temp,"");
+ *temp = 0;
for (q = 0; q < strlen(dmodes); q++)
{
if (dmodes[q] != parameters[1][i])
strlcpy(dmodes,temp,52);
if (umode == 'o')
+ {
+ *dest->oper = 0;
DeleteOper(dest);
+ }
}
}
}
if (strcmp(b,""))
{
WriteTo(user, dest, "MODE %s :%s", dest->nick, b);
- FOREACH_MOD OnMode(user, dest, TYPE_USER, b);
+ FOREACH_MOD(I_OnMode,OnMode(user, dest, TYPE_USER, b));
}
if (strlen(dmodes)>MAXMODES)
if (*mode == '+')
mode++;
int MOD_RESULT = 0;
- FOREACH_RESULT(OnRawMode(user, Ptr, *mode, "", false, 0));
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, Ptr, *mode, "", false, 0));
if (!MOD_RESULT)
{
if (*mode == 'b')
{
// list of items for an extmode
log(DEBUG,"Calling OnSendList for all modules, list output for mode %c",*mode);
- FOREACH_MOD OnSendList(user,Ptr,*mode);
+ FOREACH_MOD(I_OnSendList,OnSendList(user,Ptr,*mode));
return;
}
}
if (Ptr)
{
int MOD_RESULT = 0;
- FOREACH_RESULT(OnAccessCheck(user,NULL,Ptr,AC_GENERAL_MODE));
+ FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,NULL,Ptr,AC_GENERAL_MODE));
if (MOD_RESULT == ACR_DENY)
return;
char dmodes[MAXBUF];
strlcpy(dmodes,dest->modes,52);
- strcpy(outpars,"+");
+ outpars[0] = '+';
+ outpars[1] = 0;
direction = 1;
if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
unsigned int v1 = strlen(outpars);
outpars[v1+1]='\0';
outpars[v1] = parameters[1][i];
-
- strcpy(temp,"");
+ *temp = 0;
for (q = 0; q < strlen(dmodes); q++)
{
if (dmodes[q] != parameters[1][i])
if (strcmp(b,""))
{
WriteTo(user, dest, "MODE %s :%s", dest->nick, b);
- FOREACH_MOD OnMode(user, dest, TYPE_USER, b);
+ FOREACH_MOD(I_OnMode,OnMode(user, dest, TYPE_USER, b));
}
if (strlen(dmodes)>MAXMODES)
projects / user / henk / code / inspircd.git / blobdiff