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 8739fc98ce6276752b8a7c694702267e093f2487..fa554102f842d953d7aff67f943f445391c688ed 100644 (file)
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -49,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;
@@ -93,7 +92,7 @@ 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
@@ -118,7 +117,7 @@ class cmd_cban : public command_t
                        }
                        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]);
                        }
                }
        }
@@ -199,29 +198,26 @@ class ModuleCBan : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_VENDOR);
+               return Version(1,0,0,1,VF_VENDOR);
        }
 };
 
 std::string EncodeCBan(const CBan &ban)
 {
        std::ostringstream stream;      
-       stream << ban.chname.c_str() << " " << ban.set_by << " " << ban.set_on << " " << ban.length << " " << ban.reason;
+       stream << ban.chname << " " << ban.set_by << " " << ban.set_on << " " << ban.length << " " << ban.reason;
        return stream.str();    
 }
 
 CBan DecodeCBan(const std::string &data)
 {
        CBan res;
-       std::istringstream stream;
-       // XXX - Change this...we shouldn't need tempname, need an overloaded iostream operator on irc::string?
-       std::string tempname;
-       stream >> tempname;
+       std::istringstream stream(data);
+       stream >> res.chname;
        stream >> res.set_by;
        stream >> res.set_on;
        stream >> res.length;
        res.reason = stream.str();
-       res.chname = tempname.c_str();
        
        return res;
 }
@@ -243,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: