Fix help text in helpop, route ACCEPT command to fix callerid

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12439 e03df62e-2008-0410-955e-edbf42e46eb7

2 files changed, 9 insertions, 13 deletions

diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index bb847d8bc..fa28b7427 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -222,6 +222,11 @@ public:
 		}
 	}
 
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		return ROUTE_BROADCAST;
+	}
+
 	void ListAccept(User* user)
 	{
 		callerid_data* dat = extInfo.get(user, false);
diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp
index 5cd8d8ea0..4c5dc23a9 100644
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -13,10 +13,8 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: /helpop Command, Works like Unreal helpop */
 static std::map<irc::string, std::string> helpop_map;
 
-
 /** Handles user mode +h
  */
 class Helpop : public ModeHandler
@@ -132,8 +130,6 @@ class ModuleHelpop : public Module
 
 		void ReadConfig()
 		{
-			ConfigReader MyConf;
-
 			helpop_map.clear();
 
 			ConfigTagList tags = ServerInstance->Config->ConfTags("helpop");
@@ -165,13 +161,12 @@ class ModuleHelpop : public Module
 
 		}
 
-
-		virtual void OnRehash(User* user)
+		void OnRehash(User* user)
 		{
 			ReadConfig();
 		}
 
-		virtual void OnWhois(User* src, User* dst)
+		void OnWhois(User* src, User* dst)
 		{
 			if (dst->IsModeSet('h'))
 			{
@@ -179,13 +174,9 @@ class ModuleHelpop : public Module
 			}
 		}
 
-		virtual ~ModuleHelpop()
-		{
-		}
-
-		virtual Version GetVersion()
+		Version GetVersion()
 		{
-			return Version("/helpop Command, Works like Unreal helpop", VF_VENDOR);
+			return Version("/help command, works like Unreal helpop", VF_VENDOR);
 		}
 };