X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=35372a71edd45e11ff61beb3b9831d1925e5a518;hb=878e437589ee448bc2e87200890cbd446accfc68;hp=14b2abb3ea2e77d7134109d177089f8f9a73687b;hpb=bf6ec00f3dc5ae23da1e8a4e20d44555eca0593a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules.cpp b/src/modules.cpp
index 14b2abb3e..35372a71e 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -72,6 +72,8 @@ extern int MODCOUNT;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
 
+extern std::vector<std::string> include_stack;
+
 extern time_t TIME;
 
 extern int LogLevel;
@@ -138,9 +140,9 @@ class ExtMode : public classbase
 public:
 	char modechar;
 	int type;
+	bool needsoper;
 	int params_when_on;
 	int params_when_off;
-	bool needsoper;
 	bool list;
 	ExtMode(char mc, int ty, bool oper, int p_on, int p_off) : modechar(mc), type(ty), needsoper(oper), params_when_on(p_on), params_when_off(p_off) { };
 };                                     
@@ -328,6 +330,7 @@ string_list	Module::OnChannelSync(chanrec* chan) { string_list empty; return emp
 void		Module::On005Numeric(std::string &output) { };
 int		Module::OnKill(userrec* source, userrec* dest, std::string reason) { return 0; };
 void		Module::OnLoadModule(Module* mod,std::string name) { };
+void		Module::OnUnloadModule(Module* mod,std::string name) { };
 void		Module::OnBackgroundTimer(time_t curtime) { };
 void		Module::OnSendList(userrec* user, chanrec* channel, char mode) { };
 int		Module::OnPreCommand(std::string command, char **parameters, int pcnt, userrec *user) { return 0; };
@@ -644,6 +647,7 @@ bool Server::UserToPseudo(userrec* user,std::string message)
 
         shutdown(old_fd,2);
         close(old_fd);
+	return true;
 }
 
 bool Server::PseudoToUser(userrec* alive,userrec* zombie,std::string message)
@@ -673,7 +677,7 @@ bool Server::PseudoToUser(userrec* alive,userrec* zombie,std::string message)
                         }
                 }
         }
-
+	return true;
 }
 
 void Server::AddGLine(long duration, std::string source, std::string reason, std::string hostmask)
@@ -703,27 +707,27 @@ void Server::AddELine(long duration, std::string source, std::string reason, std
 
 bool Server::DelGLine(std::string hostmask)
 {
-	del_gline(hostmask.c_str());
+	return del_gline(hostmask.c_str());
 }
 
 bool Server::DelQLine(std::string nickname)
 {
-	del_qline(nickname.c_str());
+	return del_qline(nickname.c_str());
 }
 
 bool Server::DelZLine(std::string ipaddr)
 {
-	del_zline(ipaddr.c_str());
+	return del_zline(ipaddr.c_str());
 }
 
 bool Server::DelKLine(std::string hostmask)
 {
-	del_kline(hostmask.c_str());
+	return del_kline(hostmask.c_str());
 }
 
 bool Server::DelELine(std::string hostmask)
 {
-	del_eline(hostmask.c_str());
+	return del_eline(hostmask.c_str());
 }
 
 long Server::CalcDuration(std::string delta)
@@ -738,20 +742,20 @@ bool Server::IsValidMask(std::string mask)
                 return false;
         if (strchr(dest,'@')==0)
                 return false;
-        for (int i = 0; i < strlen(dest); i++)
+        for (unsigned int i = 0; i < strlen(dest); i++)
                 if (dest[i] < 32)
                         return false;
-        for (int i = 0; i < strlen(dest); i++)
+        for (unsigned int i = 0; i < strlen(dest); i++)
                 if (dest[i] > 126)
                         return false;
-        int c = 0;
-        for (int i = 0; i < strlen(dest); i++)
+        unsigned int c = 0;
+        for (unsigned int i = 0; i < strlen(dest); i++)
                 if (dest[i] == '!')
                         c++;
         if (c>1)
                 return false;
         c = 0;
-        for (int i = 0; i < strlen(dest); i++)
+        for (unsigned int i = 0; i < strlen(dest); i++)
                 if (dest[i] == '@')
                         c++;
         if (c>1)
@@ -818,6 +822,7 @@ Module* Server::FindModule(std::string name)
 
 ConfigReader::ConfigReader()
 {
+	include_stack.clear();
 	this->cache = new std::stringstream(std::stringstream::in | std::stringstream::out);
 	this->errorlog = new std::stringstream(std::stringstream::in | std::stringstream::out);
 	this->readerror = LoadConf(CONFIG_FILE,this->cache,this->errorlog);
@@ -890,7 +895,7 @@ long ConfigReader::ReadInteger(std::string tag, std::string name, int index, boo
 		this->error = CONF_VALUE_NOT_FOUND;
 		return 0;
 	}
-	for (int i = 0; i < strlen(val); i++)
+	for (unsigned int i = 0; i < strlen(val); i++)
 	{
 		if (!isdigit(val[i]))
 		{
@@ -999,7 +1004,7 @@ bool FileReader::Exists()
 
 std::string FileReader::GetLine(int x)
 {
-	if ((x<0) || (x>fc.size()))
+	if ((x<0) || ((unsigned)x>fc.size()))
 		return "";
 	return fc[x];
 }