By moving OnPreCommand call in two places, modules (even with unverified commands...

[user/henk/code/inspircd.git] / include / users.h

diff --git a/include/users.h b/include/users.h
index 7492d31e03d1f21b5bf41f0582b30f279ec0cfa5..83782d393c6bb8eec9781a8a100b669b554a59dd 100644 (file)
--- a/include/users.h
+++ b/include/users.h
@@ -139,14 +139,14 @@ public:
                registration_timeout(source->registration_timeout), flood(source->flood), host(source->host),
                pingtime(source->pingtime), pass(source->pass), hash(source->hash), threshold(source->threshold), sendqmax(source->sendqmax),
                recvqmax(source->recvqmax), maxlocal(source->maxlocal), maxglobal(source->maxglobal), maxchans(source->maxchans),
-               port(source->port), RefCount(0), limit(source->limit)
+               port(source->port), RefCount(0), disabled(false), limit(source->limit)
        {
        }
 
        /** Create a new connect class with no settings.
         */
        ConnectClass() : type(CC_DENY), name("unnamed"), registration_timeout(0), flood(0), host(""), pingtime(0), pass(""), hash(""),
-                       threshold(0), sendqmax(0), recvqmax(0), maxlocal(0), maxglobal(0), RefCount(0), limit(0)
+                       threshold(0), sendqmax(0), recvqmax(0), maxlocal(0), maxglobal(0), RefCount(0), disabled(false), limit(0)
        {
        }
 
@@ -168,14 +168,14 @@ public:
                        const std::string &pas, const std::string &hsh, unsigned int thres, unsigned long sendq, unsigned long recvq,
                        unsigned long maxl, unsigned long maxg, unsigned int maxc, int p = 0) :
                        type(CC_ALLOW), name(thename), registration_timeout(timeout), flood(fld), host(hst), pingtime(ping), pass(pas), hash(hsh),
-                       threshold(thres), sendqmax(sendq), recvqmax(recvq), maxlocal(maxl), maxglobal(maxg), maxchans(maxc), port(p), RefCount(0), limit(0) { }
+                       threshold(thres), sendqmax(sendq), recvqmax(recvq), maxlocal(maxl), maxglobal(maxg), maxchans(maxc), port(p), RefCount(0), disabled(false), limit(0) { }
 
        /** Create a new connect class to DENY connections
         * @param thename Name of the connect class
         * @param hst The IP mask to deny
         */
        ConnectClass(const std::string &thename, const std::string &hst) : type(CC_DENY), name(thename), registration_timeout(0),
-                       flood(0), host(hst), pingtime(0), pass(""), hash(""), threshold(0), sendqmax(0), recvqmax(0), maxlocal(0), maxglobal(0), maxchans(0), port(0), RefCount(0), limit(0)
+                       flood(0), host(hst), pingtime(0), pass(""), hash(""), threshold(0), sendqmax(0), recvqmax(0), maxlocal(0), maxglobal(0), maxchans(0), port(0), RefCount(0), disabled(false), limit(0)
        {
        }
 
@@ -187,10 +187,20 @@ public:
                                registration_timeout(source->registration_timeout), flood(source->flood), host(source->host),
                                pingtime(source->pingtime), pass(source->pass), hash(source->hash), threshold(source->threshold), sendqmax(source->sendqmax),
                                recvqmax(source->recvqmax), maxlocal(source->maxlocal), maxglobal(source->maxglobal), maxchans(source->maxchans),
-                               port(source->port), RefCount(0), limit(source->limit)
+                               port(source->port), RefCount(0), disabled(false), limit(source->limit)
        {
        }
 
+       void SetDisabled(bool t)
+       {
+               this->disabled = t;
+       }
+
+       bool GetDisabled()
+       {
+               return this->disabled;
+       }
+
        /* Update an existing entry with new values
         */
        void Update(unsigned int timeout, unsigned int fld, const std::string &hst, unsigned int ping,
@@ -237,6 +247,10 @@ public:
         */
        unsigned long RefCount;
 
+       /** If this is true, any attempt to set a user to this class will fail. Default false. This is really private, it's only in the public section thanks to the way this class is written
+        */
+       bool disabled;
+
        /** How many users may be in this connect class before they are refused? (0 = disabled = default)
         */
        unsigned long limit;
@@ -439,7 +453,8 @@ class CoreExport User : public EventHandler
         */
        void DecrementModes();
 
-       std::map<std::string, bool>* AllowedOperCommands;
+       std::set<std::string> *AllowedOperCommands;
+       std::set<std::string> *AllowedPrivs;
 
        /** Allowed user modes from oper classes. */
        std::bitset<64> AllowedUserModes;
@@ -793,8 +808,10 @@ class CoreExport User : public EventHandler
         * all operators, yet are not commands. An example might be oper override, mass messaging (/notice $*), etc.
         *
         * @param privstr The priv to chec, e.g. "users/override/topic". These are loaded free-form from the config file.
+        * @param noisy If set to true, the user is notified that they do not have the specified permission where applicable. If false, no notification is sent.
         * @return True if this user has the permission in question.
-        */     bool HasPrivPermission(const std::string &privstr);
+        */
+       bool HasPrivPermission(const std::string &privstr, bool noisy = false);
 
        /** Returns true or false if a user can set a privileged user or channel mode.
         * This is done by looking up their oper type from User::oper, then referencing