Replace hardcoded mode letters passed to IsModeSet() and GetModeParameter() with...

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

diff --git a/src/modules/m_password_hash.cpp b/src/modules/m_password_hash.cpp
index 3a5070de05ff59ee3f9c4103ded5069cbd4349ad..6c4145c4edd3bcd02c4255fe5fb4c25cb2a6bfd7 100644 (file)
--- a/src/modules/m_password_hash.cpp
+++ b/src/modules/m_password_hash.cpp
@@ -21,7 +21,7 @@
 /* $ModDesc: Allows for hashed oper passwords */
 
 #include "inspircd.h"
-#include "hash.h"
+#include "modules/hash.h"
 
 /* Handle /MKPASSWD
  */
@@ -42,15 +42,14 @@ class CommandMkpasswd : public Command
                        HashProvider* hp = ServerInstance->Modules->FindDataService<HashProvider>("hash/" + type);
                        if (!hp)
                        {
-                               user->WriteServ("NOTICE %s :Unknown hash type", user->nick.c_str());
+                               user->WriteNotice("Unknown hash type");
                                return;
                        }
                        std::string salt = ServerInstance->GenRandomStr(6, false);
                        std::string target = hp->hmac(salt, stuff);
                        std::string str = BinToBase64(salt) + "$" + BinToBase64(target, NULL, 0);
 
-                       user->WriteServ("NOTICE %s :%s hashed password for %s is %s",
-                               user->nick.c_str(), algo.c_str(), stuff.c_str(), str.c_str());
+                       user->WriteNotice(algo + " hashed password for " + stuff + " is " + str);
                        return;
                }
                HashProvider* hp = ServerInstance->Modules->FindDataService<HashProvider>("hash/" + algo);
@@ -58,12 +57,11 @@ class CommandMkpasswd : public Command
                {
                        /* Now attempt to generate a hash */
                        std::string hexsum = hp->hexsum(stuff);
-                       user->WriteServ("NOTICE %s :%s hashed password for %s is %s",
-                               user->nick.c_str(), algo.c_str(), stuff.c_str(), hexsum.c_str());
+                       user->WriteNotice(algo + " hashed password for " + stuff + " is " + hexsum);
                }
                else
                {
-                       user->WriteServ("NOTICE %s :Unknown hash type", user->nick.c_str());
+                       user->WriteNotice("Unknown hash type");
                }
        }
 
@@ -81,16 +79,20 @@ class ModuleOperHash : public Module
  public:
 
        ModuleOperHash() : cmd(this)
+       {
+       }
+
+       void init() CXX11_OVERRIDE
        {
                /* Read the config file first */
                OnRehash(NULL);
 
-               ServerInstance->AddCommand(&cmd);
+               ServerInstance->Modules->AddService(cmd);
                Implementation eventlist[] = { I_OnPassCompare };
-               ServerInstance->Modules->Attach(eventlist, this, 1);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
-       virtual ModResult OnPassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype)
+       ModResult OnPassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype) CXX11_OVERRIDE
        {
                if (hashtype.substr(0,5) == "hmac-")
                {
@@ -128,7 +130,7 @@ class ModuleOperHash : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Allows for hashed oper passwords",VF_VENDOR);
        }