Merge pull request #92 from Robby-/insp20-headers

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

diff --git a/src/modules/m_chanhistory.cpp b/src/modules/m_chanhistory.cpp
index cd560ba8842cb756b34eb5d8b63eed1abe19d766..9275152ea505dbba9368130cede3516697197e1a 100644 (file)
--- a/src/modules/m_chanhistory.cpp
+++ b/src/modules/m_chanhistory.cpp
@@ -1,16 +1,22 @@
-/*       +------------------------------------+
- *       | 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>
  *
- * 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"
 
 /* $ModDesc: Provides channel history for a given number of lines */
@@ -33,6 +39,7 @@ class HistoryMode : public ModeHandler
 {
  public:
        SimpleExtItem<HistoryList> ext;
+       int maxlines;
        HistoryMode(Module* Creator) : ModeHandler(Creator, "history", 'H', PARAM_SETONLY, MODETYPE_CHANNEL),
                ext("history", Creator) { }
 
@@ -45,13 +52,21 @@ class HistoryMode : public ModeHandler
                                return MODEACTION_DENY;
                        int len = atoi(parameter.substr(0, colon).c_str());
                        int time = ServerInstance->Duration(parameter.substr(colon+1));
-                       if (len <= 0 || time < 0 || len > 50)
+                       if (len <= 0 || time < 0)
+                               return MODEACTION_DENY;
+                       if (len > maxlines && IS_LOCAL(source))
+                               return MODEACTION_DENY;
+                       if (len > maxlines)
+                               len = maxlines;
+                       if (parameter == channel->GetModeParameter(this))
                                return MODEACTION_DENY;
                        ext.set(channel, new HistoryList(len, time));
                        channel->SetModeParam('H', parameter);
                }
                else
                {
+                       if (!channel->IsModeSet('H'))
+                               return MODEACTION_DENY;
                        ext.unset(channel);
                        channel->SetModeParam('H', "");
                }
@@ -65,11 +80,20 @@ class ModuleChanHistory : public Module
  public:
        ModuleChanHistory() : m(this)
        {
-               if (!ServerInstance->Modes->AddMode(&m))
-                       throw ModuleException("Could not add new modes!");
+       }
 
-               Implementation eventlist[] = { I_OnUserJoin, I_OnUserMessage };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+       void init()
+       {
+               ServerInstance->Modules->AddService(m);
+
+               Implementation eventlist[] = { I_OnPostJoin, I_OnUserMessage, I_OnRehash };
+               ServerInstance->Modules->Attach(eventlist, this, 3);
+               OnRehash(NULL);
+       }
+
+       void OnRehash(User*)
+       {
+               m.maxlines = ServerInstance->Config->ConfValue("chanhistory")->getInt("maxlines", 50);
        }
 
        ~ModuleChanHistory()
@@ -95,7 +119,7 @@ class ModuleChanHistory : public Module
                }
        }
 
-       void OnUserJoin(Membership* memb, bool sync, bool created, CUList& except_list)
+       void OnPostJoin(Membership* memb)
        {
                HistoryList* list = m.ext.get(memb->chan);
                if (!list)
@@ -114,7 +138,7 @@ class ModuleChanHistory : public Module
 
        Version GetVersion()
        {
-               return Version("Provides channel history replayed on join", VF_COMMON | VF_VENDOR);
+               return Version("Provides channel history replayed on join", VF_VENDOR);
        }
 };