ident: rename ext to socket.

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

diff --git a/src/modules/m_chanhistory.cpp b/src/modules/m_chanhistory.cpp
index 06840744b1e7269ad7d9806bee8079def89720e6..1057e63b63338fcdb8aa48aabe98e279f17e3fb9 100644 (file)
--- a/src/modules/m_chanhistory.cpp
+++ b/src/modules/m_chanhistory.cpp
@@ -48,20 +48,6 @@ struct HistoryList
 
 class HistoryMode : public ParamMode<HistoryMode, SimpleExtItem<HistoryList> >
 {
-       bool IsValidDuration(const std::string& duration)
-       {
-               for (std::string::const_iterator i = duration.begin(); i != duration.end(); ++i)
-               {
-                       unsigned char c = *i;
-                       if (((c >= '0') && (c <= '9')) || (c == 's') || (c == 'S'))
-                               continue;
-
-                       if (duration_multi[c] == 1)
-                               return false;
-               }
-               return true;
-       }
-
  public:
        unsigned int maxlines;
        HistoryMode(Module* Creator)
@@ -79,15 +65,15 @@ class HistoryMode : public ParamMode<HistoryMode, SimpleExtItem<HistoryList> >
                }
 
                std::string duration(parameter, colon+1);
-               if ((IS_LOCAL(source)) && ((duration.length() > 10) || (!IsValidDuration(duration))))
+               if ((IS_LOCAL(source)) && ((duration.length() > 10) || (!InspIRCd::IsValidDuration(duration))))
                {
                        source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter));
                        return MODEACTION_DENY;
                }
 
-               unsigned int len = ConvToInt(parameter.substr(0, colon));
-               unsigned int time = InspIRCd::Duration(duration);
-               if (len == 0 || (len > maxlines && IS_LOCAL(source)))
+               unsigned int len = ConvToNum<unsigned int>(parameter.substr(0, colon));
+               unsigned long time;
+               if (!InspIRCd::Duration(duration, time) || len == 0 || (len > maxlines && IS_LOCAL(source)))
                {
                        source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter));
                        return MODEACTION_DENY;