X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanhistory.cpp;h=e48e67fe5557ffb601425de6dde5ceba787e3b7b;hb=e5518238259b9988a2a6d8ef654b69034628c10d;hp=ac6d80bad3c7139a7b7222d8bc2292cc30643210;hpb=5eb361b215d99f25a586f7fd71158e22ea410355;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chanhistory.cpp b/src/modules/m_chanhistory.cpp
index ac6d80bad..e48e67fe5 100644
--- a/src/modules/m_chanhistory.cpp
+++ b/src/modules/m_chanhistory.cpp
@@ -37,12 +37,12 @@ struct HistoryList
 
 class HistoryMode : public ModeHandler
 {
-	bool IsValidDuration(const std::string duration)
+	bool IsValidDuration(const std::string& duration)
 	{
 		for (std::string::const_iterator i = duration.begin(); i != duration.end(); ++i)
 		{
 			unsigned char c = *i;
-			if (((c >= '0') && (c <= '9')) || (c == 's') || (c != 'S'))
+			if (((c >= '0') && (c <= '9')) || (c == 's') || (c == 'S'))
 				continue;
 
 			if (duration_multi[c] == 1)
@@ -79,7 +79,21 @@ class HistoryMode : public ModeHandler
 				len = maxlines;
 			if (parameter == channel->GetModeParameter(this))
 				return MODEACTION_DENY;
-			ext.set(channel, new HistoryList(len, time));
+
+			HistoryList* history = ext.get(channel);
+			if (history)
+			{
+				// Shrink the list if the new line number limit is lower than the old one
+				if (len < history->lines.size())
+					history->lines.erase(history->lines.begin(), history->lines.begin() + (history->lines.size() - len));
+
+				history->maxlen = len;
+				history->maxtime = time;
+			}
+			else
+			{
+				ext.set(channel, new HistoryList(len, time));
+			}
 			channel->SetModeParam('H', parameter);
 		}
 		else
@@ -105,9 +119,10 @@ class ModuleChanHistory : public Module
 	void init()
 	{
 		ServerInstance->Modules->AddService(m);
+		ServerInstance->Modules->AddService(m.ext);
 
 		Implementation eventlist[] = { I_OnPostJoin, I_OnUserMessage, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, 3);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 		OnRehash(NULL);
 	}
 
@@ -115,12 +130,7 @@ class ModuleChanHistory : public Module
 	{
 		ConfigTag* tag = ServerInstance->Config->ConfValue("chanhistory");
 		m.maxlines = tag->getInt("maxlines", 50);
-		sendnotice = tag->getInt("notice", true);
-	}
-
-	~ModuleChanHistory()
-	{
-		ServerInstance->Modes->DelMode(&m);
+		sendnotice = tag->getBool("notice", true);
 	}
 
 	void OnUserMessage(User* user,void* dest,int target_type, const std::string &text, char status, const CUList&)