Patch: /rehash (not /rehash ssl) will now rebind SSL ports, but not dh params etc...

[user/henk/code/inspircd.git] / src / channels.cpp

diff --git a/src/channels.cpp b/src/channels.cpp
index c69f09107d8a113bd1e3f9e51b6724b33400f6c7..3a89f9e73f7b52709b551431fe419856786315fa 100644 (file)
--- 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
@@ -20,6 +20,10 @@
 
 Channel::Channel(InspIRCd* Instance, const std::string &name, time_t ts) : ServerInstance(Instance)
 {
+       chan_hash::iterator findchan = ServerInstance->chanlist->find(name);
+       if (findchan != Instance->chanlist->end())
+               throw CoreException("Cannot create duplicate channel " + name);
+
        (*(ServerInstance->chanlist))[name.c_str()] = this;
        strlcpy(this->name, name.c_str(), CHANMAX);
        this->created = ts ? ts : ServerInstance->Time(true);
@@ -478,7 +482,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;
@@ -524,7 +532,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;
@@ -602,7 +614,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;