Some pointless changes to this in the course of bugfinding

[user/henk/code/inspircd.git] / src / modules.cpp

diff --git a/src/modules.cpp b/src/modules.cpp
index c1a912ecafcf3ccc80ca53320935f38239717611..ca3c2e423e9adc37909f62ca668aa931426c0f4d 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -11,10 +11,13 @@
 #include "modules.h"
 #include "ctables.h"
 #include "inspircd_io.h"
+#include "wildcard.h"
+#include "mode.h"
+#include "message.h"
 
 // class type for holding an extended mode character - internal to core
 
-class ExtMode
+class ExtMode : public classbase
 {
 public:
        char modechar;
@@ -115,7 +118,7 @@ void Module::OnPacketReceive(char *p) { }
 void Module::OnRehash() { }
 void Module::OnServerRaw(std::string &raw, bool inbound) { }
 int Module::OnUserPreJoin(userrec* user, chanrec* chan, const char* cname) { return 0; }
-bool Module::OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params) { }
+bool Module::OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params) { return false; }
 Version Module::GetVersion() { return Version(1,0,0,0); }
 void Module::OnOper(userrec* user) { };
 void Module::OnInfo(userrec* user) { };
@@ -140,6 +143,14 @@ void Server::SendOpers(std::string s)
        WriteOpers("%s",s.c_str());
 }
 
+bool Server::MatchText(std::string sliteral, std::string spattern)
+{
+       char literal[MAXBUF],pattern[MAXBUF];
+       strncpy(literal,sliteral.c_str(),MAXBUF);
+       strncpy(pattern,spattern.c_str(),MAXBUF);
+       return match(literal,pattern);
+}
+
 void Server::SendToModeMask(std::string modes, int flags, std::string text)
 {
        WriteMode(modes.c_str(),flags,"%s",text.c_str());
@@ -147,12 +158,12 @@ void Server::SendToModeMask(std::string modes, int flags, std::string text)
 
 chanrec* Server::JoinUserToChannel(userrec* user, std::string cname, std::string key)
 {
-       return add_channel(user,cname.c_str(),key.c_str());
+       return add_channel(user,cname.c_str(),key.c_str(),true);
 }
 
 chanrec* Server::PartUserFromChannel(userrec* user, std::string cname, std::string reason)
 {
-       return del_channel(user,cname.c_str(),reason.c_str());
+       return del_channel(user,cname.c_str(),reason.c_str(),false);
 }
 
 void Server::ChangeUserNick(userrec* user, std::string nickname)
@@ -162,9 +173,14 @@ void Server::ChangeUserNick(userrec* user, std::string nickname)
 
 void Server::QuitUser(userrec* user, std::string reason)
 {
+       send_network_quit(user->nick,reason.c_str());
        kill_link(user,reason.c_str());
 }
 
+void Server::CallCommandHandler(std::string commandname, char** parameters, int pcnt, userrec* user)
+{
+       call_handler(commandname.c_str(),parameters,pcnt,user);
+}
 
 void Server::Log(int level, std::string s)
 {
@@ -198,7 +214,16 @@ void Server::SendFrom(int Socket, userrec* User, std::string s)
 
 void Server::SendTo(userrec* Source, userrec* Dest, std::string s)
 {
-       WriteTo(Source,Dest,"%s",s.c_str());
+       if (!Source)
+       {
+               // if source is NULL, then the message originates from the local server
+               Write(Dest->fd,":%s %s",this->GetServerName().c_str(),s.c_str());
+       }
+       else
+       {
+               // otherwise it comes from the user specified
+               WriteTo(Source,Dest,"%s",s.c_str());
+       }
 }
 
 void Server::SendChannel(userrec* User, chanrec* Channel, std::string s,bool IncludeSender)
@@ -232,7 +257,17 @@ void Server::SendCommon(userrec* User, std::string text,bool IncludeSender)
 
 void Server::SendWallops(userrec* User, std::string text)
 {
-       WriteWallOps(User,"%s",text.c_str());
+       WriteWallOps(User,false,"%s",text.c_str());
+}
+
+void Server::ChangeHost(userrec* user, std::string host)
+{
+       ChangeDisplayedHost(user,host.c_str());
+}
+
+void Server::ChangeGECOS(userrec* user, std::string gecos)
+{
+       ChangeName(user,gecos.c_str());
 }
 
 bool Server::IsNick(std::string nick)
@@ -292,37 +327,59 @@ bool Server::AddExtendedMode(char modechar, int type, bool requires_oper, int pa
        return DoAddExtendedMode(modechar,type,requires_oper,params_when_on,params_when_off);
 }
 
+int Server::CountUsers(chanrec* c)
+{
+       return usercount(c);
+}
+
 
 ConfigReader::ConfigReader()
 {
-       fname = CONFIG_FILE;
+       this->cache = new std::stringstream(std::stringstream::in | std::stringstream::out);
+       this->error = LoadConf(CONFIG_FILE,this->cache);
 }
 
 
 ConfigReader::~ConfigReader()
 {
+       if (this->cache)
+               delete this->cache;
 }
 
 
-ConfigReader::ConfigReader(std::string filename) : fname(filename) { };
+ConfigReader::ConfigReader(std::string filename)
+{
+       this->cache = new std::stringstream(std::stringstream::in | std::stringstream::out);
+       this->error = LoadConf(filename.c_str(),this->cache);
+};
 
 std::string ConfigReader::ReadValue(std::string tag, std::string name, int index)
 {
+       log(DEBUG,"ConfigReader::ReadValue '%s' '%s' %d",tag.c_str(),name.c_str(),index);
        char val[MAXBUF];
-       ReadConf(fname.c_str(),tag.c_str(),name.c_str(),index,val);
-       return val;
+       char t[MAXBUF];
+       char n[MAXBUF];
+       strncpy(t,tag.c_str(),MAXBUF);
+       strncpy(n,name.c_str(),MAXBUF);
+       ReadConf(cache,t,n,index,val);
+       log(DEBUG,"ConfigReader::ReadValue read '%s'",val);
+       return std::string(val);
 }
 
 
 int ConfigReader::Enumerate(std::string tag)
 {
-       return EnumConf(fname.c_str(),tag.c_str());
+       return EnumConf(cache,tag.c_str());
 }
 
+int ConfigReader::EnumerateValues(std::string tag, int index)
+{
+       return EnumValues(cache, tag.c_str(), index);
+}
 
 bool ConfigReader::Verify()
 {
-       return true;
+       return this->error;
 }