* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
- * E-mail:
+ * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
+ * E-mail:
* <brain@chatspike.net>
* <Craig@chatspike.net>
*
#include "inspircd_config.h"
#include "inspircd.h"
-#include "inspircd_io.h"
-#include "inspircd_util.h"
+#include "configreader.h"
#include <unistd.h>
#include <sys/errno.h>
#include <time.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)
+ModeHandler::ModeHandler(char modeletter, int parameters_on, int parameters_off, bool listmode, ModeType type, bool operonly) : mode(modeletter), n_params_on(parameters_on), n_params_off(parameters_off), list(listmode), m_type(type), oper(operonly)
{
- userrec *d;
-
- if ((!user) || (!dest) || (!chan))
- {
- log(DEFAULT,"*** BUG *** give_ops was given an invalid parameter");
- return NULL;
- }
+}
+
+ModeHandler::~ModeHandler()
+{
+}
+
+bool ModeHandler::IsListMode()
+{
+ return list;
+}
+
+ModeType ModeHandler::GetModeType()
+{
+ return m_type;
+}
+
+bool ModeHandler::NeedsOper()
+{
+ return oper;
+}
+
+int ModeHandler::GetNumParams(bool adding)
+{
+ return adding ? n_params_on : n_params_off;
+}
+
+char ModeHandler::GetModeChar()
+{
+ return mode;
+}
+
+ModeAction ModeHandler::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding)
+{
+ return MODEACTION_DENY;
+}
+
+void ModeHandler::DisplayList(userrec* user, chanrec* channel)
+{
+}
+
+bool ModeHandler::CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
+{
+ return (ours < theirs);
+}
+
+ModeWatcher::ModeWatcher(char modeletter, ModeType type) : mode(modeletter), m_type(type)
+{
+}
+
+ModeWatcher::~ModeWatcher()
+{
+}
- if (!isnick(dest))
+char ModeWatcher::GetModeChar()
+{
+ return mode;
+}
+
+ModeType ModeWatcher::GetModeType()
+{
+ return m_type;
+}
+
+bool ModeWatcher::BeforeMode(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding, ModeType type)
+{
+ return true;
+}
+
+void ModeWatcher::AfterMode(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter, bool adding, ModeType type)
+{
+}
+
+userrec* ModeParser::SanityChecks(userrec *user,char *dest,chanrec *chan,int status)
+{
+ userrec *d;
+ if ((!user) || (!dest) || (!chan) || (!*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);
return NULL;
}
d = Find(dest);
if (!d)
{
- log(DEFAULT,"the target nickname given to give_ops couldnt be found");
WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
return NULL;
}
- else
- {
+ return d;
+}
- int MOD_RESULT = 0;
- FOREACH_RESULT(OnAccessCheck(user,d,chan,AC_OP));
-
- if (MOD_RESULT == ACR_DENY)
- return NULL;
- if (MOD_RESULT == ACR_DEFAULT)
+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 (((ucrec*)(*i))->channel == chan)
{
- if ((status < STATUS_OP) && (!is_uline(user->server)))
+ if (((ucrec*)(*i))->uc_modes & MASK)
{
- 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;
}
- }
-
-
- for (unsigned int i = 0; i != MAXCHANS; i++)
- {
- if ((d->chans[i].channel != NULL) && (chan != NULL))
- if (!strcasecmp(d->chans[i].channel->name,chan->name))
+ ((ucrec*)(*i))->uc_modes = ((ucrec*)(*i))->uc_modes | MASK;
+ switch (MASK)
{
- 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");
- return NULL;
- }
- d->chans[i].uc_modes = d->chans[i].uc_modes | UCMODE_OP;
- log(DEBUG,"gave ops: %s %s",d->chans[i].channel->name,d->nick);
- return d->nick;
+ 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;
}
- log(DEFAULT,"The target channel given to give_ops was not in the users mode list");
}
return NULL;
}
-char* give_hops(userrec *user,char *dest,chanrec *chan,int status)
+char* ModeParser::Revoke(userrec *d,chanrec *chan,int MASK)
{
- userrec *d;
-
- if ((!user) || (!dest) || (!chan))
- {
- log(DEFAULT,"*** BUG *** give_hops was given an invalid parameter");
+ if (!chan)
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)
+ for (std::vector<ucrec*>::const_iterator i = d->chans.begin(); i != d->chans.end(); i++)
{
- 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_HALFOP));
-
- if (MOD_RESULT == ACR_DENY)
- return NULL;
- if (MOD_RESULT == ACR_DEFAULT)
+ if (((ucrec*)(*i))->channel == chan)
{
- if ((status < STATUS_OP) && (!is_uline(user->server)))
+ if ((((ucrec*)(*i))->uc_modes & MASK) == 0)
{
- WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name);
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;
}
+ }
+ return NULL;
+}
- for (unsigned int i = 0; i != MAXCHANS; i++)
+char* ModeParser::GiveOps(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_OP));
+
+ 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;
- log(DEBUG,"gave h-ops: %s %s",d->chans[i].channel->name,d->nick);
- return d->nick;
}
}
+
+ return this->Grant(d,chan,UCMODE_OP);
}
return NULL;
}
-char* give_voice(userrec *user,char *dest,chanrec *chan,int status)
+char* ModeParser::GiveHops(userrec *user,char *dest,chanrec *chan,int status)
{
- userrec *d;
+ userrec *d = this->SanityChecks(user,dest,chan,status);
- if ((!user) || (!dest) || (!chan))
- {
- log(DEFAULT,"*** BUG *** give_voice was given an invalid parameter");
- return NULL;
- }
-
- d = Find(dest);
- if (!isnick(dest))
+ if (d)
{
- 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);
- return NULL;
- }
- else
- {
- int MOD_RESULT = 0;
- FOREACH_RESULT(OnAccessCheck(user,d,chan,AC_VOICE));
-
- if (MOD_RESULT == ACR_DENY)
- return NULL;
- if (MOD_RESULT == ACR_DEFAULT)
+ if (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);
+ int MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_HALFOP));
+
+ if (MOD_RESULT == ACR_DENY)
return NULL;
- }
- }
-
- for (unsigned int i = 0; i != MAXCHANS; i++)
- {
- if ((d->chans[i].channel != NULL) && (chan != NULL))
- if (!strcasecmp(d->chans[i].channel->name,chan->name))
+ if (MOD_RESULT == ACR_DEFAULT)
{
- if (d->chans[i].uc_modes & UCMODE_VOICE)
+ 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_VOICE;
- log(DEBUG,"gave voice: %s %s",d->chans[i].channel->name,d->nick);
- return d->nick;
}
}
+
+ return this->Grant(d,chan,UCMODE_HOP);
}
return NULL;
}
-char* take_ops(userrec *user,char *dest,chanrec *chan,int status)
+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))
- {
- log(DEFAULT,"*** BUG *** take_ops 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);
- WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
- return NULL;
- }
- else
+ if (d)
{
- int MOD_RESULT = 0;
- FOREACH_RESULT(OnAccessCheck(user,d,chan,AC_DEOP));
-
- if (MOD_RESULT == ACR_DENY)
- return NULL;
- if (MOD_RESULT == ACR_DEFAULT)
+ if (IS_LOCAL(user))
{
- if ((status < STATUS_OP) && (!is_uline(user->server)))
- {
- WriteServ(user->fd,"482 %s %s :You are not a channel operator",user->nick, chan->name);
+ int MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_VOICE));
+
+ if (MOD_RESULT == ACR_DENY)
return NULL;
- }
- }
-
- for (unsigned int i = 0; i != MAXCHANS; i++)
- {
- if ((d->chans[i].channel != NULL) && (chan != NULL))
- if (!strcasecmp(d->chans[i].channel->name,chan->name))
+ if (MOD_RESULT == ACR_DEFAULT)
{
- if ((d->chans[i].uc_modes & UCMODE_OP) == 0)
+ if ((status < STATUS_HOP) && (!is_uline(user->server)))
{
- /* mode already set on user, dont allow multiple */
+ 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;
}
- d->chans[i].uc_modes ^= UCMODE_OP;
- log(DEBUG,"took ops: %s %s",d->chans[i].channel->name,d->nick);
- return d->nick;
}
}
- log(DEBUG,"take_ops couldnt locate the target channel in the target users list");
+
+ return this->Grant(d,chan,UCMODE_VOICE);
}
return NULL;
}
-char* take_hops(userrec *user,char *dest,chanrec *chan,int status)
+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))
- {
- log(DEFAULT,"*** BUG *** take_hops was given an invalid parameter");
- return NULL;
- }
-
- d = Find(dest);
- if (!isnick(dest))
+ if (d)
{
- 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);
- return NULL;
- }
- else
- {
- int MOD_RESULT = 0;
- FOREACH_RESULT(OnAccessCheck(user,d,chan,AC_DEHALFOP));
-
- if (MOD_RESULT == ACR_DENY)
- return NULL;
- if (MOD_RESULT == ACR_DEFAULT)
+ if (IS_LOCAL(user))
{
- if ((status < STATUS_OP) && (!is_uline(user->server)))
- {
- WriteServ(user->fd,"482 %s %s :You are not a channel operator",user->nick, chan->name);
+ int MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEOP));
+
+ if (MOD_RESULT == ACR_DENY)
return NULL;
- }
- }
-
- for (unsigned int i = 0; i != MAXCHANS; i++)
- {
- if ((d->chans[i].channel != NULL) && (chan != NULL))
- if (!strcasecmp(d->chans[i].channel->name,chan->name))
+ if (MOD_RESULT == ACR_DEFAULT)
{
- if ((d->chans[i].uc_modes & UCMODE_HOP) == 0)
+ if ((status < STATUS_OP) && (!is_uline(user->server)) && (IS_LOCAL(user)))
{
- /* mode already set on user, dont allow multiple */
+ WriteServ(user->fd,"482 %s %s :You are not a channel operator",user->nick, chan->name);
return NULL;
}
- d->chans[i].uc_modes ^= UCMODE_HOP;
- log(DEBUG,"took h-ops: %s %s",d->chans[i].channel->name,d->nick);
- return d->nick;
}
}
+
+ return this->Revoke(d,chan,UCMODE_OP);
}
return NULL;
}
-char* take_voice(userrec *user,char *dest,chanrec *chan,int status)
+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))
+ if (d)
{
- log(DEFAULT,"*** BUG *** take_voice 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);
- return NULL;
- }
- else
- {
- int MOD_RESULT = 0;
- FOREACH_RESULT(OnAccessCheck(user,d,chan,AC_DEVOICE));
-
- if (MOD_RESULT == ACR_DENY)
- return NULL;
- if (MOD_RESULT == ACR_DEFAULT)
+ if (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);
+ int MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEHALFOP));
+
+ if (MOD_RESULT == ACR_DENY)
return NULL;
+ 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))))
+ {
+ WriteServ(user->fd,"482 %s %s :You are not a channel operator",user->nick, chan->name);
+ return NULL;
+ }
}
}
- for (unsigned int i = 0; i != MAXCHANS; i++)
+ return this->Revoke(d,chan,UCMODE_HOP);
+ }
+ return NULL;
+}
+
+char* ModeParser::TakeVoice(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_DEVOICE));
+
+ if (MOD_RESULT == ACR_DENY)
+ return NULL;
+ if (MOD_RESULT == ACR_DEFAULT)
{
- if ((d->chans[i].uc_modes & UCMODE_VOICE) == 0)
+ if ((status < STATUS_HOP) && (!is_uline(user->server)))
{
- /* mode already set on user, dont allow multiple */
+ 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;
}
- d->chans[i].uc_modes ^= UCMODE_VOICE;
- 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;
}
-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;
- 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);
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;
}
b.set_time = TIME;
- strncpy(b.data,dest,MAXBUF);
- strncpy(b.set_by,user->nick,NICKMAX);
+ strlcpy(b.data,dest,MAXBUF);
+ if (*user->nick)
+ {
+ strlcpy(b.set_by,user->nick,NICKMAX-1);
+ }
+ else
+ {
+ strlcpy(b.set_by,Config->ServerName,NICKMAX-1);
+ }
chan->bans.push_back(b);
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));
- if (MOD_RESULT)
- return NULL;
+ int MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnDelBan,OnDelBan(user,chan,dest));
+ if (MOD_RESULT)
+ return NULL;
chan->bans.erase(i);
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.
-std::string compress_modes(std::string modes,bool channelmodes)
+void ModeParser::Process(char **parameters, int pcnt, userrec *user, bool servermode)
{
- int counts[127];
- bool active[127];
- memset(counts,0,sizeof(counts));
- memset(active,0,sizeof(active));
- log(DEBUG,"compress_modes: %s",modes.c_str());
- for (unsigned int i = 0; i < modes.length(); i++)
+ std::string target = parameters[0];
+ ModeType type = MODETYPE_USER;
+ chanrec* targetchannel = FindChan(parameters[0]);
+ userrec* targetuser = Find(parameters[0]);
+
+ if (pcnt > 1)
{
- if ((modes[i] == '+') || (modes[i] == '-'))
- continue;
- if (channelmodes)
+ if (targetchannel)
{
- 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;
- }
+ type = MODETYPE_CHANNEL;
+ }
+ else if (targetuser)
+ {
+ type = MODETYPE_USER;
}
else
{
- log(DEBUG,"Tidy mode %c",modes[i]);
- counts[(unsigned int)modes[i]]++;
- active[(unsigned int)modes[i]] = true;
+ /* No such nick/channel */
+ return;
}
- }
- for (int j = 65; j < 127; j++)
- {
- if ((counts[j] > 1) && (active[j] == true))
+ std::string mode_sequence = parameters[1];
+ std::string parameter = "";
+ std::ostringstream parameter_list;
+ std::string output_sequence = "";
+ bool adding = true, state_change = false;
+ int handler_id = 0;
+ int parameter_counter = 2; /* Index of first parameter */
+
+ for (std::string::const_iterator modeletter = mode_sequence.begin(); modeletter != mode_sequence.end(); modeletter++)
{
- 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)
+ switch (*modeletter)
{
- 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());
+ /* NB:
+ * For + and - mode characters, we don't just stick the character into the output sequence.
+ * This is because the user may do something dumb, like: +-+ooo or +oo-+. To prevent this
+ * appearing in the output sequence, we store a flag which says there was a state change,
+ * which is set on any + or -, however, the + or - that we finish on is only appended to
+ * the output stream in the event it is followed by a non "+ or -" character, such as o or v.
+ */
+ case '+':
+ /* The following expression prevents: +o+o nick nick, compressing it to +oo nick nick,
+ * however, will allow the + if it is the first item in the sequence, regardless.
+ */
+ if ((!adding) || (!output_sequence.length()))
+ state_change = true;
+ adding = true;
+ continue;
+ break;
+ case '-':
+ if ((adding) || (!output_sequence.length()))
+ state_change = true;
+ adding = false;
+ continue;
+ break;
+ default:
+
+ /* 65 is the ascii value of 'A' */
+ handler_id = *modeletter - 65;
+
+ if (modehandlers[handler_id])
+ {
+ bool abort = false;
+ for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++)
+ {
+ if ((*watchers)->BeforeMode(user, targetuser, targetchannel, parameter, adding, type) == MODEACTION_DENY)
+ abort = true;
+ }
+ if ((modehandlers[handler_id]->GetModeType() == type) && (!abort))
+ {
+ if (modehandlers[handler_id]->GetNumParams(adding))
+ {
+ if (pcnt < parameter_counter)
+ {
+ parameter = parameters[parameter_counter++];
+ }
+ else
+ {
+ parameter = "";
+ }
+ }
+ ModeAction ma = modehandlers[handler_id]->OnModeChange(user, targetuser, targetchannel, parameter, adding);
+ if (ma == MODEACTION_ALLOW)
+ {
+ /* We're about to output a valid mode letter - was there previously a pending state-change? */
+ if (state_change)
+ output_sequence.append(adding ? "+" : "-");
+
+ /* Add the mode letter */
+ output_sequence = output_sequence + *modeletter;
+
+ /* Is there a valid parameter for this mode? If so add it to the parameter list */
+ if ((modehandlers[handler_id]->GetNumParams(adding)) && (parameter != ""))
+ {
+ parameter_list << " " << parameter;
+ }
+
+ /* Call all the AfterMode events in the mode watchers for this mode */
+ for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++)
+ {
+ (*watchers)->AfterMode(user, targetuser, targetchannel, parameter, adding, type);
+ }
+
+ /* Reset the state change flag */
+ state_change = false;
+ }
+ }
+ }
+ break;
+ }
+ }
+ /* Was there at least one valid mode in the sequence? */
+ if (output_sequence != "")
+ {
+ if (servermode)
+ {
+ if (type == MODETYPE_CHANNEL)
+ {
+ WriteChannelWithServ(Config->ServerName,targetchannel,"MODE %s %s%s",targetchannel->name,output_sequence.c_str(),parameter_list.str().c_str());
+ }
+ }
+ else
+ {
+ if (type == MODETYPE_CHANNEL)
+ {
+ WriteChannel(targetchannel,user,"MODE %s %s%s",targetchannel->name,output_sequence.c_str(),parameter_list.str().c_str());
+ FOREACH_MOD(I_OnMode,OnMode(user, targetchannel, TYPE_CHANNEL, output_sequence + parameter_list.str()));
+ }
}
}
}
- return modes;
}
-void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int pcnt, bool servermode, bool silent, bool local)
+std::string ModeParser::CompressModes(std::string modes,bool channelmodes)
+{
+ return "";
+}
+
+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)
+ int MOD_RESULT = 0;
+
+ if (IS_LOCAL(user))
{
- return;
+ FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,NULL,chan,AC_GENERAL_MODE));
+ if (MOD_RESULT == ACR_DENY)
+ return;
}
- int MOD_RESULT = 0;
- FOREACH_RESULT(OnAccessCheck(user,NULL,chan,AC_GENERAL_MODE));
-
- if (MOD_RESULT == ACR_DENY)
- return;
+ std::string tidied = this->CompressModes(parameters[1],true);
+ strlcpy(mlist,tidied.c_str(),MAXBUF);
+ char* modelist = mlist;
- log(DEBUG,"process_modes: start: parameters=%d",pcnt);
+ *outlist = *modelist;
+ char* outl = outlist+1;
- strlcpy(modelist,parameters[1],MAXBUF); /* mode list, e.g. +oo-o *
- * parameters[2] onwards are parameters for
- * modes that require them :) */
- strlcpy(outlist,"+",MAXBUF);
- mdir = 1;
+ mdir = (*modelist == '+');
log(DEBUG,"process_modes: modelist: %s",modelist);
- std::string tidied = compress_modes(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 + 1); *modechar; ptr++, modechar++)
{
r = NULL;
- {
- log(DEBUG,"process_modes: modechar: %c",modelist[ptr]);
+ /* If we have more than MAXMODES changes in one line,
+ * drop all after the MAXMODES
+ */
+ if (pc > MAXMODES-1)
+ break;
- char modechar = modelist[ptr];
- switch (modelist[ptr])
- {
- case '-':
- if (mdir != 0)
- {
- int t = strlen(outlist)-1;
- if ((outlist[t] == '+') || (outlist[t] == '-'))
- {
- outlist[t] = '-';
- }
- else
- {
- strcat(outlist,"-");
- }
- }
- mdir = 0;
-
- 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(OnRawMode(user, chan, 'o', parameters[param], true, 1));
- if (!MOD_RESULT)
- {
- log(DEBUG,"calling give_ops");
- r = give_ops(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(OnRawMode(user, chan, 'o', parameters[param], false, 1));
- if (!MOD_RESULT)
- {
- log(DEBUG,"calling take_ops");
- r = take_ops(user,parameters[param++],chan,status);
- }
- else param++;
+ r = GiveOps(user,parameters[param++],chan,status);
}
- if (r)
+ else param++;
+ }
+ else
+ {
+ MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'o', parameters[param], false, 1));
+ if (!MOD_RESULT)
{
- strlcat(outlist,"o",MAXBUF);
- strlcpy(outpars[pc++],r,MAXBUF);
+ r = TakeOps(user,parameters[param++],chan,status);
}
- break;
+ else param++;
+ }
+ if (r)
+ {
+ *outl++ = 'o';
+ outpars[pc++] = r;
+ }
+ break;
- case 'h':
- if (((param >= pcnt)) || (!AllowHalfop)) break;
- if (mdir == 1)
- {
- MOD_RESULT = 0;
- FOREACH_RESULT(OnRawMode(user, chan, 'h', parameters[param], true, 1));
- if (!MOD_RESULT)
- {
- r = give_hops(user,parameters[param++],chan,status);
- }
- else param++;
- }
- else
+ 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)
{
- MOD_RESULT = 0;
- FOREACH_RESULT(OnRawMode(user, chan, 'h', parameters[param], false, 1));
- if (!MOD_RESULT)
- {
- r = take_hops(user,parameters[param++],chan,status);
- }
- else param++;
+ r = GiveHops(user,parameters[param++],chan,status);
}
- if (r)
+ else param++;
+ }
+ else
+ {
+ MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'h', parameters[param], false, 1));
+ if (!MOD_RESULT)
{
- strlcat(outlist,"h",MAXBUF);
- strlcpy(outpars[pc++],r,MAXBUF);
+ 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;
- FOREACH_RESULT(OnRawMode(user, chan, 'v', parameters[param], true, 1));
- if (!MOD_RESULT)
- {
- r = give_voice(user,parameters[param++],chan,status);
+ MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'v', parameters[param], true, 1));
+ if (!MOD_RESULT)
+ {
+ r = GiveVoice(user,parameters[param++],chan,status);
}
else param++;
}
else
{
- MOD_RESULT = 0;
- FOREACH_RESULT(OnRawMode(user, chan, 'v', parameters[param], false, 1));
- if (!MOD_RESULT)
- {
- r = take_voice(user,parameters[param++],chan,status);
+ MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'v', parameters[param], false, 1));
+ if (!MOD_RESULT)
+ {
+ r = TakeVoice(user,parameters[param++],chan,status);
}
else param++;
}
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)
+ 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)
{
- MOD_RESULT = 0;
- FOREACH_RESULT(OnRawMode(user, chan, 'b', parameters[param], true, 1));
- if (!MOD_RESULT)
- {
- r = add_ban(user,parameters[param++],chan,status);
- }
- else param++;
+ r = AddBan(user,parameters[param++],chan,status);
}
- else
- {
- MOD_RESULT = 0;
- FOREACH_RESULT(OnRawMode(user, chan, 'b', parameters[param], false, 1));
- if (!MOD_RESULT)
- {
- r = take_ban(user,parameters[param++],chan,status);
- }
- else param++;
- }
- if (r)
+ else param++;
+ }
+ else
+ {
+ MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'b', parameters[param], false, 1));
+ if (!MOD_RESULT)
{
- strlcat(outlist,"b",MAXBUF);
- strlcpy(outpars[pc++],parameters[param-1],MAXBUF);
+ 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 (!strcmp(chan->key,""))
- {
- MOD_RESULT = 0;
- FOREACH_RESULT(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->modes[CM_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(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);
+ chan->modes[CM_KEY] = 1;
+ k_set = true;
}
else param++;
}
- break;
-
- case 'l':
- if (mdir == 0)
+ }
+ else
+ {
+ /* 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));
+ if (!MOD_RESULT)
{
- if (previously_set_l)
- break;
- previously_unset_l = true;
- MOD_RESULT = 0;
- FOREACH_RESULT(OnRawMode(user, chan, 'l', "", false, 0));
- if (!MOD_RESULT)
- {
- if (chan->limit)
- {
- strcat(outlist,"l");
- chan->limit = 0;
- }
+ strlcpy(key,parameters[param++],32);
+ /* only allow -k if correct key given */
+ if (!strcmp(chan->key,key))
+ {
+ *outl++ = 'k';
+ *chan->key = 0;
+ chan->modes[CM_KEY] = 0;
+ outpars[pc++] = key;
}
}
-
- if ((param >= pcnt)) break;
- if (mdir == 1)
+ 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 (l_set)
- break;
- if (previously_unset_l)
- break;
- previously_set_l = true;
- bool invalid = false;
- for (unsigned int i = 0; i < strlen(parameters[param]); i++)
+ if (chan->modes[CM_LIMIT])
{
- if ((parameters[param][i] < '0') || (parameters[param][i] > '9'))
- {
- invalid = true;
- }
+ *outl++ = 'l';
+ chan->limit = 0;
+ chan->modes[CM_LIMIT] = 0;
}
- if (atoi(parameters[param]) < 1)
+ }
+ }
+
+ 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;
+ if (invalid)
+ break;
- MOD_RESULT = 0;
- FOREACH_RESULT(OnRawMode(user, chan, 'l', parameters[param], true, 1));
- if (!MOD_RESULT)
- {
+ 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;
- }
+ chan->limit = atoi(parameters[param]);
- if (chan->limit)
- {
- strlcat(outlist,"l",MAXBUF);
- strlcpy(outpars[pc++],parameters[param++],MAXBUF);
- l_set = true;
- }
+ // reported by mech: large values cause underflow
+ if (chan->limit < 0)
+ chan->limit = 0x7FFF;
+ }
+
+ if (chan->limit)
+ {
+ *outl++ = 'l';
+ chan->modes[CM_LIMIT] = 1;
+ outpars[pc++] = parameters[param++];
+ l_set = true;
+ }
+ }
+ break;
+
+ case 'i':
+ MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'i', "", mdir, 0));
+ if (!MOD_RESULT)
+ {
+ if (mdir)
+ {
+ if (!(chan->modes[CM_INVITEONLY])) *outl++ = 'i';
+ chan->modes[CM_INVITEONLY] = 1;
+ }
+ else
+ {
+ if (chan->modes[CM_INVITEONLY]) *outl++ = 'i';
+ chan->modes[CM_INVITEONLY] = 0;
+ }
+ }
+ break;
+
+ case 't':
+ MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 't', "", mdir, 0));
+ if (!MOD_RESULT)
+ {
+ if (mdir)
+ {
+ if (!(chan->modes[CM_TOPICLOCK])) *outl++ = 't';
+ chan->modes[CM_TOPICLOCK] = 1;
+ }
+ else
+ {
+ if (chan->modes[CM_TOPICLOCK]) *outl++ = 't';
+ chan->modes[CM_TOPICLOCK] = 0;
+ }
+ }
+ break;
+
+ case 'n':
+ MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'n', "", mdir, 0));
+ if (!MOD_RESULT)
+ {
+ if (mdir)
+ {
+ if (!(chan->modes[CM_NOEXTERNAL])) *outl++ = 'n';
+ chan->modes[CM_NOEXTERNAL] = 1;
+ }
+ else
+ {
+ if (chan->modes[CM_NOEXTERNAL]) *outl++ = 'n';
+ chan->modes[CM_NOEXTERNAL] = 0;
+ }
+ }
+ break;
+
+ case 'm':
+ MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'm', "", mdir, 0));
+ if (!MOD_RESULT)
+ {
+ if (mdir)
+ {
+ if (!(chan->modes[CM_MODERATED])) *outl++ = 'm';
+ chan->modes[CM_MODERATED] = 1;
}
- break;
+ else
+ {
+ if (chan->modes[CM_MODERATED]) *outl++ = 'm';
+ chan->modes[CM_MODERATED] = 0;
+ }
+ }
+ break;
- case 'i':
- MOD_RESULT = 0;
- FOREACH_RESULT(OnRawMode(user, chan, 'i', "", mdir, 0));
- if (!MOD_RESULT)
- {
- if (mdir)
- {
- if (!(chan->binarymodes & CM_INVITEONLY)) strlcat(outlist,"i",MAXBUF);
- chan->binarymodes |= CM_INVITEONLY;
- }
- else
+ case 's':
+ MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 's', "", mdir, 0));
+ if (!MOD_RESULT)
+ {
+ if (mdir)
+ {
+ if (!(chan->modes[CM_SECRET])) *outl++ = 's';
+ chan->modes[CM_SECRET] = 1;
+ if (chan->modes[CM_PRIVATE])
{
- if (chan->binarymodes & CM_INVITEONLY) strlcat(outlist,"i",MAXBUF);
- chan->binarymodes &= ~CM_INVITEONLY;
+ chan->modes[CM_PRIVATE] = 0;
+ if (mdir)
+ {
+ *outl++ = '-'; *outl++ = 'p'; *outl++ = '+';
+ }
}
}
- break;
-
- case 't':
- MOD_RESULT = 0;
- FOREACH_RESULT(OnRawMode(user, chan, 't', "", mdir, 0));
- if (!MOD_RESULT)
- {
- if (mdir)
- {
- if (!(chan->binarymodes & CM_TOPICLOCK)) strlcat(outlist,"t",MAXBUF);
- chan->binarymodes |= CM_TOPICLOCK;
- }
- else
- {
- if (chan->binarymodes & CM_NOEXTERNAL) strlcat(outlist,"t",MAXBUF);
- chan->binarymodes &= ~CM_TOPICLOCK;
- }
+ else
+ {
+ if (chan->modes[CM_SECRET]) *outl++ = 's';
+ chan->modes[CM_SECRET] = 0;
}
- break;
+ }
+ break;
- case 'n':
- MOD_RESULT = 0;
- FOREACH_RESULT(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 'p':
+ MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'p', "", mdir, 0));
+ if(!MOD_RESULT)
+ {
+ if(mdir)
+ {
+ if(!(chan->modes[CM_PRIVATE]))
+ *outl++ = 'p';
+
+ chan->modes[CM_PRIVATE] = 1;
+
+ if(chan->modes[CM_SECRET])
+ {
+ chan->modes[CM_SECRET] = 0;
+
+ *outl++ = '-';
+ *outl++ = 's';
+ *outl++ = '+';
+ }
}
- break;
-
- case 'm':
- MOD_RESULT = 0;
- FOREACH_RESULT(OnRawMode(user, chan, 'm', "", mdir, 0));
- if (!MOD_RESULT)
- {
- 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;
- }
+ else
+ {
+ if(chan->modes[CM_PRIVATE])
+ *outl++ = 'p';
+
+ chan->modes[CM_PRIVATE] = 0;
}
+ }
break;
- case 's':
- MOD_RESULT = 0;
- FOREACH_RESULT(OnRawMode(user, chan, 's', "", mdir, 0));
- if (!MOD_RESULT)
- {
- if (mdir)
- {
- if (!(chan->binarymodes & CM_SECRET)) strlcat(outlist,"s",MAXBUF);
- chan->binarymodes |= CM_SECRET;
- if (chan->binarymodes & CM_PRIVATE)
- {
- chan->binarymodes &= ~CM_PRIVATE;
- if (mdir)
- {
- strlcat(outlist,"-p+",MAXBUF);
- }
- }
- }
- else
- {
- if (chan->binarymodes & CM_SECRET) strlcat(outlist,"s",MAXBUF);
- chan->binarymodes &= ~CM_SECRET;
- }
+ default:
+ string_list p;
+ p.clear();
+ bool x = chan->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;
}
- break;
-
- case 'p':
- MOD_RESULT = 0;
- FOREACH_RESULT(OnRawMode(user, chan, 'p', "", mdir, 0));
- if (!MOD_RESULT)
- {
- if (mdir)
- {
- if (!(chan->binarymodes & CM_PRIVATE)) strlcat(outlist,"p",MAXBUF);
- chan->binarymodes |= CM_PRIVATE;
- if (chan->binarymodes & CM_SECRET)
- {
- chan->binarymodes &= ~CM_SECRET;
- if (mdir)
- {
- strlcat(outlist,"-s+",MAXBUF);
- }
- }
- }
- else
- {
- if (chan->binarymodes & CM_PRIVATE) strlcat(outlist,"p",MAXBUF);
- chan->binarymodes &= ~CM_PRIVATE;
- }
+ }
+ if (ModeDefined(*modechar,MT_CHANNEL))
+ {
+ /* A module has claimed this mode */
+ if (param<pcnt)
+ {
+ if ((ModeDefinedOn(*modechar,MT_CHANNEL)>0) && (mdir))
+ {
+ p.push_back(parameters[param]);
+ }
+ if ((ModeDefinedOff(*modechar,MT_CHANNEL)>0) && (!mdir))
+ {
+ p.push_back(parameters[param]);
+ }
}
- 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)))
+ bool handled = false;
+ if (param>=pcnt)
{
- if (!ModeIsListMode(modechar,MT_CHANNEL))
+ // 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,"Mode %c isnt set on %s but trying to remove!",modechar,chan->name);
- break;
+ log(DEBUG,"Not enough parameters for module-mode %c",*modechar);
+ handled = true;
+ param++;
}
}
- if (ModeDefined(modechar,MT_CHANNEL))
+ // 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)
{
- log(DEBUG,"A module has claimed this mode");
- if (param<pcnt)
+ for (int i = 0; i <= MODCOUNT; i++)
{
- if ((ModeDefinedOn(modechar,MT_CHANNEL)>0) && (mdir))
+ if (!handled)
{
- 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(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);
+ 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 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(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 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));
}
}
}
// 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 serveroverride)
+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;
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);
- 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;
{
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;
}
}
delete s2;
source = NULL;
}
- return false;
- }
-}
-
-void handle_mode(char **parameters, int pcnt, userrec *user)
-{
- chanrec* Ptr;
- userrec* dest;
- int can_change;
- int direction = 1;
- char outpars[MAXBUF];
-
- dest = Find(parameters[0]);
-
- if (!user)
- {
- return;
- }
-
- if ((dest) && (pcnt == 1))
- {
- WriteServ(user->fd,"221 %s :+%s",dest->nick,dest->modes);
- return;
- }
-
- 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,52);
- log(DEBUG,"pulled up dest user modes: %s",dmodes);
-
- can_change = 0;
- if (user != dest)
- {
- if ((strchr(user->modes,'o')) || (is_uline(user->server)))
- {
- can_change = 1;
- }
- }
- else
- {
- can_change = 1;
- }
- if (!can_change)
- {
- WriteServ(user->fd,"482 %s :Can't change mode for other users",user->nick);
- return;
- }
-
- strcpy(outpars,"+");
- direction = 1;
-
- if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
- return;
-
- for (unsigned 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
- {
- 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') || (allowed_umode(parameters[1][i],user->modes,direction,false)))
- {
- can_change = 1;
- }
- }
- if (can_change)
- {
- if (direction == 1)
- {
- if ((!strchr(dmodes,parameters[1][i])) && (allowed_umode(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'))
- {
- 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')
- {
- FOREACH_MOD OnGlobalOper(dest);
- }
- }
- }
- }
- else
- {
- if ((allowed_umode(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'))
- {
- unsigned int q = 0;
- char temp[MAXBUF];
- char moo[MAXBUF];
-
- unsigned int r = strlen(outpars);
- outpars[r+1]='\0';
- outpars[r] = 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,52);
-
- if (umode == 'o')
- DeleteOper(dest);
- }
- }
- }
- }
- }
- }
- 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 (strcmp(b,""))
- {
- WriteTo(user, dest, "MODE %s :%s", dest->nick, b);
- FOREACH_MOD 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);
-
- }
-
- return;
- }
-
- Ptr = FindChan(parameters[0]);
- if (Ptr)
- {
- if (pcnt == 1)
- {
- /* just /modes #channel */
- WriteServ(user->fd,"324 %s %s +%s",user->nick, Ptr->name, chanmodes(Ptr));
- 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(OnRawMode(user, Ptr, *mode, "", false, 0));
- if (!MOD_RESULT)
- {
- if (*mode == 'b')
- {
-
- 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 OnSendList(user,Ptr,*mode);
- return;
- }
- }
- }
-
- if ((Ptr) && (!has_channel(user,Ptr)))
- {
- 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));
-
- if (MOD_RESULT == ACR_DENY)
- return;
- if (MOD_RESULT == ACR_DEFAULT)
- {
- if (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;
- }
- }
-
- process_modes(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]);
+ return false;
}
}
-
-
-
-void server_mode(char **parameters, int pcnt, userrec *user)
+void cmd_mode::Handle (char **parameters, int pcnt, userrec *user)
{
- chanrec* Ptr;
- userrec* dest;
+ chanrec* chan;
+ userrec* dest = Find(parameters[0]);
+ int MOD_RESULT;
int can_change;
int direction = 1;
char outpars[MAXBUF];
+ bool next_ok = true;
- dest = Find(parameters[0]);
-
- // fix: ChroNiCk found this - we cant use this as debug if its null!
- if (dest)
+ if (!user)
+ return;
+
+ if ((dest) && (pcnt == 1))
{
- log(DEBUG,"server_mode on %s",dest->nick);
+ WriteServ(user->fd,"221 %s :+%s",dest->nick,dest->modes);
+ return;
}
-
- if ((dest) && (pcnt > 1))
+ else if ((dest) && (pcnt > 1))
{
- std::string tidied = compress_modes(parameters[1],false);
- parameters[1] = (char*)tidied.c_str();
+ 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);
- strcpy(outpars,"+");
- direction = 1;
+ can_change = 0;
+ if (user != dest)
+ {
+ if ((*user->oper) || (is_uline(user->server)))
+ {
+ can_change = 1;
+ }
+ }
+ else
+ {
+ can_change = 1;
+ }
+ if (!can_change)
+ {
+ WriteServ(user->fd,"482 %s :Can't change mode for other users",user->nick);
+ return;
+ }
+
+ outpars[0] = *parameters[1];
+ outpars[1] = 0;
+ 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,"-");
+ if ((*i == 'i') || (*i == 'w') || (*i == 's') || (ServerInstance->ModeGrok->AllowedUmode(*i,user->modes,direction,false)))
+ {
+ can_change = 1;
+ }
}
- }
- direction = 0;
- }
- else
- {
- log(DEBUG,"begin mode processing entry");
- can_change = 1;
- if (can_change)
- {
- if (direction == 1)
+ if (can_change)
{
- log(DEBUG,"umode %c being added",parameters[1][i]);
- if ((!strchr(dmodes,parameters[1][i])) && (allowed_umode(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 ((process_module_umode(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 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];
+ if ((ServerInstance->ModeGrok->ProcessModuleUmode(*i, user, dest, direction)) || (*i == 'i') || (*i == 's') || (*i == 'w') || (*i == 'o'))
+ {
+ 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
- {
- // 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,true)) && (strchr(dmodes,parameters[1][i])))
+ else
{
- 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->AllowedUmode(*i,user->modes,false,false)) && (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];
-
- strcpy(temp,"");
- 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);
}
}
}
- }
+ 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 OnMode(user, dest, TYPE_USER, b);
- }
-
- if (strlen(dmodes)>MAXMODES)
- {
- dmodes[MAXMODES-1] = '\0';
+ 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);
+ strlcpy(dest->modes,dmodes,MAXMODES-1);
}
return;
}
-
- Ptr = FindChan(parameters[0]);
- if (Ptr)
- {
- process_modes(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,52);
-
- strcpy(outpars,"+");
- direction = 1;
-
- if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
- return;
-
- for (unsigned int i = 0; i < strlen(parameters[1]); i++)
+ chan = FindChan(parameters[0]);
+ if(chan)
{
- if (parameters[1][i] == ' ')
- continue;
- if (parameters[1][i] == '+')
+ if (pcnt == 1)
{
- 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;
+ /* just /modes #channel */
+ WriteServ(user->fd,"324 %s %s +%s",user->nick, chan->name, chanmodes(chan, chan->HasUser(user)));
+ WriteServ(user->fd,"329 %s %s %d", user->nick, chan->name, chan->created);
+ return;
}
- else
+ else if (pcnt == 2)
{
- log(DEBUG,"begin mode processing entry");
- can_change = 1;
- if (can_change)
+ char* mode = parameters[1];
+
+ MOD_RESULT = 0;
+
+ if (*mode == '+')
+ mode++;
+
+ FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, *mode, "", false, 0));
+ if(!MOD_RESULT)
{
- if (direction == 1)
+ if (*mode == 'b')
{
- log(DEBUG,"umode %c being added",parameters[1][i]);
- if ((!strchr(dmodes,parameters[1][i])) && (allowed_umode(parameters[1][i],"o",true,true)))
+ for (BanList::iterator i = chan->bans.begin(); i != chan->bans.end(); 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 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];
- }
+ WriteServ(user->fd,"367 %s %s %s %s %d",user->nick, chan->name, i->data, i->set_by, i->set_time);
}
+ WriteServ(user->fd,"368 %s %s :End of channel ban list",user->nick, chan->name);
+ return;
}
- else
+
+ if ((ModeDefined(*mode,MT_CHANNEL)) && (ModeIsListMode(*mode,MT_CHANNEL)))
{
- // 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,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, NULL, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
- {
- unsigned int q = 0;
- char temp[MAXBUF];
- char moo[MAXBUF];
-
- unsigned 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,52);
- }
- }
+ // 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,chan,*mode));
+ return;
}
}
}
- }
- if (outpars[0])
- {
- char b[MAXBUF];
- strcpy(b,"");
- unsigned int z = 0;
- unsigned int i = 0;
- while (i < strlen (outpars))
+
+ if ((IS_LOCAL(user)) && (!is_uline(user->server)) && (!chan->HasUser(user)))
{
- 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++;
- }
- }
+ WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, chan->name);
+ return;
}
-
- z = strlen(b)-1;
- if ((b[z] == '-') || (b[z] == '+'))
- b[z] = '\0';
-
- if ((!strcmp(b,"+")) || (!strcmp(b,"-")))
+
+ MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user, NULL, chan, AC_GENERAL_MODE));
+
+ if(MOD_RESULT == ACR_DENY)
return;
- if (strlen(dmodes)>MAXMODES)
+ if(MOD_RESULT == ACR_DEFAULT)
{
- dmodes[MAXMODES-1] = '\0';
+ if ((IS_LOCAL(user)) && (cstatus(user,chan) < STATUS_HOP))
+ {
+ 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;
+ }
}
- 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);
+ ServerInstance->ModeGrok->ProcessModes(parameters,user,chan,cstatus(user,chan),pcnt,false,false,false);
+ }
+ else
+ {
+ WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
+ }
}
}
-void merge_mode2(char **parameters, int pcnt, userrec* user)
+
+
+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,"merge_mode2 on %s",dest->nick);
- }
+ bool next_ok = true;
if ((dest) && (pcnt > 1))
{
- std::string tidied = compress_modes(parameters[1],false);
- parameters[1] = (char*)tidied.c_str();
+ 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,MAXBUF);
- strcpy(outpars,"+");
- direction = 1;
+ outpars[0] = *parameters[1];
+ outpars[1] = 0;
+ direction = (*parameters[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;
+ 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])) && (allowed_umode(parameters[1][i],user->modes,true,false)))
+ if (direction == 1)
{
- 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'))
+ 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,"OUTPARS='%s', DMODES='%s'",outpars,dmodes);
+ 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);
+ switch (*i)
+ {
+ case 'i':
+ dest->modebits |= UM_INVISIBLE;
+ break;
+ case 's':
+ dest->modebits |= UM_SERVERNOTICE;
+ break;
+ case 'w':
+ dest->modebits |= UM_WALLOPS;
+ break;
+ default:
+ break;
+ }
+ }
}
}
- }
- 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,false)) && (strchr(dmodes,parameters[1][i])))
+ else
{
- 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'))
+ // 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];
-
- strcpy(temp,"");
- 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])
+ charlcat(outpars,*i,MAXBUF);
+ charremove(dmodes,*i);
+ switch (*i)
{
- moo[0] = dmodes[q];
- moo[1] = '\0';
- strlcat(temp,moo,MAXBUF);
+ 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);
}
}
}
- }
+ break;
}
}
- log(DEBUG,"DONE! OUTPARS='%s', DMODES='%s'",outpars,dmodes);
- if (outpars[0])
+ if (*outpars)
{
char b[MAXBUF];
- strcpy(b,"");
- 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,""))
- {
- WriteTo(user,dest,"MODE %s :%s",dest->nick,b);
- FOREACH_MOD OnMode(user, dest, TYPE_USER, b);
- }
-
- if (strlen(dmodes)>MAXMODES)
+ if ((*b) && (!IS_SINGLE(b,'+')) && (!IS_SINGLE(b,'-')))
{
- dmodes[MAXMODES-1] = '\0';
+ 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);
+ strlcpy(dest->modes,dmodes,MAXMODES-1);
+
}
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);
- }
+ 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]);
}
}
-
-
projects / user / henk / code / inspircd.git / blobdiff