#include "inspircd_config.h"
#include "inspircd.h"
#include "inspircd_io.h"
-#include "inspircd_util.h"
#include <unistd.h>
#include <sys/errno.h>
#include <time.h>
#include <deque>
#include "connection.h"
#include "users.h"
-#include "servers.h"
#include "ctables.h"
#include "globals.h"
#include "modules.h"
#include "xline.h"
#include "inspstring.h"
#include "helperfuncs.h"
+#include "mode.h"
extern int MODCOUNT;
extern std::vector<Module*> modules;
extern std::vector<ircd_module*> factory;
-extern std::vector<std::string> module_names;
-
-
-extern int LogLevel;
-extern char ServerName[MAXBUF];
-extern char Network[MAXBUF];
-extern char ServerDesc[MAXBUF];
-extern char AdminName[MAXBUF];
-extern char AdminEmail[MAXBUF];
-extern char AdminNick[MAXBUF];
-extern char diepass[MAXBUF];
-extern char restartpass[MAXBUF];
-extern char motd[MAXBUF];
-extern char rules[MAXBUF];
-extern char list[MAXBUF];
-extern char PrefixQuit[MAXBUF];
-extern char DieValue[MAXBUF];
-
-extern bool AllowHalfop;
-extern bool AllowProtect;
-extern bool AllowFounder;
+extern InspIRCd* ServerInstance;
+extern ServerConfig* Config;
extern time_t TIME;
-char* give_ops(userrec *user,char *dest,chanrec *chan,int status)
+char* ModeParser::GiveOps(userrec *user,char *dest,chanrec *chan,int status)
{
userrec *d;
- if ((!user) || (!dest) || (!chan))
+ if ((!user) || (!dest) || (!chan) || (!*dest))
{
- log(DEFAULT,"*** BUG *** give_ops was given an invalid parameter");
- return NULL;
- }
-
- if (!isnick(dest))
- {
- log(DEFAULT,"the target nickname given to give_ops was invalid");
- WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
+ log(DEFAULT,"*** BUG *** GiveOps was given an invalid parameter");
return NULL;
}
d = Find(dest);
if (!d)
{
- log(DEFAULT,"the target nickname given to give_ops couldnt be found");
+ 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;
}
{
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;
}
- for (int i = 0; i != MAXCHANS; i++)
+ 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)
{
/* mode already set on user, dont allow multiple */
- log(DEFAULT,"The target user given to give_ops was already opped on the channel");
+ log(DEFAULT,"The target user given to GiveOps was already opped on the channel");
return NULL;
}
d->chans[i].uc_modes = d->chans[i].uc_modes | UCMODE_OP;
return d->nick;
}
}
- log(DEFAULT,"The target channel given to give_ops was not in the users mode list");
+ log(DEFAULT,"The target channel given to GiveOps was not in the users mode list");
}
return NULL;
}
-char* give_hops(userrec *user,char *dest,chanrec *chan,int status)
+char* ModeParser::GiveHops(userrec *user,char *dest,chanrec *chan,int status)
{
userrec *d;
- if ((!user) || (!dest) || (!chan))
+ if ((!user) || (!dest) || (!chan) || (!*dest))
{
- log(DEFAULT,"*** BUG *** give_hops was given an invalid parameter");
+ 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;
}
}
- for (int i = 0; i != MAXCHANS; i++)
+ 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))
return NULL;
}
-char* give_voice(userrec *user,char *dest,chanrec *chan,int status)
+char* ModeParser::GiveVoice(userrec *user,char *dest,chanrec *chan,int status)
{
userrec *d;
- if ((!user) || (!dest) || (!chan))
+ if ((!user) || (!dest) || (!chan) || (!*dest))
{
- log(DEFAULT,"*** BUG *** give_voice was given an invalid parameter");
+ 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;
}
}
- for (int i = 0; i != MAXCHANS; i++)
+ 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))
return NULL;
}
-char* take_ops(userrec *user,char *dest,chanrec *chan,int status)
+char* ModeParser::TakeOps(userrec *user,char *dest,chanrec *chan,int status)
{
userrec *d;
- if ((!user) || (!dest) || (!chan))
+ if ((!user) || (!dest) || (!chan) || (!*dest))
{
- log(DEFAULT,"*** BUG *** take_ops was given an invalid parameter");
+ log(DEFAULT,"*** BUG *** TakeOps was given an invalid parameter");
return NULL;
}
d = Find(dest);
- if (!isnick(dest))
- {
- log(DEBUG,"take_ops 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,"take_ops couldnt resolve the target nickname: %s",dest);
+ 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
{
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;
}
}
- for (int i = 0; i != MAXCHANS; i++)
+ 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))
return d->nick;
}
}
- log(DEBUG,"take_ops couldnt locate the target channel in the target users list");
+ log(DEBUG,"TakeOps couldnt locate the target channel in the target users list");
}
return NULL;
}
-char* take_hops(userrec *user,char *dest,chanrec *chan,int status)
+char* ModeParser::TakeHops(userrec *user,char *dest,chanrec *chan,int status)
{
userrec *d;
- if ((!user) || (!dest) || (!chan))
+ if ((!user) || (!dest) || (!chan) || (!*dest))
{
- log(DEFAULT,"*** BUG *** take_hops was given an invalid parameter");
+ 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;
}
}
- for (int i = 0; i != MAXCHANS; i++)
+ 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))
return NULL;
}
-char* take_voice(userrec *user,char *dest,chanrec *chan,int status)
+char* ModeParser::TakeVoice(userrec *user,char *dest,chanrec *chan,int status)
{
userrec *d;
- if ((!user) || (!dest) || (!chan))
+ if ((!user) || (!dest) || (!chan) || (!*dest))
{
- log(DEFAULT,"*** BUG *** take_voice was given an invalid parameter");
+ 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;
}
}
- for (int i = 0; i != MAXCHANS; i++)
+ 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))
return NULL;
}
-char* add_ban(userrec *user,char *dest,chanrec *chan,int status)
+char* ModeParser::AddBan(userrec *user,char *dest,chanrec *chan,int status)
{
- if ((!user) || (!dest) || (!chan)) {
- log(DEFAULT,"*** BUG *** add_ban was given an invalid parameter");
+ 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;
- int l = strlen(dest);
- if (strchr(dest,'!')==0)
- return NULL;
- if (strchr(dest,'@')==0)
- return NULL;
- for (int i = 0; i < l; i++)
- if (dest[i] < 32)
- return NULL;
- for (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 (int i = 0; i < l; i++)
- if (dest[i] == '!')
- c++;
- if (c>1)
- return NULL;
- c = 0;
- for (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);
- if (chan->bans.size() > maxbans)
+ if ((unsigned)chan->bans.size() > (unsigned)maxbans)
{
WriteServ(user->fd,"478 %s %s :Channel ban list for %s is full (maximum entries for this channel is %d)",user->nick, chan->name,chan->name,maxbans);
return NULL;
}
- log(DEBUG,"add_ban: %s %s",chan->name,user->nick);
+ 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;
return dest;
}
-char* take_ban(userrec *user,char *dest,chanrec *chan,int status)
+char* ModeParser::TakeBan(userrec *user,char *dest,chanrec *chan,int status)
{
- if ((!user) || (!dest) || (!chan)) {
- log(DEFAULT,"*** BUG *** take_ban was given an invalid parameter");
+ 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);
// tidies up redundant modes, e.g. +nt-nt+i becomes +-+i,
// a section further down the chain tidies up the +-+- crap.
-std::string compress_modes(std::string modes,bool channelmodes)
+std::string ModeParser::CompressModes(std::string modes,bool channelmodes)
{
int counts[127];
bool active[127];
- int delta = 1;
memset(counts,0,sizeof(counts));
memset(active,0,sizeof(active));
- log(DEBUG,"compress_modes: %s",modes.c_str());
- for (int i = 0; i < modes.length(); i++)
+ for (unsigned int i = 0; i < modes.length(); i++)
{
if ((modes[i] == '+') || (modes[i] == '-'))
continue;
return modes;
}
-void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int pcnt, bool servermode, bool silent, bool local)
+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");
}
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 = compress_modes(modelist,true);
+ 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 give_ops");
- r = give_ops(user,parameters[param++],chan,status);
+ log(DEBUG,"calling GiveOps");
+ r = GiveOps(user,parameters[param++],chan,status);
}
else param++;
}
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 take_ops");
- r = take_ops(user,parameters[param++],chan,status);
+ log(DEBUG,"calling TakeOps");
+ r = TakeOps(user,parameters[param++],chan,status);
}
else param++;
}
break;
case 'h':
- if (((param >= pcnt)) || (!AllowHalfop)) break;
+ if (((param >= pcnt)) || (!Config->AllowHalfop)) break;
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 = give_hops(user,parameters[param++],chan,status);
+ r = GiveHops(user,parameters[param++],chan,status);
}
else param++;
}
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 = take_hops(user,parameters[param++],chan,status);
+ r = TakeHops(user,parameters[param++],chan,status);
}
else param++;
}
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 = give_voice(user,parameters[param++],chan,status);
+ r = GiveVoice(user,parameters[param++],chan,status);
}
else param++;
}
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 = take_voice(user,parameters[param++],chan,status);
+ r = TakeVoice(user,parameters[param++],chan,status);
}
else param++;
}
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 = add_ban(user,parameters[param++],chan,status);
+ r = AddBan(user,parameters[param++],chan,status);
}
else param++;
}
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 = take_ban(user,parameters[param++],chan,status);
+ r = TakeBan(user,parameters[param++],chan,status);
}
else param++;
}
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;
previously_set_l = true;
bool invalid = false;
- for (int i = 0; i < strlen(parameters[param]); i++)
+ for (unsigned int i = 0; i < strlen(parameters[param]); i++)
{
if ((parameters[param][i] < '0') || (parameters[param][i] > '9'))
{
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(I_OnMode,OnMode(user, chan, TYPE_CHANNEL, outstr));
}
else
{
{
if (!silent)
{
- WriteChannelWithServ(ServerName,chan,"MODE %s %s",chan->name,outstr);
- // M token for a usermode must go to all servers
- char buffer[MAXBUF];
- snprintf(buffer,MAXBUF,"M %s %s",chan->name, outstr);
- NetSendToAll(buffer);
+ WriteChannelWithServ(Config->ServerName,chan,"MODE %s %s",chan->name,outstr);
}
}
if (!silent)
{
WriteChannel(chan,user,"MODE %s %s",chan->name,outstr);
- // M token for a usermode must go to all servers
- char buffer[MAXBUF];
- snprintf(buffer,MAXBUF,"m %s %s %s",user->nick,chan->name, outstr);
- NetSendToAll(buffer);
+ FOREACH_MOD(I_OnMode,OnMode(user, chan, TYPE_CHANNEL, outstr));
}
}
}
// based on sourcemodes, return true or false to determine if umode is a valid mode a user may set on themselves or others.
-bool allowed_umode(char umode, char* sourcemodes,bool adding)
+bool ModeParser::AllowedUmode(char umode, char* sourcemodes,bool adding,bool serveroverride)
{
log(DEBUG,"Allowed_umode: %c %s",umode,sourcemodes);
+ // Servers can +o and -o arbitrarily
+ if ((serveroverride == true) && (umode == 'o'))
+ {
+ return true;
+ }
// RFC1459 specified modes
if ((umode == 'w') || (umode == 's') || (umode == 'i'))
{
return false;
}
-bool process_module_umode(char umode, userrec* source, void* dest, bool adding)
+bool ModeParser::ProcessModuleUmode(char umode, userrec* source, void* dest, bool adding)
{
userrec* s2;
bool faked = false;
if (!source)
{
s2 = new userrec;
- strlcpy(s2->nick,ServerName,NICKMAX);
- strcpy(s2->modes,"o");
+ strlcpy(s2->nick,Config->ServerName,NICKMAX);
+ strlcpy(s2->modes,"o",52);
s2->fd = -1;
source = s2;
faked = true;
{
if (modules[i]->OnExtendedMode(source,(void*)dest,umode,MT_CLIENT,adding,p))
{
- log(DEBUG,"Module %s claims umode %c",module_names[i].c_str(),umode);
+ log(DEBUG,"Module %s claims umode %c",Config->module_names[i].c_str(),umode);
return true;
}
}
}
}
-void handle_mode(char **parameters, int pcnt, userrec *user)
+void cmd_mode::Handle (char **parameters, int pcnt, userrec *user)
{
chanrec* Ptr;
userrec* dest;
if ((dest) && (pcnt > 1))
{
- std::string tidied = compress_modes(parameters[1],false);
+ std::string tidied = ServerInstance->ModeGrok->CompressModes(parameters[1],false);
parameters[1] = (char*)tidied.c_str();
char dmodes[MAXBUF];
- strlcpy(dmodes,dest->modes,MAXBUF);
+ strlcpy(dmodes,dest->modes,52);
log(DEBUG,"pulled up dest user modes: %s",dmodes);
can_change = 0;
if (user != dest)
{
- if (strchr(user->modes,'o'))
+ if ((strchr(user->modes,'o')) || (is_uline(user->server)))
{
can_change = 1;
}
return;
}
- strcpy(outpars,"+");
+ outpars[0] = '+';
+ outpars[1] = 0;
direction = 1;
if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
return;
- for (int i = 0; i < strlen(parameters[1]); i++)
+ for (unsigned int i = 0; i < strlen(parameters[1]); i++)
{
if (parameters[1][i] == ' ')
continue;
}
else
{
- if ((parameters[1][i] == 'i') || (parameters[1][i] == 'w') || (parameters[1][i] == 's') || (allowed_umode(parameters[1][i],user->modes,direction)))
+ 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 (direction == 1)
{
- if ((!strchr(dmodes,parameters[1][i])) && (allowed_umode(parameters[1][i],user->modes,true)))
+ if ((!strchr(dmodes,parameters[1][i])) && (ServerInstance->ModeGrok->AllowedUmode(parameters[1][i],user->modes,true,false)))
{
char umode = parameters[1][i];
- if ((process_module_umode(umode, user, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
+ if ((ServerInstance->ModeGrok->ProcessModuleUmode(umode, user, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
{
int q = strlen(dmodes);
int r = strlen(outpars);
outpars[r] = parameters[1][i];
if (parameters[1][i] == 'o')
{
- FOREACH_MOD OnGlobalOper(dest);
+ FOREACH_MOD(I_OnGlobalOper,OnGlobalOper(dest));
}
}
}
}
else
{
- if ((allowed_umode(parameters[1][i],user->modes,false)) && (strchr(dmodes,parameters[1][i])))
+ if ((ServerInstance->ModeGrok->AllowedUmode(parameters[1][i],user->modes,false,false)) && (strchr(dmodes,parameters[1][i])))
{
char umode = parameters[1][i];
- if ((process_module_umode(umode, user, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
+ if ((ServerInstance->ModeGrok->ProcessModuleUmode(umode, user, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
{
- int q = 0;
+ unsigned int q = 0;
char temp[MAXBUF];
char moo[MAXBUF];
- int r = strlen(outpars);
+ unsigned int r = strlen(outpars);
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])
strlcat(temp,moo,MAXBUF);
}
}
- strlcpy(dmodes,temp,MAXBUF);
+ strlcpy(dmodes,temp,52);
if (umode == 'o')
DeleteOper(dest);
{
char b[MAXBUF];
strlcpy(b,"",MAXBUF);
- int z = 0;
- int i = 0;
+ unsigned int z = 0;
+ unsigned int i = 0;
while (i < strlen (outpars))
{
b[z++] = outpars[i++];
if (strcmp(b,""))
{
WriteTo(user, dest, "MODE %s :%s", dest->nick, b);
- // M token for a usermode must go to all servers
- char buffer[MAXBUF];
- snprintf(buffer,MAXBUF,"m %s %s %s",user->nick, dest->nick, b);
- NetSendToAll(buffer);
+ FOREACH_MOD(I_OnMode,OnMode(user, dest, TYPE_USER, b));
}
if (strlen(dmodes)>MAXMODES)
}
log(DEBUG,"Stripped mode line");
log(DEBUG,"Line dest is now %s",dmodes);
- strlcpy(dest->modes,dmodes,MAXMODES);
+ strlcpy(dest->modes,dmodes,52);
}
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) && (!has_channel(user,Ptr)))
+ if (((Ptr) && (!has_channel(user,Ptr))) && (!is_uline(user->server)))
{
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(OnAccessCheck(user,NULL,Ptr,AC_GENERAL_MODE));
+ FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,NULL,Ptr,AC_GENERAL_MODE));
if (MOD_RESULT == ACR_DENY)
return;
}
}
- process_modes(parameters,user,Ptr,cstatus(user,Ptr),pcnt,false,false,false);
+ ServerInstance->ModeGrok->ProcessModes(parameters,user,Ptr,cstatus(user,Ptr),pcnt,false,false,false);
}
}
else
-void server_mode(char **parameters, int pcnt, userrec *user)
+void ModeParser::ServerMode(char **parameters, int pcnt, userrec *user)
{
chanrec* Ptr;
userrec* dest;
if ((dest) && (pcnt > 1))
{
- std::string tidied = compress_modes(parameters[1],false);
+ std::string tidied = ServerInstance->ModeGrok->CompressModes(parameters[1],false);
parameters[1] = (char*)tidied.c_str();
char dmodes[MAXBUF];
- strlcpy(dmodes,dest->modes,MAXBUF);
+ strlcpy(dmodes,dest->modes,52);
- strcpy(outpars,"+");
+ outpars[0] = '+';
+ outpars[1] = 0;
direction = 1;
if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
return;
- for (int i = 0; i < strlen(parameters[1]); i++)
+ for (unsigned int i = 0; i < strlen(parameters[1]); i++)
{
if (parameters[1][i] == ' ')
continue;
if (direction == 1)
{
log(DEBUG,"umode %c being added",parameters[1][i]);
- if ((!strchr(dmodes,parameters[1][i])) && (allowed_umode(parameters[1][i],user->modes,true)))
+ if ((!strchr(dmodes,parameters[1][i])) && (ServerInstance->ModeGrok->AllowedUmode(parameters[1][i],user->modes,true,true)))
{
char umode = parameters[1][i];
log(DEBUG,"umode %c is an allowed umode",umode);
- if ((process_module_umode(umode, user, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
+ if ((ServerInstance->ModeGrok->ProcessModuleUmode(umode, user, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
{
int v1 = strlen(dmodes);
int v2 = strlen(outpars);
{
// can only remove a mode they already have
log(DEBUG,"umode %c being removed",parameters[1][i]);
- if ((allowed_umode(parameters[1][i],user->modes,false)) && (strchr(dmodes,parameters[1][i])))
+ if ((ServerInstance->ModeGrok->AllowedUmode(parameters[1][i],user->modes,false,true)) && (strchr(dmodes,parameters[1][i])))
{
char umode = parameters[1][i];
log(DEBUG,"umode %c is an allowed umode",umode);
- if ((process_module_umode(umode, user, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
+ if ((ServerInstance->ModeGrok->ProcessModuleUmode(umode, user, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
{
- int q = 0;
+ unsigned int q = 0;
char temp[MAXBUF];
char moo[MAXBUF];
- int v1 = strlen(outpars);
+ 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])
strlcat(temp,moo,MAXBUF);
}
}
- strlcpy(dmodes,temp,MAXBUF);
+ strlcpy(dmodes,temp,52);
}
}
}
{
char b[MAXBUF];
strlcpy(b,"",MAXBUF);
- int z = 0;
- int i = 0;
+ unsigned int z = 0;
+ unsigned int i = 0;
while (i < strlen (outpars))
{
b[z++] = outpars[i++];
if (strcmp(b,""))
{
WriteTo(user, dest, "MODE %s :%s", dest->nick, b);
- // M token for a usermode must go to all servers
- char buffer[MAXBUF];
- snprintf(buffer,MAXBUF,"m %s %s %s",user->nick, dest->nick, b);
- NetSendToAll(buffer);
+ FOREACH_MOD(I_OnMode,OnMode(user, dest, TYPE_USER, b));
}
if (strlen(dmodes)>MAXMODES)
Ptr = FindChan(parameters[0]);
if (Ptr)
{
- process_modes(parameters,user,Ptr,STATUS_OP,pcnt,true,false,false);
+ ServerInstance->ModeGrok->ProcessModes(parameters,user,Ptr,STATUS_OP,pcnt,true,false,false);
}
else
{
WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
}
}
-
-
-
-void merge_mode(char **parameters, int pcnt)
-{
- chanrec* Ptr;
- userrec* dest;
- 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,"merge_mode on %s",dest->nick);
- }
-
- if ((dest) && (pcnt > 1))
- {
- std::string tidied = compress_modes(parameters[1],false);
- parameters[1] = (char*)tidied.c_str();
-
- char dmodes[MAXBUF];
- strlcpy(dmodes,dest->modes,MAXBUF);
-
- strcpy(outpars,"+");
- direction = 1;
-
- if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
- return;
-
- for (int i = 0; i < strlen(parameters[1]); 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 (direction != 0)
- {
- int t = strlen(outpars)-1;
- if ((outpars[t] == '+') || (outpars[t] == '-'))
- {
- outpars[t] = '-';
- }
- else
- {
- strcat(outpars,"-");
- }
- }
- direction = 0;
- }
- else
- {
- log(DEBUG,"begin mode processing entry");
- can_change = 1;
- if (can_change)
- {
- if (direction == 1)
- {
- log(DEBUG,"umode %c being added",parameters[1][i]);
- if ((!strchr(dmodes,parameters[1][i])) && (allowed_umode(parameters[1][i],"o",true)))
- {
- char umode = parameters[1][i];
- log(DEBUG,"umode %c is an allowed umode",umode);
- if ((process_module_umode(umode, NULL, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
- {
- 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];
- }
- }
- }
- else
- {
- // can only remove a mode they already have
- log(DEBUG,"umode %c being removed",parameters[1][i]);
- if ((allowed_umode(parameters[1][i],"o",false)) && (strchr(dmodes,parameters[1][i])))
- {
- char umode = parameters[1][i];
- log(DEBUG,"umode %c is an allowed umode",umode);
- if ((process_module_umode(umode, NULL, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
- {
- int q = 0;
- char temp[MAXBUF];
- char moo[MAXBUF];
-
- int v1 = strlen(outpars);
- outpars[v1+1]='\0';
- outpars[v1] = parameters[1][i];
-
- strcpy(temp,"");
- for (q = 0; q < strlen(dmodes); q++)
- {
- if (dmodes[q] != parameters[1][i])
- {
- moo[0] = dmodes[q];
- moo[1] = '\0';
- strlcat(temp,moo,MAXBUF);
- }
- }
- strlcpy(dmodes,temp,MAXBUF);
- }
- }
- }
- }
- }
- }
- if (outpars[0])
- {
- char b[MAXBUF];
- strcpy(b,"");
- int z = 0;
- 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 ((!strcmp(b,"+")) || (!strcmp(b,"-")))
- return;
-
- 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);
-
- }
-
- return;
- }
-
- Ptr = FindChan(parameters[0]);
- if (Ptr)
- {
- userrec s2;
- strlcpy(s2.nick,ServerName,NICKMAX);
- strcpy(s2.modes,"o");
- s2.fd = -1;
- process_modes(parameters,&s2,Ptr,STATUS_OP,pcnt,true,true,false);
- }
-}
-
-
-void merge_mode2(char **parameters, int pcnt, userrec* user)
-{
- chanrec* Ptr;
- userrec* dest;
- 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,"merge_mode2 on %s",dest->nick);
- }
-
- if ((dest) && (pcnt > 1))
- {
- std::string tidied = compress_modes(parameters[1],false);
- parameters[1] = (char*)tidied.c_str();
-
- char dmodes[MAXBUF];
- strlcpy(dmodes,dest->modes,MAXBUF);
-
- strcpy(outpars,"+");
- direction = 1;
-
- if ((parameters[1][0] == ':') && (strlen(parameters[1])>1))
- {
- // some stupid 3rd party things (such as services packages) put a colon on the mode list...
- log(DEBUG,"Some muppet put a colon on the modelist! changed to '%s'",++parameters[1]);
- }
- if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
- return;
-
- for (int i = 0; i < strlen(parameters[1]); 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 (direction != 0)
- {
- int t = strlen(outpars)-1;
- if ((outpars[t] == '+') || (outpars[t] == '-'))
- {
- outpars[t] = '-';
- }
- else
- {
- strcat(outpars,"-");
- }
- }
- direction = 0;
- }
- else
- {
- log(DEBUG,"begin mode processing entry");
- can_change = 1;
- if (can_change)
- {
- if (direction == 1)
- {
- log(DEBUG,"umode %c being added",parameters[1][i]);
- if ((!strchr(dmodes,parameters[1][i])) && (allowed_umode(parameters[1][i],user->modes,true)))
- {
- char umode = parameters[1][i];
- log(DEBUG,"umode %c is an allowed umode",umode);
- if ((process_module_umode(umode, NULL, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
- {
- 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,"OUTPARS='%s', DMODES='%s'",outpars,dmodes);
- }
- }
- }
- else
- {
- // can only remove a mode they already have
- log(DEBUG,"umode %c being removed",parameters[1][i]);
- if ((allowed_umode(parameters[1][i],user->modes,false)) && (strchr(dmodes,parameters[1][i])))
- {
- char umode = parameters[1][i];
- log(DEBUG,"umode %c is an allowed umode",umode);
- if ((process_module_umode(umode, NULL, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
- {
- int q = 0;
- char temp[MAXBUF];
- char moo[MAXBUF];
-
- int v1 = strlen(outpars);
- outpars[v1+1]='\0';
- outpars[v1] = parameters[1][i];
-
- strcpy(temp,"");
- for (q = 0; q < strlen(dmodes); q++)
- {
- if (dmodes[q] != parameters[1][i])
- {
- moo[0] = dmodes[q];
- moo[1] = '\0';
- strlcat(temp,moo,MAXBUF);
- }
- }
- strlcpy(dmodes,temp,MAXBUF);
- }
- }
- }
- }
- }
- }
- log(DEBUG,"DONE! OUTPARS='%s', DMODES='%s'",outpars,dmodes);
- if (outpars[0])
- {
- char b[MAXBUF];
- strcpy(b,"");
- int z = 0;
- 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 (strcmp(b,""))
- {
- WriteTo(user,dest,"MODE %s :%s",dest->nick,b);
- log(DEBUG,"Sent: :%s MODE %s",user->nick,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);
- }
-
- return;
- }
-
- Ptr = FindChan(parameters[0]);
- if (Ptr)
- {
- log(DEBUG,"merge_mode2: found channel %s",Ptr->name);
- if (Ptr)
- {
- if ((cstatus(user,Ptr) < STATUS_HOP) && (!is_uline(user->server)))
- {
- return;
- }
- process_modes(parameters,user,Ptr,cstatus(user,Ptr),pcnt,false,false,true);
- }
- }
-}
-
-
projects / user / henk / code / inspircd.git / blobdiff