-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/* +------------------------------------+
+ * | Inspire Internet Relay Chat Daemon |
+ * +------------------------------------+
*
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
- * <omster@gmail.com>
- *
+ * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
+ * E-mail:
+ * <brain@chatspike.net>
+ * <Craig@chatspike.net>
+ * <omster@gmail.com>
+ *
* Written by Craig Edwards, Craig McLure, and others.
* This program is free but copyrighted software; see
- * the file COPYING for details.
+ * the file COPYING for details.
*
* ---------------------------------------------------
*/
#include <algorithm>
-#include <vector>
-#include <string>
-#include <sstream>
#include "users.h"
#include "channels.h"
#include "modules.h"
-#include "helperfuncs.h"
+#include "configreader.h"
+#include "inspircd.h"
/* $ModDesc: Gives /cban, aka C:lines. Think Q:lines, for channels. */
-class CBan
+/** Holds a CBAN item
+ */
+class CBan : public classbase
{
public:
- std::string chname;
+ irc::string chname;
std::string set_by;
time_t set_on;
long length;
{
}
- CBan(std::string cn, std::string sb, time_t so, long ln, std::string rs) : chname(cn), set_by(sb), set_on(so), length(ln), reason(rs)
+ CBan(irc::string cn, std::string sb, time_t so, long ln, std::string rs) : chname(cn), set_by(sb), set_on(so), length(ln), reason(rs)
{
}
};
-std::string EncodeCBan(const CBan &ban);
-CBan DecodeCBan(const std::string &data);
bool CBanComp(const CBan &ban1, const CBan &ban2);
-void ExpireBans();
-bool IsValidChan(const char* cname);
-extern time_t TIME;
typedef std::vector<CBan> cbanlist;
/* cbans is declared here, as our type is right above. Don't try move it. */
class cmd_cban : public command_t
{
- private:
- Server *Srv;
-
public:
- cmd_cban(Server* Me) : command_t("CBAN", 'o', 1)
+ cmd_cban(InspIRCd* Me) : command_t(Me, "CBAN", 'o', 1)
{
this->source = "m_cban.so";
- this->Srv = Me;
+ this->
+ syntax = "<channel> [<duration> :<reason>]";
}
- void Handle(char **parameters, int pcnt, userrec *user)
+ CmdResult Handle(const char** parameters, int pcnt, userrec *user)
{
/* syntax: CBAN #channel time :reason goes here */
/* 'time' is a human-readable timestring, like 2d3h2s. */
-
- ExpireBans();
if(pcnt == 1)
{
{
if (parameters[0] == iter->chname)
{
- unsigned long remaining = (iter->set_on + iter->length) - TIME;
- WriteServ(user->fd, "386 %s %s :Removed CBAN with %lu seconds left before expiry (%s)", user->nick, iter->chname.c_str(), remaining, iter->reason.c_str());
+ unsigned long remaining = (iter->set_on + iter->length) - ServerInstance->Time();
+ user->WriteServ( "386 %s %s :Removed CBAN with %lu seconds left before expiry (%s)", user->nick, iter->chname.c_str(), remaining, iter->reason.c_str());
cbans.erase(iter);
break;
}
else if (pcnt >= 2)
{
/* full form to add a CBAN */
- if(IsValidChan(parameters[0]))
+ if (ServerInstance->IsChannel(parameters[0]))
{
// parameters[0] = #channel
// parameters[1] = 1h3m2s
// parameters[2] = Tortoise abuser
- long length = Srv->CalcDuration(parameters[1]);
+ long length = ServerInstance->Duration(parameters[1]);
std::string reason = (pcnt > 2) ? parameters[2] : "No reason supplied";
- cbans.push_back(CBan(parameters[0], user->nick, TIME, length, reason));
+ cbans.push_back(CBan(parameters[0], user->nick, ServerInstance->Time(), length, reason));
std::sort(cbans.begin(), cbans.end(), CBanComp);
if(length > 0)
{
- WriteServ(user->fd, "385 %s %s :Added %lu second channel ban (%s)", user->nick, parameters[0], length, reason.c_str());
- WriteOpers("*** %s added %lu second channel ban on %s (%s)", user->nick, length, parameters[0], reason.c_str());
+ user->WriteServ( "385 %s %s :Added %lu second channel ban (%s)", user->nick, parameters[0], length, reason.c_str());
+ ServerInstance->WriteOpers("*** %s added %lu second channel ban on %s (%s)", user->nick, length, parameters[0], reason.c_str());
}
else
{
- WriteServ(user->fd, "385 %s %s :Added permenant channel ban (%s)", user->nick, parameters[0], reason.c_str());
- WriteOpers("*** %s added permenant channel ban on %s (%s)", user->nick, parameters[0], reason.c_str());
+ user->WriteServ( "385 %s %s :Added permenant channel ban (%s)", user->nick, parameters[0], reason.c_str());
+ ServerInstance->WriteOpers("*** %s added permenant channel ban on %s (%s)", user->nick, parameters[0], reason.c_str());
}
}
else
{
- WriteServ(user->fd, "403 %s %s :No such channel", user->nick, parameters[0]);
+ user->WriteServ( "403 %s %s :Invalid channel name", user->nick, parameters[0]);
+ return CMD_FAILURE;
}
}
+
+ return CMD_SUCCESS;
}
};
+bool CBanComp(const CBan &ban1, const CBan &ban2)
+{
+ return ((ban1.set_on + ban1.length) < (ban2.set_on + ban2.length));
+}
+
class ModuleCBan : public Module
{
cmd_cban* mycommand;
- Server* Srv;
+
public:
- ModuleCBan(Server* Me) : Module::Module(Me)
+ ModuleCBan(InspIRCd* Me) : Module::Module(Me)
{
- Srv = Me;
- mycommand = new cmd_cban(Srv);
- Srv->AddCommand(mycommand);
+
+ mycommand = new cmd_cban(Me);
+ ServerInstance->AddCommand(mycommand);
}
void Implements(char* List)
List[I_OnUserPreJoin] = List[I_OnSyncOtherMetaData] = List[I_OnDecodeMetaData] = List[I_OnStats] = 1;
}
- virtual int OnStats(char symbol, userrec* user)
+ virtual int OnStats(char symbol, userrec* user, string_list &results)
{
ExpireBans();
{
for(cbanlist::iterator iter = cbans.begin(); iter != cbans.end(); iter++)
{
- unsigned long remaining = (iter->set_on + iter->length) - TIME;
- WriteServ(user->fd, "210 %s %s %s %lu %lu %lu :%s", user->nick, iter->chname.c_str(), iter->set_by.c_str(), iter->set_on, iter->length, remaining, iter->reason.c_str());
+ unsigned long remaining = (iter->set_on + iter->length) - ServerInstance->Time();
+ results.push_back(std::string(ServerInstance->Config->ServerName)+" 210 "+user->nick+" "+iter->chname.c_str()+" "+iter->set_by+" "+ConvToStr(iter->set_on)+" "+ConvToStr(iter->length)+" "+ConvToStr(remaining)+" :"+iter->reason);
}
}
/* check cbans in here, and apply as necessary. */
for(cbanlist::iterator iter = cbans.begin(); iter != cbans.end(); iter++)
{
- if(iter->chname == cname && !strchr(user->modes, 'o'))
+ if(iter->chname == cname && !user->modes[UM_OPERATOR])
{
// Channel is banned.
- WriteServ(user->fd, "384 %s %s :Cannot join channel, CBANed (%s)", user->nick, cname, iter->reason.c_str());
- WriteOpers("*** %s tried to join %s which is CBANed (%s)", user->nick, cname, iter->reason.c_str());
+ user->WriteServ( "384 %s %s :Cannot join channel, CBANed (%s)", user->nick, cname, iter->reason.c_str());
+ ServerInstance->WriteOpers("*** %s tried to join %s which is CBANed (%s)", user->nick, cname, iter->reason.c_str());
return 1;
}
}
}
}
- virtual void OnDecodeMetaData(int target_type, void* target, std::string extname, std::string extdata)
+ virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata)
{
if((target_type == TYPE_OTHER) && (extname == "cban"))
{
virtual Version GetVersion()
{
- return Version(1,0,0,0,VF_VENDOR);
+ return Version(1,0,0,1,VF_VENDOR);
}
-};
-std::string EncodeCBan(const CBan &ban)
-{
- std::ostringstream stream;
- stream << ban.chname << " " << ban.set_by << " " << ban.set_on << " " << ban.length << " " << ban.reason;
- return stream.str();
-}
+ std::string EncodeCBan(const CBan &ban)
+ {
+ std::ostringstream stream;
+ stream << ban.chname << " " << ban.set_by << " " << ban.set_on << " " << ban.length << " " << ban.reason;
+ return stream.str();
+ }
-CBan DecodeCBan(const std::string &data)
-{
- CBan res;
- std::istringstream stream;
- stream >> res.chname;
- stream >> res.set_by;
- stream >> res.set_on;
- stream >> res.length;
- res.reason = stream.str();
+ CBan DecodeCBan(const std::string &data)
+ {
+ CBan res;
+ std::istringstream stream(data);
+ stream >> res.chname;
+ stream >> res.set_by;
+ stream >> res.set_on;
+ stream >> res.length;
+ res.reason = stream.str();
- return res;
-}
-
-bool CBanComp(const CBan &ban1, const CBan &ban2)
-{
- return ((ban1.set_on + ban1.length) < (ban2.set_on + ban2.length));
-}
+ return res;
+ }
-void ExpireBans()
-{
- while(cbans.size() && ((cbans.begin()->set_on + cbans.begin()->length) <= TIME))
+ void ExpireBans()
{
- cbanlist::iterator iter = cbans.begin();
-
- log(DEBUG, "m_cban.so: Ban on %s expired, removing...", iter->chname.c_str());
- WriteOpers("*** %li second CBAN on %s (%s) set %u seconds ago expired", iter->length, iter->chname.c_str(), iter->reason.c_str(), TIME - iter->set_on);
- cbans.erase(iter);
- }
-}
+ bool go_again = true;
-bool IsValidChan(const char* cname)
-{
- if(!cname)
- return false;
-
- if(cname[0] != '#')
- return false;
-
- for(unsigned int i = 0; i < strlen(cname); i++)
- if((cname[i] == ' ') || (cname[i] == '\7') || (cname[i] == ','))
- return false;
-
- return true;
-}
+ while (go_again)
+ {
+ go_again = false;
+
+ for (cbanlist::iterator iter = cbans.begin(); iter != cbans.end(); iter++)
+ {
+ /* 0 == permanent, don't mess with them! -- w00t */
+ if (iter->length != 0)
+ {
+ if (iter->set_on + iter->length <= ServerInstance->Time())
+ {
+ ServerInstance->Log(DEBUG, "m_cban.so: Ban on %s expired, removing...", iter->chname.c_str());
+ ServerInstance->WriteOpers("*** %li second CBAN on %s (%s) set %u seconds ago expired", iter->length, iter->chname.c_str(), iter->reason.c_str(), ServerInstance->Time() - iter->set_on);
+ cbans.erase(iter);
+ go_again = true;
+ }
+ }
+
+ if (go_again == true)
+ break;
+ }
+ }
+ }
+};
class ModuleCBanFactory : public ModuleFactory
{
{
}
- virtual Module * CreateModule(Server* Me)
+ virtual Module * CreateModule(InspIRCd* Me)
{
return new ModuleCBan(Me);
}