DOH! Fix my muppetry of a segfault, and fix some warnings

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

diff --git a/src/modules/m_uhnames.cpp b/src/modules/m_uhnames.cpp
index 61b58f302c87fae08e909c51c243b6aacaa96d37..b6f1ba3b08cd52bd8f389078de4df5926b189ead 100644 (file)
--- a/src/modules/m_uhnames.cpp
+++ b/src/modules/m_uhnames.cpp
@@ -1 +1,87 @@
-/*       +------------------------------------+\r *       | Inspire Internet Relay Chat Daemon |\r *       +------------------------------------+\r *\r *  InspIRCd: (C) 2002-2007 InspIRCd Development Team\r * See: http://www.inspircd.org/wiki/index.php/Credits\r *\r * This program is free but copyrighted software; see\r *            the file COPYING for details.\r *\r * ---------------------------------------------------\r */\r\r#include "inspircd.h"\r#include "users.h"\r#include "channels.h"\r#include "modules.h"\r\rstatic const char* dummy = "ON";\r\r/* $ModDesc: Provides aliases of commands. */\r\rclass ModuleUHNames : public Module\r{\r       CUList nl;\r public:\r    \r       ModuleUHNames(InspIRCd* Me)\r            : Module(Me)\r   {\r      }\r\r     void Implements(char* List)\r    {\r              List[I_OnSyncUserMetaData] = List[I_OnPreCommand] = List[I_OnUserList] = List[I_On005Numeric] = 1;\r     }\r\r     virtual ~ModuleUHNames()\r       {\r      }\r\r     void OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, const std::string &extname, bool displayable)\r       {\r              if ((displayable) && (extname == "UHNAMES"))\r                   proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, "Enabled");\r }\r\r     virtual Version GetVersion()\r   {\r              return Version(1,1,0,1,VF_VENDOR,API_VERSION);\r }\r\r     virtual void On005Numeric(std::string &output)\r {\r              output.append(" UHNAMES");\r     }\r\r     Priority Prioritize()\r  {\r              return (Priority)ServerInstance->PriorityBefore("m_namesx.so");\r        }\r\r     virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)\r       {\r              irc::string c = command.c_str();\r               /* We don't actually create a proper command handler class for PROTOCTL,\r                * because other modules might want to have PROTOCTL hooks too.\r                 * Therefore, we just hook its as an unvalidated command therefore we\r           * can capture it even if it doesnt exist! :-)\r          */\r            if (c == "PROTOCTL")\r           {\r                      if ((pcnt) && (!strcasecmp(parameters[0],"UHNAMES")))\r                  {\r                              user->Extend("UHNAMES",dummy);\r                         return 1;\r                      }\r              }\r              return 0;\r      }\r\r     /* IMPORTANT: This must be prioritized above NAMESX! */\r        virtual int OnUserList(userrec* user, chanrec* Ptr, CUList* &ulist)\r    {\r              if (user->GetExt("UHNAMES"))\r           {\r                      if (!ulist)\r                            ulist = Ptr->GetUsers();\r\r                      for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)\r                              i->second = i->first->GetFullHost();\r           }\r              return 0;               \r       }\r};\r\rMODULE_INIT(ModuleUHNames)\r\r
\ No newline at end of file
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+#include "inspircd.h"
+#include "m_cap.h"
+
+/* $ModDesc: Provides the UHNAMES facility. */
+
+class ModuleUHNames : public Module
+{
+       CUList nl;
+ public:
+       
+       ModuleUHNames(InspIRCd* Me)
+               : Module(Me)
+       {
+               Implementation eventlist[] = { I_OnEvent, I_OnSyncUserMetaData, I_OnPreCommand, I_OnNamesListItem, I_On005Numeric };
+               ServerInstance->Modules->Attach(eventlist, this, 4);
+       }
+
+       virtual ~ModuleUHNames()
+       {
+       }
+
+       void OnSyncUserMetaData(User* user, Module* proto,void* opaque, const std::string &extname, bool displayable)
+       {
+               if ((displayable) && (extname == "UHNAMES"))
+                       proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, "Enabled");
+       }
+
+       virtual Version GetVersion()
+       {
+               return Version(1,2,0,1,VF_VENDOR,API_VERSION);
+       }
+
+       virtual void On005Numeric(std::string &output)
+       {
+               output.append(" UHNAMES");
+       }
+
+       virtual int OnPreCommand(const std::string &command, const char* const* parameters, int pcnt, User *user, bool validated, const std::string &original_line)
+       {
+               irc::string c = command.c_str();
+               /* We don't actually create a proper command handler class for PROTOCTL,
+                * because other modules might want to have PROTOCTL hooks too.
+                * Therefore, we just hook its as an unvalidated command therefore we
+                * can capture it even if it doesnt exist! :-)
+                */
+               if (c == "PROTOCTL")
+               {
+                       if ((pcnt) && (!strcasecmp(parameters[0],"UHNAMES")))
+                       {
+                               user->Extend("UHNAMES");
+                               return 1;
+                       }
+               }
+               return 0;
+       }
+
+       virtual void OnNamesListItem(User* issuer, User* user, Channel* channel, std::string &prefixes, std::string &nick)
+       {
+               if (!issuer->GetExt("UHNAMES"))
+                       return;
+
+               if (nick.empty())
+                       return;
+
+               nick = user->GetFullHost();
+       }
+
+       virtual void OnEvent(Event* ev)
+       {
+               GenericCapHandler(ev, "UHNAMES", "userhost-in-names");
+       }
+};
+
+MODULE_INIT(ModuleUHNames)