X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cloaking.cpp;h=105d688337d20d0afb767059815bf10ace8c5671;hb=09186df9f8c0d4f699b5abb4325d7dd583a8a0b1;hp=5b1b73f37999c712075d4a36307ce8e4e0eab020;hpb=4bb6a09697b5f55a66bba431bc2ac98b1535973d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp
index 5b1b73f37..105d68833 100644
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.cpp
@@ -1,16 +1,28 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2006-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ *   Copyright (C) 2003-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 John Brooks <john.brooks@dereferenced.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
  *
- * This program is free but copyrighted software; see
- *	    the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd 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, version 2.
  *
- * ---------------------------------------------------
+ * 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, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 #include "hash.h"
 
@@ -106,8 +118,8 @@ class CloakUser : public ModeHandler
 			/* User is removing the mode, so restore their real host
 			 * and make it match the displayed one.
 			 */
-			user->ChangeDisplayedHost(user->host.c_str());
 			user->SetMode('x',false);
+			user->ChangeDisplayedHost(user->host.c_str());
 			return MODEACTION_ALLOW;
 		}
 	}
@@ -152,7 +164,7 @@ class ModuleCloaking : public Module
 		ServerInstance->Modules->AddService(cu.ext);
 
 		Implementation eventlist[] = { I_OnRehash, I_OnCheckBan, I_OnUserConnect, I_OnChangeHost };
-		ServerInstance->Modules->Attach(eventlist, this, 4);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	/** This function takes a domain name string and returns just the last two domain parts,
@@ -365,7 +377,11 @@ class ModuleCloaking : public Module
 	// mode change, we will call SetMode back to true AFTER the host change is done.
 	void OnChangeHost(User* u, const std::string& host)
 	{
-		u->SetMode('x', false);
+		if(u->IsModeSet('x'))
+		{
+			u->SetMode('x', false);
+			u->WriteServ("MODE %s -x", u->nick.c_str());
+		}
 	}
 
 	~ModuleCloaking()