X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fchannels.cpp;h=cab05caeb1b7a607c3faba8d2c74d6c1a58431d4;hb=2cc6856e8709c9a5c339ab4af1c0d0b9a01ed917;hp=115afea52bea47a3098ae6c8682f06fb8a45f7fa;hpb=c916c63445ab46b060d783181bf41e8b94e8ae27;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/channels.cpp b/src/channels.cpp
index 115afea52..cab05caeb 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -379,18 +379,15 @@ Channel* Channel::ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const
 		ModeHandler* mh = Instance->Modes->FindPrefix(status);
 		if (mh)
 		{
+			/* Set, and make sure that the mode handler knows this mode was now set */
 			Ptr->SetPrefix(user, status, mh->GetPrefixRank(), true);
-			/* Make sure that the mode handler knows this mode was now set */
 			mh->OnModeChange(Instance->FakeClient, Instance->FakeClient, Ptr, nick, true);
 
 			switch (mh->GetPrefix())
 			{
-				/* These logic ops are SAFE IN THIS CASE
-				 * because if the entry doesnt exist,
-				 * addressing operator[] creates it.
-				 * If they do exist, it points to it.
-				 * At all other times where we dont want
-				 * to create an item if it doesnt exist, we
+				/* These logic ops are SAFE IN THIS CASE because if the entry doesnt exist,
+				 * addressing operator[] creates it. If they do exist, it points to it.
+				 * At all other times where we dont want to create an item if it doesnt exist, we
 				 * must stick to ::find().
 				 */
 				case '@':
@@ -482,7 +479,11 @@ long Channel::PartUser(User *user, const char* reason)
 		/* kill the record */
 		if (iter != ServerInstance->chanlist->end())
 		{
-			FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(this));
+			int MOD_RESULT = 0;
+			FOREACH_RESULT_I(ServerInstance,I_OnChannelPreDelete, OnChannelPreDelete(this));
+			if (MOD_RESULT == 1)
+				return 1; // delete halted by module
+			FOREACH_MOD(I_OnChannelDelete, OnChannelDelete(this));
 			ServerInstance->chanlist->erase(iter);
 		}
 		return 0;
@@ -528,7 +529,11 @@ long Channel::ServerKickUser(User* user, const char* reason, bool triggerevents)
 		/* kill the record */
 		if (iter != ServerInstance->chanlist->end())
 		{
-			FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(this));
+			int MOD_RESULT = 0;
+			FOREACH_RESULT_I(ServerInstance,I_OnChannelPreDelete, OnChannelPreDelete(this));
+			if (MOD_RESULT == 1)
+				return 1; // delete halted by module
+			FOREACH_MOD(I_OnChannelDelete, OnChannelDelete(this));
 			ServerInstance->chanlist->erase(iter);
 		}
 		return 0;
@@ -606,7 +611,11 @@ long Channel::KickUser(User *src, User *user, const char* reason)
 		/* kill the record */
 		if (iter != ServerInstance->chanlist->end())
 		{
-			FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(this));
+			int MOD_RESULT = 0;
+			FOREACH_RESULT_I(ServerInstance,I_OnChannelPreDelete, OnChannelPreDelete(this));
+			if (MOD_RESULT == 1)
+				return 1; // delete halted by module
+			FOREACH_MOD(I_OnChannelDelete, OnChannelDelete(this));
 			ServerInstance->chanlist->erase(iter);
 		}
 		return 0;