summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/mode.h2
-rw-r--r--include/modes/cmode_b.h11
-rw-r--r--src/mode.cpp96
-rw-r--r--src/modes/cmode_b.cpp126
-rw-r--r--src/modes/cmode_p.cpp2
-rw-r--r--src/modes/cmode_s.cpp2
6 files changed, 139 insertions, 100 deletions
diff --git a/include/mode.h b/include/mode.h
index f515b1d16..1c3fcfe77 100644
--- a/include/mode.h
+++ b/include/mode.h
@@ -113,8 +113,6 @@ class ModeParser
char* TakeOps(userrec *user,char *dest,chanrec *chan,int status);
char* TakeHops(userrec *user,char *dest,chanrec *chan,int status);
char* TakeVoice(userrec *user,char *dest,chanrec *chan,int status);
- char* AddBan(userrec *user,char *dest,chanrec *chan,int status);
- char* TakeBan(userrec *user,char *dest,chanrec *chan,int status);
userrec* SanityChecks(userrec *user,char *dest,chanrec *chan,int status);
char* Grant(userrec *d,chanrec *chan,int MASK);
char* Revoke(userrec *d,chanrec *chan,int MASK);
diff --git a/include/modes/cmode_b.h b/include/modes/cmode_b.h
new file mode 100644
index 000000000..4c41e3250
--- /dev/null
+++ b/include/modes/cmode_b.h
@@ -0,0 +1,11 @@
+#include "mode.h"
+
+class ModeChannelBan : public ModeHandler
+{
+ public:
+ ModeChannelBan();
+ ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding);
+ std::string& AddBan(userrec *user,std::string& dest,chanrec *chan,int status);
+ std::string& DelBan(userrec *user,std::string& dest,chanrec *chan,int status);
+};
+
diff --git a/src/mode.cpp b/src/mode.cpp
index 8125f07b3..43e3b120e 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -382,102 +382,6 @@ char* ModeParser::TakeVoice(userrec *user,char *dest,chanrec *chan,int status)
return NULL;
}
-char* ModeParser::AddBan(userrec *user,char *dest,chanrec *chan,int status)
-{
- BanItem b;
- int toomanyexclamation = 0;
- int toomanyat = 0;
-
- if ((!user) || (!dest) || (!chan) || (!*dest))
- {
- log(DEFAULT,"*** BUG *** AddBan was given an invalid parameter");
- return NULL;
- }
-
- for (char* i = dest; *i; i++)
- {
- if ((*i < 32) || (*i > 126))
- {
- return NULL;
- }
- 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 ((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,"AddBan: %s %s",chan->name,user->nick);
-
- int MOD_RESULT = 0;
- FOREACH_RESULT(I_OnAddBan,OnAddBan(user,chan,dest));
- if (MOD_RESULT)
- return NULL;
-
- TidyBan(dest);
- for (BanList::iterator i = chan->bans.begin(); i != chan->bans.end(); i++)
- {
- if (!strcasecmp(i->data,dest))
- {
- // dont allow a user to set the same ban twice
- return NULL;
- }
- }
-
- b.set_time = TIME;
- 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* ModeParser::TakeBan(userrec *user,char *dest,chanrec *chan,int status)
-{
- if ((!user) || (!dest) || (!chan) || (!*dest)) {
- log(DEFAULT,"*** BUG *** TakeBan was given an invalid parameter");
- return 0;
- }
-
- log(DEBUG,"del_ban: %s %s",chan->name,user->nick);
- for (BanList::iterator i = chan->bans.begin(); i != chan->bans.end(); i++)
- {
- if (!strcasecmp(i->data,dest))
- {
- 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;
-}
-
void ModeParser::Process(char **parameters, int pcnt, userrec *user, bool servermode)
{
std::string target = parameters[0];
diff --git a/src/modes/cmode_b.cpp b/src/modes/cmode_b.cpp
new file mode 100644
index 000000000..1e8af4d8a
--- /dev/null
+++ b/src/modes/cmode_b.cpp
@@ -0,0 +1,126 @@
+#include "inspircd.h"
+#include "mode.h"
+#include "channels.h"
+#include "users.h"
+#include "helperfuncs.h"
+#include "modes/cmode_b.h"
+
+extern InspIRCd* ServerInstance;
+
+ModeChannelPrivate::ModeChannelBan() : ModeHandler('b', 1, 1, true, MODETYPE_CHANNEL, false)
+{
+}
+
+ModeAction ModeChannelBan::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+{
+ int status = cstatus(user, chan);
+ adding ? parameter = this->AddBan(user, parameter, channel, status) : parameter = this->DelBan(user, parameter, channel, status);
+ return MODEACTION_ALLOW;
+}
+
+std::string& ChannelModeBan::AddBan(userrec *user,std::string &dest,chanrec *chan,int status)
+{
+ BanItem b;
+ int toomanyexclamation = 0;
+ int toomanyat = 0;
+
+ if ((!user) || (!chan))
+ {
+ log(DEFAULT,"*** BUG *** AddBan was given an invalid parameter");
+ return NULL;
+ }
+
+ for (std::string::iterator i = dest.begin(); i != dest.end(); i++)
+ {
+ if ((*i < 32) || (*i > 126))
+ {
+ dest = "";
+ return dest;
+ }
+ 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
+ */
+ dest = "";
+ return dest;
+ }
+
+ long maxbans = GetMaxBans(chan->name);
+ 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);
+ dest = "";
+ return dest;
+ }
+
+ log(DEBUG,"AddBan: %s %s",chan->name,user->nick);
+
+ int MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnAddBan,OnAddBan(user,chan,dest));
+ if (MOD_RESULT)
+ {
+ dest = "";
+ return dest;
+ }
+
+ TidyBan(dest);
+ for (BanList::iterator i = chan->bans.begin(); i != chan->bans.end(); i++)
+ {
+ if (!strcasecmp(i->data,dest))
+ {
+ // dont allow a user to set the same ban twice
+ dest = "";
+ return dest;
+ }
+ }
+
+ b.set_time = TIME;
+ 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;
+}
+
+std::string& ChannelModeBan::DelBan(userrec *user,std::string& dest,chanrec *chan,int status)
+{
+ if ((!user) || (!chan)) {
+ log(DEFAULT,"*** BUG *** TakeBan was given an invalid parameter");
+ return 0;
+ }
+
+ log(DEBUG,"del_ban: %s %s",chan->name,user->nick);
+ for (BanList::iterator i = chan->bans.begin(); i != chan->bans.end(); i++)
+ {
+ if (!strcasecmp(i->data,dest.c_str()))
+ {
+ int MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnDelBan,OnDelBan(user,chan,dest));
+ if (MOD_RESULT)
+ return NULL;
+ chan->bans.erase(i);
+ return dest;
+ }
+ }
+ dest = "";
+ return dest;
+}
+
diff --git a/src/modes/cmode_p.cpp b/src/modes/cmode_p.cpp
index 7ebdbf499..ef4892fc3 100644
--- a/src/modes/cmode_p.cpp
+++ b/src/modes/cmode_p.cpp
@@ -4,7 +4,7 @@
#include "users.h"
#include "modes/cmode_p.h"
-ModeChannelPrivate::ModeChannelPrivate() : ModeHandler('s', 0, 0, 0, MODETYPE_CHANNEL, false)
+ModeChannelPrivate::ModeChannelPrivate() : ModeHandler('p', 0, 0, false, MODETYPE_CHANNEL, false)
{
}
diff --git a/src/modes/cmode_s.cpp b/src/modes/cmode_s.cpp
index f6ae9a2f4..eec99b91d 100644
--- a/src/modes/cmode_s.cpp
+++ b/src/modes/cmode_s.cpp
@@ -4,7 +4,7 @@
#include "users.h"
#include "modes/cmode_s.h"
-ModeChannelSecret::ModeChannelSecret() : ModeHandler('s', 0, 0, 0, MODETYPE_CHANNEL, false)
+ModeChannelSecret::ModeChannelSecret() : ModeHandler('s', 0, 0, false, MODETYPE_CHANNEL, false)
{
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-19 07:39:49 +0000