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 bbea0d4124cb1f39eccac079e9d41a42876e4289..ca3c2e423e9adc37909f62ca668aa931426c0f4d 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -12,10 +12,12 @@
 #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;
@@ -156,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)
@@ -171,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)
 {
@@ -250,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)
@@ -338,9 +355,15 @@ ConfigReader::ConfigReader(std::string filename)
 
 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(cache,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);
 }
 
 
@@ -349,6 +372,10 @@ int ConfigReader::Enumerate(std::string tag)
        return EnumConf(cache,tag.c_str());
 }
 
+int ConfigReader::EnumerateValues(std::string tag, int index)
+{
+       return EnumValues(cache, tag.c_str(), index);
+}
 
 bool ConfigReader::Verify()
 {