next steps pokerthcleaner, read config file with badwords and settings, warn + kick procedure

src/chatcleaner/badwordcheck.cpp

@@ -4,17 +4,15 @@
 
 BadWordCheck::BadWordCheck()
 {
-	badWords << "arsch" << "asshole" << "bastard" << "bitch" << "cunt" << " dick " << "drecksau" << " fag " << "fagget" << "fotze" << "fuker" 
-			<< "fuck" << " fuk " << "gay" << "horny" << "hure" << "mistgeburt" << "missgeburt" << "motherfucker" << "nazi" << "nigga" 
-			<< "nigger" << "nutte" << "ommak" << "penis" << "pussy" << "schlampe" << "schwanz" << "sex" << "shit" << "sieg heil" << "slut" 
-			<< "suck" << "whore";
 }
 
 bool BadWordCheck::run(QString msg) 
 {
+	msg = msg.toLower();
+	
 	QStringListIterator it(badWords);
 	while (it.hasNext()) {
-		if(msg.toLower().contains(it.next()))
+		if(msg.contains(it.next()))
 			return true;
 	}
 	return false;

src/chatcleaner/badwordcheck.h

@@ -8,7 +8,10 @@ Q_OBJECT
 public:
     BadWordCheck();
 	
+	void setBadWords(QStringList bw) { badWords = bw; }
+	
 	bool run(QString);
+	
 private:
 	
 	QStringList badWords;

src/chatcleaner/chatcleaner.cpp

@@ -5,6 +5,5 @@ int main(int argc, char *argv[])
 {
     QCoreApplication a(argc, argv);
 	CleanerServer server;
-	qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
     return a.exec();
 }

src/chatcleaner/cleanerconfig.cpp

@@ -0,0 +1,584 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Felix Hammer   *
+ *   f.hammer@web.de   *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#include "cleanerconfig.h"
+#include "tinyxml.h"
+
+#define MODUS 0711
+
+#ifdef _WIN32
+#include <windows.h>
+#include <direct.h>
+#endif
+
+#include <iostream>
+#include <sstream>
+#include <cstdlib>
+#include <fstream>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <QtCore>
+
+using namespace std;
+
+
+CleanerConfig::CleanerConfig()
+{
+	// !!!! Revisionsnummer der Configdefaults !!!!!
+	configRev = 1;
+	
+	// Pfad und Dateinamen setzen
+#ifdef _WIN32
+	const char *appDataPath = getenv("AppData");
+	if (appDataPath && appDataPath[0] != 0) {
+		configFileName = appDataPath; 
+	}
+	else {
+		const int MaxPathSize = 1024;
+		char curDir[MaxPathSize + 1];
+		curDir[0] = 0;
+		_getcwd(curDir, MaxPathSize);
+		curDir[MaxPathSize] = 0;
+		configFileName = curDir;
+		// Testen ob das Verzeichnis beschreibbar ist
+		ofstream tmpFile;
+		const char *tmpFileName = "pokerth_test.tmp";
+		tmpFile.open((configFileName + "\\" + tmpFileName).c_str());
+		if (tmpFile) {
+			// Erfolgreich, Verzeichnis beschreibbar.
+			// Datei wieder loeschen.
+			tmpFile.close();
+			remove((configFileName + "\\" + tmpFileName).c_str());
+		}
+		else {
+			// Fehlgeschlagen, Verzeichnis nicht beschreibbar
+			curDir[0] = 0;
+			GetTempPathA(MaxPathSize, curDir);
+			curDir[MaxPathSize] = 0;
+			configFileName = curDir;
+		}
+	}
+	//define app-dir
+	configFileName += "\\pokerth\\";
+	////define log-dir
+// 	logDir = configFileName;
+// 	logDir += "log-files\\";
+	
+	//create directories on first start of app
+	mkdir(configFileName.c_str());
+// 	mkdir(logDir.c_str());
+	
+		
+#else
+	//define app-dir
+	const char *homePath = getenv("HOME");
+	if(homePath) {
+		configFileName = homePath;
+		configFileName += "/.pokerth/";
+		////define log-dir
+// 		logDir = configFileName;
+// 		logDir += "log-files/";
+		//create directories on first start of app
+		mkdir(configFileName.c_str(), MODUS) ;
+// 		mkdir(logDir.c_str(), MODUS);
+	
+	}
+	
+#endif
+
+	string userDir = configFileName.c_str();
+
+	ostringstream tempIntToString;
+	tempIntToString << configRev;
+
+	configList.push_back(ConfigInfo("ConfigRevision", CONFIG_TYPE_INT, tempIntToString.str()));
+	configList.push_back(ConfigInfo("Language", CONFIG_TYPE_STRING, getDefaultLanguage()));
+
+	configList.push_back(ConfigInfo("HostAddress", CONFIG_TYPE_STRING, "127.0.0.1"));
+	configList.push_back(ConfigInfo("DefaultListenPort", CONFIG_TYPE_STRING, "4327"));
+	configList.push_back(ConfigInfo("WarnLevelToKick", CONFIG_TYPE_INT, "1"));
+	configList.push_back(ConfigInfo("TextFloodLevelToTrigger", CONFIG_TYPE_INT, "3"));
+	
+	list<string> badWordsList;
+	
+	badWordsList.push_back("arsch");
+	badWordsList.push_back("asshole");
+	badWordsList.push_back("bastard");
+	badWordsList.push_back("bitch");
+	badWordsList.push_back("cunt");
+	badWordsList.push_back(" dick ");
+	badWordsList.push_back("drecksau");
+	badWordsList.push_back(" fag ");
+	badWordsList.push_back("fagget");
+	badWordsList.push_back("fotze");
+	badWordsList.push_back("fuker");
+	badWordsList.push_back("fuck");
+	badWordsList.push_back(" fuk ");
+	badWordsList.push_back("gay");
+	badWordsList.push_back("horny");
+	badWordsList.push_back("hure");
+	badWordsList.push_back("mistgeburt");
+	badWordsList.push_back("missgeburt");
+	badWordsList.push_back("motherfucker");
+	badWordsList.push_back("nazi");
+	badWordsList.push_back("nigga");
+	badWordsList.push_back("nigger");
+	badWordsList.push_back("nutte");
+	badWordsList.push_back("ommak");
+	badWordsList.push_back("penis");
+	badWordsList.push_back("pussy");
+	badWordsList.push_back("schlampe");
+	badWordsList.push_back("schwanz");
+	badWordsList.push_back("sex");
+	badWordsList.push_back("shit");
+	badWordsList.push_back("sieg heil");
+	badWordsList.push_back("slut");
+	badWordsList.push_back("suck");
+	badWordsList.push_back("whore");
+
+	configList.push_back(ConfigInfo("BadWordsList", CONFIG_TYPE_STRING_LIST, "BadWords", badWordsList));
+
+	//fill tempList firstTime
+	configBufferList = configList;
+
+	configFileName += "cleanerconfig.xml";
+	
+	//Prüfen ob Configfile existiert --> sonst anlegen
+	TiXmlDocument doc(configFileName); 
+	if(!doc.LoadFile()){ 
+		myConfigState = NONEXISTING;
+		updateConfig(myConfigState); 
+	}
+	else { 
+	//Check if config revision is ok. Otherwise --> update()
+		int tempRevision = 0;
+		
+		TiXmlHandle docHandle( &doc );		
+		TiXmlElement* confRevision = docHandle.FirstChild( "PokerTHCleaner" ).FirstChild( "Configuration" ).FirstChild( "ConfigRevision" ).ToElement();
+		if ( confRevision ) { confRevision->QueryIntAttribute("value", &tempRevision ); }
+
+		if (tempRevision < configRev ) { /*löschen()*/ 
+			myConfigState = OLD;
+			updateConfig(myConfigState) ;
+		}
+	}
+	
+
+	fillBuffer();
+}
+
+
+CleanerConfig::~CleanerConfig()
+{
+}
+
+
+void CleanerConfig::fillBuffer() {
+
+	size_t i;
+	string tempString1("");
+	string tempString2("");
+
+	TiXmlDocument doc(configFileName); 
+		
+	if(doc.LoadFile()) {
+	TiXmlHandle docHandle( &doc );	
+
+		for (i=0; i<configBufferList.size(); i++) {	
+	
+			TiXmlElement* conf = docHandle.FirstChild( "PokerTHCleaner" ).FirstChild( "Configuration" ).FirstChild( configList[i].name ).ToElement();
+				
+			if ( conf ) {
+
+				const char *tmpStr1 = conf->Attribute("value");
+				if (tmpStr1) tempString1 = tmpStr1;
+				configBufferList[i].defaultValue = tempString1;
+
+				const char *tmpStr2 = conf->Attribute("type");
+				if (tmpStr2) {
+					tempString2 = tmpStr2; 
+					if(tempString2 == "list") {
+				
+						list<string> tempStringList2;
+
+						TiXmlElement* confList = docHandle.FirstChild( "PokerTHCleaner" ).FirstChild( "Configuration" ).FirstChild( configList[i].name ).FirstChild().ToElement();
+						
+						for( ; confList; confList=confList->NextSiblingElement()) {
+							tempStringList2.push_back(confList->Attribute("value"));
+						}
+						
+						configBufferList[i].defaultListValue = tempStringList2;
+					}
+				}
+			}	
+			else { qDebug("Could not find the root element in the config file!"); }
+		}
+	}
+}
+
+void CleanerConfig::writeBuffer() const {
+
+	TiXmlDocument doc;  
+	TiXmlDeclaration * decl = new TiXmlDeclaration( "1.0", "UTF-8", ""); 
+	doc.LinkEndChild( decl );  
+		
+	TiXmlElement * root = new TiXmlElement( "PokerTHCleaner" );  
+	doc.LinkEndChild( root );  		
+		
+	TiXmlElement * config;
+	config = new TiXmlElement( "Configuration" );  
+	root->LinkEndChild( config );  
+
+	size_t i;
+
+	for (i=0; i<configBufferList.size(); i++) {
+		TiXmlElement *tmpElement = new TiXmlElement(configBufferList[i].name);
+		config->LinkEndChild( tmpElement );
+		tmpElement->SetAttribute("value", configBufferList[i].defaultValue);
+	
+		if(configBufferList[i].type == CONFIG_TYPE_INT_LIST || configBufferList[i].type == CONFIG_TYPE_STRING_LIST) {
+
+			tmpElement->SetAttribute("type", "list");
+			list<string> tempList = configBufferList[i].defaultListValue;
+			list<string>::iterator it;
+			for(it = tempList.begin(); it != tempList.end(); it++) {
+		
+				TiXmlElement *tmpSubElement = new TiXmlElement(configBufferList[i].defaultValue);
+				tmpElement->LinkEndChild( tmpSubElement );
+				tmpSubElement->SetAttribute("value", *it);
+			}
+
+		}
+	}	
+	doc.SaveFile( configFileName );
+
+}
+
+void CleanerConfig::updateConfig(ConfigState myConfigState) {
+
+	size_t i;
+	
+	if(myConfigState == NONEXISTING) {
+		
+		//Create a new ConfigFile!
+		TiXmlDocument doc;  
+		TiXmlDeclaration * decl = new TiXmlDeclaration( "1.0", "UTF-8", ""); 
+		doc.LinkEndChild( decl );  
+		
+		TiXmlElement * root = new TiXmlElement( "PokerTHCleaner" );  
+		doc.LinkEndChild( root );  		
+		
+		TiXmlElement * config;
+		config = new TiXmlElement( "Configuration" );  
+		root->LinkEndChild( config );  
+
+		for (i=0; i<configList.size(); i++) {
+			TiXmlElement *tmpElement = new TiXmlElement(configList[i].name);
+			config->LinkEndChild( tmpElement );
+			tmpElement->SetAttribute("value", stringToUtf8(configList[i].defaultValue));
+
+			if(configList[i].type == CONFIG_TYPE_INT_LIST || configList[i].type == CONFIG_TYPE_STRING_LIST) {
+
+				tmpElement->SetAttribute("type", "list");
+				list<string> tempList = configList[i].defaultListValue;
+				list<string>::iterator it;
+				for(it = tempList.begin(); it != tempList.end(); it++) {
+			
+					TiXmlElement *tmpSubElement = new TiXmlElement(configList[i].defaultValue);
+					tmpElement->LinkEndChild( tmpSubElement );
+					tmpSubElement->SetAttribute("value", *it);
+				}
+
+			}
+		}
+			
+		doc.SaveFile( configFileName );
+	}
+
+
+	if(myConfigState == OLD) {
+	
+		TiXmlDocument oldDoc(configFileName); 
+		
+		//load the old one
+		if(oldDoc.LoadFile()) {
+			
+			string tempString1("");
+			string tempString2("");			
+ 
+			TiXmlDocument newDoc;
+			
+			//Create the new one
+			TiXmlDeclaration * decl = new TiXmlDeclaration( "1.0", "UTF-8", ""); 
+			newDoc.LinkEndChild( decl );  
+				
+			TiXmlElement * root = new TiXmlElement( "PokerTHCleaner" );  
+			newDoc.LinkEndChild( root );  		
+			
+			TiXmlElement * config;
+			config = new TiXmlElement( "Configuration" );  
+			root->LinkEndChild( config ); 
+
+			//change configRev and AppDataPath				
+			TiXmlElement * confElement0 = new TiXmlElement( "ConfigRevision" ); 
+			config->LinkEndChild( confElement0 );
+			confElement0->SetAttribute("value", configRev);
+
+			TiXmlHandle oldDocHandle( &oldDoc );	
+
+			for (i=0; i<configList.size(); i++) {	
+
+				TiXmlElement* oldConf = oldDocHandle.FirstChild( "PokerTHCleaner" ).FirstChild( "Configuration" ).FirstChild( configList[i].name ).ToElement();
+				
+				if ( oldConf ) {
+				// if element is already there --> take over the saved values
+					
+					if(configList[i].name != "ConfigRevision") {
+							// dont update ConfigRevision because it was already set ^
+	
+						TiXmlElement *tmpElement = new TiXmlElement(configList[i].name);
+						config->LinkEndChild( tmpElement );
+						
+						const char *tmpStr1 = oldConf->Attribute("value");
+						if (tmpStr1) tempString1 = tmpStr1;
+						tmpElement->SetAttribute("value", tempString1);
+	
+						//for lists copy elements
+						const char *tmpStr2 = oldConf->Attribute("type");
+						if (tmpStr2) {
+							tempString2 = tmpStr2; 
+							if(tempString2 == "list") {
+					
+								list<string> tempStringList2;
+	
+								TiXmlElement* oldConfList = oldDocHandle.FirstChild( "PokerTHCleaner" ).FirstChild( "Configuration" ).FirstChild( configList[i].name ).FirstChild().ToElement();
+							
+								for( ; oldConfList; oldConfList=oldConfList->NextSiblingElement()) {
+									tempStringList2.push_back(oldConfList->Attribute("value"));
+									}
+								
+								tmpElement->SetAttribute("type", "list");
+								list<string> tempList = tempStringList2;
+								list<string>::iterator it;
+								for(it = tempList.begin(); it != tempList.end(); it++) {
+								
+									TiXmlElement *tmpSubElement = new TiXmlElement(tempString1);
+									tmpElement->LinkEndChild( tmpSubElement );
+									tmpSubElement->SetAttribute("value", *it);
+								}
+							}
+						}
+					}
+				}
+				else {
+					// if element is not there --> set it with defaultValue
+					TiXmlElement *tmpElement = new TiXmlElement(configList[i].name);
+					config->LinkEndChild( tmpElement );
+					tmpElement->SetAttribute("value", stringToUtf8(configList[i].defaultValue));
+					
+					if(configList[i].type == CONFIG_TYPE_INT_LIST || configList[i].type == CONFIG_TYPE_STRING_LIST) {
+		
+						tmpElement->SetAttribute("type", "list");
+						list<string> tempList = configList[i].defaultListValue;
+						list<string>::iterator it;
+						for(it = tempList.begin(); it != tempList.end(); it++) {
+					
+							TiXmlElement *tmpSubElement = new TiXmlElement(configList[i].defaultValue);
+							tmpElement->LinkEndChild( tmpSubElement );
+							tmpSubElement->SetAttribute("value", *it);
+						}
+					}
+				}
+			}	
+			newDoc.SaveFile( configFileName );
+		}
+		else { qDebug("Cannot update config file: Unable to load configuration."); }
+
+		
+	}
+}
+
+string CleanerConfig::readConfigString(string varName) const
+{
+
+	size_t i;
+	string tempString("");
+
+	for (i=0; i<configBufferList.size(); i++) {	
+
+		if (configBufferList[i].name == varName) {
+			tempString = configBufferList[i].defaultValue;	
+		}
+	}
+
+	return tempString;
+ }
+
+int CleanerConfig::readConfigInt(string varName) const
+{
+
+	size_t i;
+	string tempString("");
+	int tempInt=0;
+
+	for (i=0; i<configBufferList.size(); i++) {	
+
+		if (configBufferList[i].name == varName) {
+			tempString = configBufferList[i].defaultValue;
+		}
+	}
+	
+	istringstream isst;
+	isst.str (tempString);
+	isst >> tempInt;
+	
+	return tempInt;
+}
+
+list<string> CleanerConfig::readConfigStringList(string varName) const
+{
+
+	size_t i;	
+	list<string> tempStringList;
+
+	for (i=0; i<configBufferList.size(); i++) {	
+
+		if (configBufferList[i].name == varName) {
+			tempStringList = configBufferList[i].defaultListValue;	
+		}
+	}
+
+	return tempStringList;
+ }
+
+
+list<int> CleanerConfig::readConfigIntList(string varName) const
+{
+
+	size_t i;
+	list<string> tempStringList;
+	list<int> tempIntList;
+
+	for (i=0; i<configBufferList.size(); i++) {	
+
+		if (configBufferList[i].name == varName) {
+			tempStringList = configBufferList[i].defaultListValue;
+		}
+	}
+	
+	istringstream isst;
+	string tempString;
+	int tempInt;
+	list<string>::iterator it;
+	for(it = tempStringList.begin(); it != tempStringList.end(); it++) {
+		
+		isst.str(*it);
+		isst >> tempInt;
+		tempIntList.push_back(tempInt);
+		isst.str("");
+		isst.clear();
+	}
+
+	return tempIntList;
+}
+
+
+void CleanerConfig::writeConfigInt(string varName, int varCont)
+{
+
+	size_t i;
+	string tempString;
+	ostringstream intToString;
+
+	for (i=0; i<configBufferList.size(); i++) {	
+
+		if (configBufferList[i].name == varName) {
+			intToString << varCont;
+			configBufferList[i].defaultValue = intToString.str();	
+		}
+	}
+}
+
+
+void CleanerConfig::writeConfigIntList(string varName, list<int> varCont)
+{
+
+	size_t i;
+	ostringstream intToString;
+	list<string> stringList;
+
+	for (i=0; i<configBufferList.size(); i++) {	
+
+		if (configBufferList[i].name == varName) {
+			string tempString;
+			list<int>::iterator it;
+			for(it = varCont.begin(); it != varCont.end(); it++) {
+			
+				intToString << (*it);	
+				stringList.push_back(intToString.str());
+				intToString.str("");
+				intToString.clear();
+			}
+			
+			configBufferList[i].defaultListValue = stringList;	
+		}
+	}
+}
+
+void CleanerConfig::writeConfigStringList(string varName, list<string> varCont)
+{
+
+	size_t i;
+	list<string> stringList;
+
+	for (i=0; i<configBufferList.size(); i++) {	
+
+		if (configBufferList[i].name == varName) {
+			
+			configBufferList[i].defaultListValue = varCont;	
+		}
+	}
+}
+
+void CleanerConfig::writeConfigString(string varName, string varCont)
+{
+
+	size_t i;
+	for (i=0; i<configBufferList.size(); i++) {	
+		if (configBufferList[i].name == varName) { configBufferList[i].defaultValue = varCont; }
+	}
+
+}
+std::string CleanerConfig::stringToUtf8(const std::string &myString) {
+
+	QString tmpString = QString::fromStdString(myString);
+	std::string myUtf8String = tmpString.toUtf8().constData();
+	
+	return myUtf8String;
+}
+
+std::string CleanerConfig::stringFromUtf8(const std::string &myString) {
+	QString tmpString = QString::fromUtf8(myString.c_str());
+	
+	return tmpString.toStdString();
+}
+
+std::string CleanerConfig::getDefaultLanguage() { return QLocale::system().name().toStdString(); }

src/chatcleaner/cleanerconfig.h

@@ -0,0 +1,81 @@
+/***************************************************************************
+ *   Copyright (C) 2009 by Felix Hammer   *
+ *   f.hammer@web.de   *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef CLEANERCONFIG_H
+#define CLEANERCONFIG_H
+
+#include <vector>
+#include <string>
+#include <list>
+
+enum ConfigState { NONEXISTING, OLD };
+enum ConfigType { CONFIG_TYPE_INT, CONFIG_TYPE_STRING, CONFIG_TYPE_INT_LIST, CONFIG_TYPE_STRING_LIST };
+
+
+class CleanerConfig{
+public:
+	CleanerConfig();
+
+	~CleanerConfig();
+	
+	void fillBuffer();
+	void writeBuffer() const;
+
+	void updateConfig(ConfigState);
+
+	int readConfigInt(std::string varName) const;
+	std::string readConfigString(std::string varName) const;
+	std::list<int> readConfigIntList(std::string varName) const;
+	std::list<std::string> readConfigStringList(std::string varName) const;
+		
+	void writeConfigInt(std::string varName, int varCont);
+	void writeConfigString(std::string varName, std::string varCont);
+	void writeConfigIntList(std::string varName, std::list<int> varCont);
+	void writeConfigStringList(std::string varName, std::list<std::string> varCont);
+
+	std::string stringToUtf8(const std::string & );
+	std::string stringFromUtf8(const std::string &);
+	std::string getDefaultLanguage();
+
+private:
+
+	struct ConfigInfo
+	{
+		ConfigInfo(const std::string &n, ConfigType t, const std::string &d, const std::list<std::string> &l =std::list<std::string>()) : name(n), type(t), defaultValue(d), defaultListValue(l) {}
+		std::string name;
+		ConfigType type;
+		std::string defaultValue;
+		std::list<std::string> defaultListValue;
+		
+	};
+	
+	std::vector<ConfigInfo> configList;
+	std::vector<ConfigInfo> configBufferList;
+
+	std::string configFileName;
+	std::string logDir;
+	std::string dataDir;
+	std::string cacheDir;
+	int configRev;
+
+	ConfigState myConfigState;
+
+};
+
+#endif

src/chatcleaner/cleanerserver.cpp

@@ -5,19 +5,26 @@
 #include <stdlib.h>
 
 #include "messagefilter.h"
+#include "cleanerconfig.h"
 
-CleanerServer::CleanerServer()
+CleanerServer::CleanerServer(): config(0)
 {
-	 myMessageFilter = new MessageFilter;
-	 tcpServer = new QTcpServer();
-     if (!tcpServer->listen(QHostAddress("127.0.0.1"), 7777) ) {
-         qDebug() << QString("Unable to start the server: %1.").arg(tcpServer->errorString());
-         return;
-     }
+	config = new CleanerConfig;
+	
+	myMessageFilter = new MessageFilter(config);
+	tcpServer = new QTcpServer();
+	tcpServer->setMaxPendingConnections(1);
+	
+	if (!tcpServer->listen(QHostAddress(QString::fromUtf8(config->readConfigString("HostAddress").c_str())), config->readConfigInt("DefaultListenPort")) ) {
+	 qDebug() << QString("Unable to start the server: %1.").arg(tcpServer->errorString());
+	 return;
+	}
+	
+	qDebug() << QString("The server is running on port %1.").arg(tcpServer->serverPort());
 
-	 qDebug() << QString("The server is running on port %1.").arg(tcpServer->serverPort());
-	 
-     connect(tcpServer, SIGNAL(newConnection()), this, SLOT(newCon()));
+	connect(tcpServer, SIGNAL(newConnection()), this, SLOT(newCon()));
+	
+	refreshConfig();
 }
 
 CleanerServer::~CleanerServer() 
@@ -32,9 +39,21 @@ void CleanerServer::newCon()
 
 void CleanerServer::onRead()
 {
-	char buf[20000];
+	char buf[1024];
     tcpSocket->readLine(buf, sizeof(buf));
 	QString message = QString::fromUtf8("%1").arg(buf);
-	QString checkMessage = myMessageFilter->check(message);
+	
+	// TESTING DEFAULT VALUES
+	QString nick = "PlayerNick";
+	unsigned playerId = 1;
+	// TESTING DEFAULT VALUES
+	
+	QString checkMessage = myMessageFilter->check(playerId, nick, message);
 	tcpSocket->write(checkMessage.toAscii().data(), checkMessage.length());
 }
+
+void CleanerServer::refreshConfig() {
+
+//	config->fillBuffer();
+	myMessageFilter->refreshConfig();
+}

src/chatcleaner/cleanerserver.h

@@ -5,6 +5,7 @@
 #include <QtNetwork>
 
 class MessageFilter;
+class CleanerConfig;
 
 class CleanerServer: public QObject {
 Q_OBJECT
@@ -16,12 +17,15 @@ public:
 private slots:
      void newCon();
 	 void onRead();
+	 
+	 void refreshConfig();
 
 private:
      QTcpServer *tcpServer;
 	 QTcpSocket *tcpSocket;
 	 MessageFilter *myMessageFilter;
 		 
+	 CleanerConfig *config;
 };
 
 #endif // CLEANERSERVER_H

src/chatcleaner/messagefilter.cpp

@@ -3,25 +3,98 @@
 #include <QtCore>
 #include "badwordcheck.h"
 #include "textfloodcheck.h"
+#include "cleanerconfig.h"
+
+enum ActionType {
+	NOTHING,
+	WARN,
+	KICK };
 
 enum OffenceType {
+	NONE,
 	BAD_WORD,
 	TEXT_FLOOD_LINES };
 
-MessageFilter::MessageFilter()
+MessageFilter::MessageFilter(CleanerConfig *c): config(c)
 {
 	myBadWordCheck = new BadWordCheck;
 	myTextFloodCheck = new TextFloodCheck;
 }
 
-QString MessageFilter::check(QString msg) 
+QString MessageFilter::check(unsigned playerId, QString nick, QString msg) 
 {
-	if(myBadWordCheck->run(msg)) {
-		return QString("<PokerTHCleaner> Der Blitz soll dich beim Scheißen erschlagen du Spammer\n");
-	}
-	if(myTextFloodCheck->run(1)) {
-		return QString("<PokerTHCleaner> Bitte langsamer schreiben!!!\n");
-	}
+	QString returnMessage;
 	
-	return QString("");
+	OffenceType offence = NONE;
+	ActionType action = NOTHING;
+	
+	if(myBadWordCheck->run(msg)) offence = BAD_WORD;
+	if(myTextFloodCheck->run(playerId)) offence = TEXT_FLOOD_LINES;
+	
+	if(offence){
+	
+		QMap<unsigned, ClientWarnInfos>::const_iterator i = myClientWarnLevelList.find(playerId);
+		
+		if(i == myClientWarnLevelList.end()) {
+			myClientWarnInfos.warnLevel = 1;
+			myClientWarnInfos.lastWarnType = offence;
+			myClientWarnInfos.nick = nick;
+			myClientWarnLevelList.insert(playerId, myClientWarnInfos);
+			action = WARN;
+		}
+		else {
+			if(i.value().warnLevel == warnLevelToKick) {	
+//				Kick Command
+				action = KICK;
+				myClientWarnLevelList.remove(i.key());
+			}
+			else {
+				myClientWarnInfos.warnLevel++;
+				myClientWarnInfos.lastWarnType = offence;
+				myClientWarnInfos.nick = nick;
+				myClientWarnLevelList.insert(playerId, myClientWarnInfos);
+				action = WARN;
+			}
+		}
+		
+		if(action == KICK) {
+			returnMessage = QString("Kick: %1\n").arg(nick);
+		}
+		if(action == WARN) {
+			
+			switch(offence) {
+				case BAD_WORD: {
+					returnMessage = QString ("<PokerTHCleaner> %1: Warning! No racial, religious, or sexually inflammatory language!\n").arg(nick);
+				}
+				break;
+				case TEXT_FLOOD_LINES: {
+					returnMessage = QString ("<PokerTHCleaner> %1: Warning! You've triggered text flood (lines) protection, slow down your typing!\n").arg(nick);
+				}
+				break;
+				default:;
+			}
+		}
+	}
+	else {
+		returnMessage = QString("");
+	}
+	return returnMessage;
+}
+
+void MessageFilter::refreshConfig() {
+
+	//	global settings
+	warnLevelToKick = config->readConfigInt("WarnLevelToKick");
+	
+	// special check settings
+	//Bad Words
+	std::list<std::string> badWordsList = config->readConfigStringList("BadWordsList");
+	std::list<std::string>::iterator it1;
+	QStringList bwList;
+	for(it1= badWordsList.begin(); it1 != badWordsList.end(); it1++) {
+		bwList << QString::fromUtf8(it1->c_str());
+	}
+	myBadWordCheck->setBadWords(bwList);
+	
+	myTextFloodCheck->setTextFloodLevelToTrigger(config->readConfigInt("TextFloodLevelToTrigger"));
 }

src/chatcleaner/messagefilter.h

@@ -6,14 +6,16 @@
 
 class BadWordCheck;
 class TextFloodCheck;
+class CleanerConfig;
 
 class MessageFilter: public QObject {
 Q_OBJECT
 public:
-    MessageFilter();
+    MessageFilter(CleanerConfig*);
 
-	QString check(QString);
-			
+	QString check(unsigned, QString, QString);
+	void refreshConfig();	
+	
 private: 
 	BadWordCheck *myBadWordCheck;
 	TextFloodCheck *myTextFloodCheck;
@@ -23,9 +25,12 @@ private:
 		int lastWarnType; 
 		int warnLevel; 
 	};
+	ClientWarnInfos myClientWarnInfos;
+	QMap<unsigned, ClientWarnInfos> myClientWarnLevelList;
 	
-	QMap<unsigned, ClientWarnInfos> clientWarnLevelList;
+	int warnLevelToKick;
 	
+	CleanerConfig *config;
 };
 
 #endif // MESSAGEFILTER_H

src/chatcleaner/textfloodcheck.cpp

@@ -1,9 +1,17 @@
 #include "textfloodcheck.h"
+#include <QtCore>
 
 TextFloodCheck::TextFloodCheck()
 {
 	timer.reset();
 	timer.start();
+	     
+	cleanTimer = new QTimer();
+	
+	connect(cleanTimer, SIGNAL(timeout()), this, SLOT(cleanMsgTimesList()));
+
+	cleanTimer->start(4000);
+			
 }
 
 bool TextFloodCheck::run(unsigned playerId) {
@@ -23,12 +31,10 @@ bool TextFloodCheck::run(unsigned playerId) {
 	}
 	else {
 		if(timer.elapsed().total_seconds()-i.value().timeStamp <= 1) {
-			if(i.value().floodLevel == 2)
+			if(i.value().floodLevel == textFloodLevelToTrigger)
 				return true;
-			else if(i.value().floodLevel == 1)
-				myTextFloodInfos.floodLevel = 2;
 			else
-				myTextFloodInfos.floodLevel = 1;
+				myTextFloodInfos.floodLevel++;
 				
 		}
 		myTextFloodInfos.timeStamp = timer.elapsed().total_seconds();
@@ -39,5 +45,25 @@ bool TextFloodCheck::run(unsigned playerId) {
 
 void TextFloodCheck::cleanMsgTimesList() {
 
+	QMapIterator<unsigned, TextFloodInfos> it(msgTimesList);
+	while (it.hasNext()) {
+		 it.next();
+		 if(timer.elapsed().total_seconds()-it.value().timeStamp > 3) {
+			 
+			if(it.value().floodLevel == 0)
+				msgTimesList.remove(it.key());
+				
+			else {
+				myTextFloodInfos.floodLevel--;
+				myTextFloodInfos.timeStamp = it.value().timeStamp;
+				msgTimesList.insert(it.key(), myTextFloodInfos);
+			}
+		}
+		qDebug() << msgTimesList.count() << it.key() << ": " << it.value().floodLevel << it.value().timeStamp << endl;
+	}
+}
 
+void TextFloodCheck::removeNickFromList(unsigned playerId) {
+	
+	msgTimesList.remove(playerId);
 }

src/chatcleaner/textfloodcheck.h

@@ -6,15 +6,22 @@
 #include <stdlib.h>
 
 
-class TextFloodCheck
+class TextFloodCheck: public QObject
 {
+	Q_OBJECT
 public:
     TextFloodCheck();
+	
+	void setTextFloodLevelToTrigger(int level) { textFloodLevelToTrigger = level; }
+	
 	bool run(unsigned);
+	
+public slots:
 	void cleanMsgTimesList();
+	void removeNickFromList(unsigned);
 	
 private: 
-	QTimer cleanTimer;
+	QTimer *cleanTimer;
 	boost::timers::portable::second_timer timer;
 	struct TextFloodInfos {
 		int floodLevel;
@@ -22,6 +29,8 @@ private:
 	};
 	TextFloodInfos myTextFloodInfos;
 	QMap<unsigned, TextFloodInfos> msgTimesList;
+	
+	int textFloodLevelToTrigger;
 };
 
 #endif // TEXTFLOODCHECK_H