diff -r e8dfe9d57452 -r d9435c53b0eb src/BaseClient.cpp
--- a/src/BaseClient.cpp	Thu Feb 17 20:25:10 2011 +0800
+++ b/src/BaseClient.cpp	Sat May 14 18:10:14 2011 +0800
@@ -429,14 +429,6 @@
 	m_bUnicodeSupport = false;
 	uint32 dwEmuleTags = 0;
 
-	//Dynamic Leecher Protect - Bill Lee
-	bool wronghello = false; //Xman Anti-Leecher
-	uint32 hellotagorder = 1; //Xman Anti-Leecher
-	//zz_fly :: Fake Shareaza Detection
-	bool bWasUDPPortSent = false;
-	bool bIsFakeShareaza = false;
-	//zz_fly :: Fake Shareaza Detection end
-
 	CMD4Hash hash = data.ReadHash();
 	SetUserHash( hash );
 	SetUserIDHybrid( data.ReadUInt32() );
@@ -447,20 +439,10 @@
 		switch(temptag.GetNameID()){
 			case CT_NAME:
 				m_Username = temptag.GetStr();
-				//Xman Anti-Leecher
-				if(hellotagorder!=1)
-					wronghello=true;
-				hellotagorder++;
-				//Xman end
 				break;
 				
 			case CT_VERSION:
 				m_nClientVersion = temptag.GetInt();
-				//Xman Anti-Leecher
-				if(hellotagorder!=2)
-					wronghello=true;
-				hellotagorder++;
-				//Xman end
 				break;
 				
 			case ET_MOD_VERSION:
@@ -487,8 +469,6 @@
 				#ifdef __PACKET_DEBUG__
 				printf("Hello type packet processing with eMule ports UDP=%i KAD=%i\n",m_nUDPPort,m_nKadPort);
 				#endif
-				//Dynamic Leecher Protect - Bill Lee
-				bWasUDPPortSent = true; //zz_fly :: Fake Shareaza Detection
 				break;
 				
 			case CT_EMULE_BUDDYIP:
@@ -548,9 +528,6 @@
 				printf("That's all.\n");
 				#endif
 				SecIdentSupRec +=  1;
-				//Dynamic Leecher Proctect - Bill Lee
-				bIsFakeShareaza = !bWasUDPPortSent;
-					
 				break;
 			}
 
@@ -623,7 +600,7 @@
 						const wxChar* dlp_result = CantiLeech().DLPCheckHelloTag(temptag.GetNameID());
 						if(dlp_result != NULL) {
 							wxString ret;
-							ret.Printf(wxT("[HelloTag %s(%.2x)] %s"), dlp_result, temptag.GetNameID(), GetClientFullInfo().c_str());
+							ret.Printf(wxT("[HelloTag %s] %s"), dlp_result, GetClientFullInfo().c_str());
 							Ban();
 							theApp->AddDLPMessageLine(ret);
 						}
@@ -717,32 +694,8 @@
 		Kademlia::CKademlia::Bootstrap(wxUINT32_SWAP_ALWAYS(GetIP()), GetKadPort(), GetKadVersion() > 1);
 	}
 
-	//Dynamic Leecher Protection - Added by Bill Lee
-	//	It doesn't work properly for unknown reason
-//	if(!IsBanned() && bIsFakeShareaza && m_clientSoft == SO_EMULE && (thePrefs::GetDLPCheckMask() & PF_HELLOTAG) ){
-//		const char* ret = "Fake Shareaza";
-//		char info[1024] = {0};
-//		char tmp[1024] = {0};
-//		
-//		strncpy(tmp, GetClientFullInfo().mb_str(wxConvUTF8), 1000);
-//		snprintf(info, 1000, "[%s] %s", ret, tmp);
-//		Ban();
-//		wxString winfo(info, wxConvUTF8);
-//		theApp->AddDLPMessageLine(winfo);
-//	}
 	if(!IsBanned()){
-		if(wronghello && (thePrefs::GetDLPCheckMask() & PF_HELLOTAG) ){
-			const char* ret = "[Wrong Hello Order: German Leecher]";
-			char info[1024] = {0};
-			char tmp[1024] = {0};
-			
-			strncpy(tmp, GetClientFullInfo().mb_str(wxConvUTF8), 1000);
-			snprintf(info, 1000, "%s %s", ret, tmp);
-			Ban();
-			wxString winfo(info, wxConvUTF8);
-			theApp->AddDLPMessageLine(winfo);
-		}
-	DLPCheck();
+		DLPCheck();
 	}
 	//Bill Lee end
 
@@ -1008,7 +961,7 @@
 							const wxChar* dlp_result = CantiLeech().DLPCheckInfoTag(temptag.GetNameID());
 							if(dlp_result != NULL) {
 								wxString ret;
-								ret.Printf(wxT("[InfoTag %s(%.2x)] %s"), dlp_result, temptag.GetNameID(), GetClientFullInfo().c_str());
+								ret.Printf(wxT("[InfoTag %s] %s"), dlp_result, GetClientFullInfo().c_str());
 								Ban();
 								theApp->AddDLPMessageLine(ret);
 							}
diff -r e8dfe9d57452 -r d9435c53b0eb src/antiLeech.cpp
--- a/src/antiLeech.cpp	Thu Feb 17 20:25:10 2011 +0800
+++ b/src/antiLeech.cpp	Sat May 14 18:10:14 2011 +0800
@@ -642,6 +642,8 @@
 		StrStrI(modversion, L"Angelmule") || // JvA: no sources, no changelog, community username,...
 		StrStrI(modversion, L"TR-P2P-MoD") || // JvA: bad client
 		StrStrI(modversion, L"Esekci") || // JvA: no sources, no changelog, ...
+		StrStrI(modversion, L"MaGiX") || // default modstring if activated and unchanged
+		StrStrI(modversion, L"MorphJC") || // bad 'Justice CS' and PBF for incomplete files
 		_tcslen(modversion) > 0 && (StrStrI(clientversion,_T("edonkey")) || modversion[0]==_T('['))   ||  //1. donkey user with modstring, 2. modstring begins with [ this is a known leecher
 		(StrStrI(modversion, _T("Xtreme")) && StrStrI(modversion, _T("]")))  //bad Xtreme mod
 		)
@@ -918,7 +920,8 @@
 		_tcsstr(username,_T("http://www.net-xfer.com")) || //netxfer
 		_tcsstr(username,_T("emuIe-project.net")) || //phishing site
 		_tcsstr(username,_T("QQDownload")) || //tencent
-//		_tcsstr(username,_T("[Devils][")) || //2009/12/25 // removed due to claim to stop using badmods
+		_tcsstr(username,_T("[Devils][")) || //2009/12/25
+		_tcsstr(username,_T("sharing-devils")) || // leecher community
 		//2010/5/29
 		//_tcsstr(username,_T("btbbt.com")) || //community username
 		//_tcsstr(username,_T("Greendown.Cn")) || //community username //these two sites provide some modified versions. they only hacked the title and changed the default username. i think the users are innocent. unban.
diff -r e8dfe9d57452 -r d9435c53b0eb src/antiLeech.h
--- a/src/antiLeech.h	Thu Feb 17 20:25:10 2011 +0800
+++ b/src/antiLeech.h	Sat May 14 18:10:14 2011 +0800
@@ -1,6 +1,6 @@
 #ifndef ANTILEECH_H
 #define ANTILEECH_H
-#define DLPVERSION 42
+#define DLPVERSION 44
 
 
 #pragma once