Probably wont compile yet - purge_empty_channels refactor

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

diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index ae0961f29dc4e21b5b30bdb7a0b935ecae63c312..fa554102f842d953d7aff67f943f445391c688ed 100644 (file)
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -23,13 +23,14 @@
 #include "channels.h"
 #include "modules.h"
 #include "helperfuncs.h"
+#include "hashcomp.h"
 
 /* $ModDesc: Gives /cban, aka C:lines. Think Q:lines, for channels. */
 
 class CBan
 {
 public:
-       std::string chname;
+       irc::string chname;
        std::string set_by;
        time_t set_on;
        long length;
@@ -39,7 +40,7 @@ public:
        {
        }
 
-       CBan(std::string cn, std::string sb, time_t so, long ln, std::string rs) : chname(cn), set_by(sb), set_on(so), length(ln), reason(rs)
+       CBan(irc::string cn, std::string sb, time_t so, long ln, std::string rs) : chname(cn), set_by(sb), set_on(so), length(ln), reason(rs)
        {
        }
 };
@@ -48,7 +49,6 @@ std::string EncodeCBan(const CBan &ban);
 CBan DecodeCBan(const std::string &data);
 bool CBanComp(const CBan &ban1, const CBan &ban2);
 void ExpireBans();
-bool IsValidChan(const char* cname);
 
 extern time_t TIME;
 typedef std::vector<CBan> cbanlist;
@@ -92,30 +92,32 @@ class cmd_cban : public command_t
                else if (pcnt >= 2)
                {
                        /* full form to add a CBAN */
-                       if(IsValidChan(parameters[0]))
+                       if (IsValidChannelName(parameters[0]))
                        {
                                // parameters[0] = #channel
                                // parameters[1] = 1h3m2s
                                // parameters[2] = Tortoise abuser
                                long length = Srv->CalcDuration(parameters[1]);
+                               std::string reason = (pcnt > 2) ? parameters[2] : "No reason supplied";
                                
-                               cbans.push_back(CBan(parameters[0], user->nick, TIME, length, parameters[2]));
+                               cbans.push_back(CBan(parameters[0], user->nick, TIME, length, reason));
+                                       
                                std::sort(cbans.begin(), cbans.end(), CBanComp);
                                
                                if(length > 0)
                                {
-                                       WriteServ(user->fd, "385 %s %s :Added %lu second channel ban (%s)", user->nick, parameters[0], length, parameters[2]);
-                                       WriteOpers("*** %s added %lu second channel ban on %s (%s)", user->nick, length, parameters[0], parameters[2]);
+                                       WriteServ(user->fd, "385 %s %s :Added %lu second channel ban (%s)", user->nick, parameters[0], length, reason.c_str());
+                                       WriteOpers("*** %s added %lu second channel ban on %s (%s)", user->nick, length, parameters[0], reason.c_str());
                                }
                                else
                                {
-                                       WriteServ(user->fd, "385 %s %s :Added permenant channel ban (%s)", user->nick, parameters[0], parameters[2]);
-                                       WriteOpers("*** %s added permenant channel ban on %s (%s)", user->nick, parameters[0], parameters[2]);
+                                       WriteServ(user->fd, "385 %s %s :Added permenant channel ban (%s)", user->nick, parameters[0], reason.c_str());
+                                       WriteOpers("*** %s added permenant channel ban on %s (%s)", user->nick, parameters[0], reason.c_str());
                                }
                        }
                        else
                        {
-                               WriteServ(user->fd, "403 %s %s :No such channel", user->nick, parameters[0]);
+                               WriteServ(user->fd, "403 %s %s :Invalid channel name", user->nick, parameters[0]);
                        }
                }
        }
@@ -143,10 +145,13 @@ class ModuleCBan : public Module
        {
                ExpireBans();
        
-               for(cbanlist::iterator iter = cbans.begin(); iter != cbans.end(); iter++)
+               if(symbol == 'C')
                {
-                       unsigned long remaining = (iter->set_on + iter->length) - TIME;
-                       WriteServ(user->fd, "210 %s %s %s %lu %lu %lu :%s", user->nick, iter->chname.c_str(), iter->set_by.c_str(), iter->set_on, iter->length, remaining, iter->reason.c_str());
+                       for(cbanlist::iterator iter = cbans.begin(); iter != cbans.end(); iter++)
+                       {
+                               unsigned long remaining = (iter->set_on + iter->length) - TIME;
+                               WriteServ(user->fd, "210 %s %s %s %lu %lu %lu :%s", user->nick, iter->chname.c_str(), iter->set_by.c_str(), iter->set_on, iter->length, remaining, iter->reason.c_str());
+                       }
                }
                
                return 0;
@@ -193,7 +198,7 @@ class ModuleCBan : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_VENDOR);
+               return Version(1,0,0,1,VF_VENDOR);
        }
 };
 
@@ -207,7 +212,7 @@ std::string EncodeCBan(const CBan &ban)
 CBan DecodeCBan(const std::string &data)
 {
        CBan res;
-       std::istringstream stream;
+       std::istringstream stream(data);
        stream >> res.chname;
        stream >> res.set_by;
        stream >> res.set_on;
@@ -234,21 +239,6 @@ void ExpireBans()
        }
 }
 
-bool IsValidChan(const char* cname)
-{
-       if(!cname)
-               return false;
-               
-       if(cname[0] != '#')
-               return false;
-               
-       for(unsigned int i = 0; i < strlen(cname); i++)
-               if((cname[i] == ' ') || (cname[i] == '\7') || (cname[i] == ','))
-                       return false;
-                       
-       return true;
-}
-
 class ModuleCBanFactory : public ModuleFactory
 {
  public: