Mention ulines too

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

diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 52828fdca6796c35c3cd05bfdf2ada58c713268f..9eb7ff37d517c3459929a5f4d47fda65eb0f83ef 100644 (file)
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -49,7 +49,7 @@ class callerid_data : public classbase
        {
                std::ostringstream oss;
                oss << lastnotify;
-               for (std::set<User*>::iterator i = accepting.begin(); i != accepting.end(); ++i)
+               for (std::set<User*>::const_iterator i = accepting.begin(); i != accepting.end(); ++i)
                {
                        // Encode UIDs.
                        oss << "," << (displayable ? (*i)->nick : (*i)->uuid);
@@ -174,7 +174,8 @@ public:
                        return CMD_SUCCESS;
                /* Even if callerid mode is not set, we let them manage their ACCEPT list so that if they go +g they can
                 * have a list already setup. */
-               bool atleastonechange = false;
+
+               std::string tok = parameters[0];
 
                if (tok == "*")
                {
@@ -187,6 +188,8 @@ public:
                        User* whotoremove = ServerInstance->FindNick(tok.substr(1));
                        if (whotoremove)
                                return (RemoveAccept(user, whotoremove, false) ? CMD_SUCCESS : CMD_FAILURE);
+                       else
+                               return CMD_FAILURE;
                }
                else
                {
@@ -303,7 +306,7 @@ public:
 
        virtual Version GetVersion()
        {
-               return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 
        virtual void On005Numeric(std::string& output)