MetaData rework

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

diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp
index a6b1c2d0aa61d422c46dda4900c74dbf4c82f50d..8da062593f99ed2f2f157bdfab7866a72ee0d2d9 100644 (file)
--- a/src/modules/m_auditorium.cpp
+++ b/src/modules/m_auditorium.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -18,22 +18,14 @@
 class AuditoriumMode : public ModeHandler
 {
  public:
-       AuditoriumMode(InspIRCd* Instance) : ModeHandler(Instance, 'u', 0, 0, false, MODETYPE_CHANNEL, false) { }
+       AuditoriumMode(InspIRCd* Instance) : ModeHandler(Instance, 'u', 0, 0, false, MODETYPE_CHANNEL, false, 0, '@') { }
 
        ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
                if (channel->IsModeSet('u') != adding)
                {
-                       if (IS_LOCAL(source) && (channel->GetStatus(source) < STATUS_OP))
-                       {
-                               source->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :Only channel operators may %sset channel mode +u", source->nick.c_str(), channel->name.c_str(), adding ? "" : "un");
-                               return MODEACTION_DENY;
-                       }
-                       else
-                       {
-                               channel->SetMode('u', adding);
-                               return MODEACTION_ALLOW;
-                       }
+                       channel->SetMode('u', adding);
+                       return MODEACTION_ALLOW;
                }
                else
                {
@@ -45,21 +37,17 @@ class AuditoriumMode : public ModeHandler
 class ModuleAuditorium : public Module
 {
  private:
-       AuditoriumMode* aum;
+       AuditoriumMode aum;
        bool ShowOps;
        bool OperOverride;
  public:
        ModuleAuditorium(InspIRCd* Me)
-               : Module(Me)
+               : Module(Me), aum(Me)
        {
-               aum = new AuditoriumMode(ServerInstance);
-               if (!ServerInstance->Modes->AddMode(aum))
-               {
-                       delete aum;
+               if (!ServerInstance->Modes->AddMode(&aum))
                        throw ModuleException("Could not add new modes!");
-               }
 
-               OnRehash(NULL, "");
+               OnRehash(NULL);
 
                Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnUserQuit, I_OnNamesListItem, I_OnRehash, I_OnHostCycle };
                Me->Modules->Attach(eventlist, this, 7);
@@ -68,11 +56,10 @@ class ModuleAuditorium : public Module
 
        virtual ~ModuleAuditorium()
        {
-               ServerInstance->Modes->DelMode(aum);
-               delete aum;
+               ServerInstance->Modes->DelMode(&aum);
        }
 
-       virtual void OnRehash(User* user, const std::string &parameter)
+       virtual void OnRehash(User* user)
        {
                ConfigReader conf(ServerInstance);
                ShowOps = conf.ReadFlag("auditorium", "showops", 0);
@@ -126,7 +113,7 @@ class ModuleAuditorium : public Module
                }
        }
 
-       virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent)
+       virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent, bool created)
        {
                if (channel->IsModeSet('u'))
                {
@@ -168,7 +155,7 @@ class ModuleAuditorium : public Module
                                chan->WriteAllExceptSender(source, false, chan->GetStatus(user) >= STATUS_OP ? 0 : '@', "KICK %s %s %s", chan->name.c_str(), user->nick.c_str(), reason.c_str());
                        if ((!ShowOps) || (chan->GetStatus(user) < STATUS_OP)) /* make sure the target gets the event */
                                user->WriteFrom(source, "KICK %s %s %s", chan->name.c_str(), user->nick.c_str(), reason.c_str());
-                       WriteOverride(user, chan, "KICK " + chan->name + " " + user->nick + " " + reason);
+                       WriteOverride(source, chan, "KICK " + chan->name + " " + user->nick + " " + reason);
                }
        }