Fix multiple (useless) linefeeds on the end of ADDLINE in burst

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

diff --git a/include/users.h b/include/users.h
index 1fca831ef632013759b1843d3a4b05c7746546d9..a63dd7cc67a95b882eb29a5e985cc9f3eaea19ff 100644 (file)
--- a/include/users.h
+++ b/include/users.h
@@ -207,7 +207,7 @@ public:
         */
        void Update(unsigned int timeout, unsigned int fld, const std::string &hst, unsigned int ping,
                                const std::string &pas, unsigned int thres, unsigned long sendq, unsigned long recvq,
-                               unsigned long maxl, unsigned long maxg, unsigned int maxc, int p, unsigned long limit)
+                               unsigned long maxl, unsigned long maxg, unsigned int maxc, int p, unsigned long llimit)
        {
                if (timeout)
                        registration_timeout = timeout;
@@ -234,7 +234,7 @@ public:
                if (p)
                        port = p;
 
-               this->limit = limit;
+               this->limit = llimit;
        }
 
        /** Reference counter. Contains an int as to how many users are connected to this class. :)
@@ -360,9 +360,9 @@ public:
        }
 };
 
-/** Holds a complete list of all channels to which a user has been invited and has not yet joined.
+/** Holds a complete list of all channels to which a user has been invited and has not yet joined, and the time at which they'll expire.
  */
-typedef std::vector<irc::string> InvitedList;
+typedef std::vector< std::pair<irc::string, time_t> > InvitedList;
 
 /** Holds a complete list of all allow and deny tags from the configuration file (connection classes)
  */
@@ -736,8 +736,9 @@ class CoreExport User : public connection
 
        /** Adds a channel to a users invite list (invites them to a channel)
         * @param channel A channel name to add
+        * @param timeout When the invite should expire (0 == never)
         */
-       virtual void InviteTo(const irc::string &channel);
+       virtual void InviteTo(const irc::string &channel, time_t timeout);
 
        /** Removes a channel from a users invite list.
         * This member function is called on successfully joining an invite only channel
@@ -1032,7 +1033,7 @@ class CoreExport User : public connection
         * @param text The text format string to send
         * @param ... Format arguments
         */
-       void SendAll(const char* command, char* text, ...);
+       void SendAll(const char* command, const char* text, ...);
 
        /** Compile a channel list for this user, and send it to the user 'source'
         * Used internally by WHOIS