Update all wiki links to point to the new wiki. This was done automatically with...

[user/henk/code/inspircd.git] / src / modules / m_permchannels.cpp

diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp
index f24a908004a5dc4aff18588c3a95df09ae5936f5..85c83940e79eb9899e4a0d15c366a10a8f6c8b62 100644 (file)
--- a/src/modules/m_permchannels.cpp
+++ b/src/modules/m_permchannels.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -23,8 +23,14 @@ class PermChannel : public ModeHandler
  public:
        PermChannel(InspIRCd* Instance) : ModeHandler(Instance, 'P', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool sm)
        {
+               if (!source->HasPrivPermission("channels/set-permanent"))
+               {
+                       source->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - You do not have the required operator privileges", source->nick.c_str());
+                       return MODEACTION_DENY;
+               }
+
                if (adding)
                {
                        if (!channel->IsModeSet('P'))
@@ -37,6 +43,29 @@ class PermChannel : public ModeHandler
                {
                        if (channel->IsModeSet('P'))
                        {
+                               if (channel->GetUserCounter() == 0 && !sm)
+                               {
+                                       /*
+                                        * ugh, ugh, UGH!
+                                        *
+                                        * We can't delete this channel the way things work at the moment,
+                                        * because of the following scenario:
+                                        * s1:#c <-> s2:#c
+                                        *
+                                        * s1 has a user in #c, s2 does not. s2 has +P set. s2 has a losing TS.
+                                        *
+                                        * On netmerge, s2 loses, so s2 removes all modes (including +P) which
+                                        * would subsequently delete the channel here causing big fucking problems.
+                                        *
+                                        * I don't think there's really a way around this, so just deny -P on a 0 user chan.
+                                        * -- w00t
+                                        *
+                                        * delete channel;
+                                        */
+                                       return MODEACTION_DENY;
+                               }
+
+                               /* for servers, remove +P (to avoid desyncs) but don't bother trying to delete. */
                                channel->SetMode('P',false);
                                return MODEACTION_ALLOW;
                        }
@@ -50,7 +79,7 @@ class ModulePermanentChannels : public Module
 {
        PermChannel *p;
 public:
-       
+
        ModulePermanentChannels(InspIRCd* Me) : Module(Me)
        {
                p = new PermChannel(ServerInstance);
@@ -61,6 +90,8 @@ public:
                }
                Implementation eventlist[] = { I_OnChannelPreDelete };
                ServerInstance->Modules->Attach(eventlist, this, 1);
+
+               OnRehash(NULL, "");
        }
 
        virtual ~ModulePermanentChannels()
@@ -69,9 +100,64 @@ public:
                delete p;
        }
 
+       virtual void OnRehash(User *user, const std::string &parameter)
+       {
+               /*
+                * Process config-defined list of permanent channels.
+                * -- w00t
+                */
+               ConfigReader MyConf(ServerInstance);
+               for (int i = 0; i < MyConf.Enumerate("permchannels"); i++)
+               {
+                       std::string channel = MyConf.ReadValue("permchannels", "channel", i);
+                       std::string topic = MyConf.ReadValue("permchannels", "topic", i);
+                       std::string modes = MyConf.ReadValue("permchannels", "modes", i);
+
+                       if (channel.empty())
+                       {
+                               ServerInstance->Logs->Log("blah", DEBUG, "Malformed permchannels tag with empty channel name.");
+                               continue;
+                       }
+
+                       Channel *c = ServerInstance->FindChan(channel);
+
+                       if (!c)
+                       {
+                               c = new Channel(ServerInstance, channel, ServerInstance->Time());
+                               if (!topic.empty())
+                                       c->SetTopic(NULL, topic, true);
+                               ServerInstance->Logs->Log("blah", DEBUG, "Added %s with topic %s", channel.c_str(), topic.c_str());
+
+                               if (modes.empty())
+                                       continue;
+
+                               irc::spacesepstream list(modes);
+                               std::string modeseq;
+                               std::string par;
+
+                               list.GetToken(modeseq);
+
+                               // XXX bleh, should we pass this to the mode parser instead? ugly. --w00t
+                               for (std::string::iterator n = modeseq.begin(); n != modeseq.end(); ++n)
+                               {
+                                       ModeHandler* mode = ServerInstance->Modes->FindMode(*n, MODETYPE_CHANNEL);
+                                       if (mode)
+                                       {
+                                               if (mode->GetNumParams(true))
+                                                       list.GetToken(par);
+                                               else
+                                                       par.clear();
+
+                                               mode->OnModeChange(ServerInstance->FakeClient, ServerInstance->FakeClient, c, par, true);
+                                       }
+                               }
+                       }
+               }
+       }
+
        virtual Version GetVersion()
        {
-               return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
        }
 
        virtual int OnChannelPreDelete(Channel *c)