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 1eb48c2f08c4fb8b48d7411c358a73ab1d018fdd..83782d393c6bb8eec9781a8a100b669b554a59dd 100644 (file)
--- a/include/users.h
+++ b/include/users.h
@@ -453,13 +453,14 @@ 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. */
-       bool* AllowedUserModes;
+       std::bitset<64> AllowedUserModes;
 
        /** Allowed channel modes from oper classes. */
-       bool* AllowedChanModes;
+       std::bitset<64> AllowedChanModes;
 
  public:
        /** Contains a pointer to the connect class a user is on from - this will be NULL for remote connections.
@@ -520,7 +521,7 @@ class CoreExport User : public EventHandler
         */
        time_t nping;
 
-       /** Stored reverse lookup from res_forward
+       /** Stored reverse lookup from res_forward. Should not be used after resolution.
         */
        std::string stored_host;
 
@@ -708,9 +709,10 @@ class CoreExport User : public EventHandler
        User(InspIRCd* Instance, const std::string &uid = "");
 
        /** Check if the user matches a G or K line, and disconnect them if they do.
+        * @param doZline True if ZLines should be checked (if IP has changed since initial connect)
         * Returns true if the user matched a ban, false else.
         */
-       bool CheckLines();
+       bool CheckLines(bool doZline = false);
 
        /** Returns the full displayed host of the user
         * This member function returns the hostname of the user as seen by other users
@@ -801,6 +803,16 @@ class CoreExport User : public EventHandler
         */
        bool HasPermission(const std::string &command);
 
+       /** Returns true if a user has a given permission.
+        * This is used to check whether or not users may perform certain actions which admins may not wish to give to
+        * 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 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
         * this to their oper classes, and checking the modes they can set.