* ---------------------------------------------------
*/
+using namespace std;
+
#include <stdio.h>
#include <string>
#include "users.h"
#include "channels.h"
#include "modules.h"
+#include "helperfuncs.h"
/* $ModDesc: Provides user and channel +G mode */
ConfigReader *Conf, *MyConf;
public:
- ModuleCensor()
+ ModuleCensor(Server* Me)
+ : Module::Module(Me)
{
- // read the configuration file on startup.
- // it is perfectly valid to set <censor file> to the value of the
- // main config file, then append your <badword> tags to the bottom
- // of the main config... but rather messy. That's why the capability
- // of using a seperate config file is provided.
- Srv = new Server;
+ /*
+ * read the configuration file on startup.
+ * it is perfectly valid to set <censor file> to the value of the
+ * main config file, then append your <badword> tags to the bottom
+ * of the main config... but rather messy. That's why the capability
+ * of using a seperate config file is provided.
+ *
+ * XXX - Really, it'd be nice to scraip this kind of thing, and have something like
+ * an include directive to include additional configuration files. Might make our lives easier. --w00t
+ *
+ * XXX - These module pre-date the include directive which exists since beta 5 -- Brain
+ */
+ Srv = Me;
Conf = new ConfigReader;
std::string Censorfile = Conf->ReadValue("censor","file",0);
MyConf = new ConfigReader(Censorfile);
if ((Censorfile == "") || (!MyConf->Verify()))
{
printf("Error, could not find <censor file=\"\"> definition in your config file!");
- exit(0);
+ log(DEFAULT,"Error, could not find <censor file=\"\"> definition in your config file!");
+ return;
}
Srv->Log(DEFAULT,std::string("m_censor: read configuration from ")+Censorfile);
Srv->AddExtendedMode('G',MT_CHANNEL,false,0,0);
}
temp2 = temp2 + temp1 + " ";
}
- output = temp2.substr(0,temp2.length()-1);
+ if (temp2.length())
+ output = temp2.substr(0,temp2.length()-1);
}
virtual ~ModuleCensor()
{
- delete Srv;
delete MyConf;
delete Conf;
}
{
if ((pattern != "") && (text != ""))
{
- while (strstr(text.c_str(),pattern.c_str()))
+ while (text.find(pattern) != std::string::npos)
{
int pos = text.find(pattern);
text.erase(pos,pattern.length());
for (int index = 0; index < MyConf->Enumerate("badword"); index++)
{
std::string pattern = MyConf->ReadValue("badword","text",index);
- if (strstr(text.c_str(),pattern.c_str()))
+ if (text.find(pattern) != std::string::npos)
{
std::string replace = MyConf->ReadValue("badword","replace",index);
{
this->ReplaceLine(text,pattern,replace);
}
-
- return 0;
}
}
return 0;
for (int index = 0; index < MyConf->Enumerate("badword"); index++)
{
std::string pattern = MyConf->ReadValue("badword","text",index);
- if (strstr(text.c_str(),pattern.c_str()))
+ if (text.find(pattern) != std::string::npos)
{
std::string replace = MyConf->ReadValue("badword","replace",index);
{
this->ReplaceLine(text,pattern,replace);
}
-
- return 0;
}
}
return 0;
}
- virtual void OnRehash()
+ virtual void OnRehash(std::string parameter)
{
- // reload our config file on rehash - we must destroy and re-allocate the classes
- // to call the constructor again and re-read our data.
+ /*
+ * reload our config file on rehash - we must destroy and re-allocate the classes
+ * to call the constructor again and re-read our data.
+ */
delete Conf;
delete MyConf;
Conf = new ConfigReader;
{
// bail if the user forgot to create a config file
printf("Error, could not find <censor file=\"\"> definition in your config file!");
- exit(0);
+ log(DEFAULT,"Error, could not find <censor file=\"\"> definition in your config file!");
}
Srv->Log(DEFAULT,std::string("m_censor: read configuration from ")+Censorfile);
}
virtual Version GetVersion()
{
// This is version 2 because version 1.x is the unreleased unrealircd module
- return Version(1,0,0,0);
+ return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
}
};
{
}
- virtual Module * CreateModule()
+ virtual Module * CreateModule(Server* Me)
{
- return new ModuleCensor;
+ return new ModuleCensor(Me);
}
};