| -rw-r--r-- | noncore/net/opieirc/ircchannel.cpp | 6 | ||||
| -rw-r--r-- | noncore/net/opieirc/ircchannel.h | 1 | ||||
| -rw-r--r-- | noncore/net/opieirc/ircservereditor.cpp | 7 |
3 files changed, 12 insertions, 2 deletions
diff --git a/noncore/net/opieirc/ircchannel.cpp b/noncore/net/opieirc/ircchannel.cpp index 5d81596..b9e377d 100644 --- a/noncore/net/opieirc/ircchannel.cpp +++ b/noncore/net/opieirc/ircchannel.cpp @@ -43,6 +43,12 @@ IRCChannelPerson *IRCChannel::getPerson(QString nickname) { return it.current(); } } return 0; } +bool IRCChannel::isValid(const QString &channel) +{ + return ( channel.startsWith("#") || channel.startsWith("&") + || channel.startsWith("+") || channel.startsWith("!")); +} + diff --git a/noncore/net/opieirc/ircchannel.h b/noncore/net/opieirc/ircchannel.h index a276f10..001f5bb 100644 --- a/noncore/net/opieirc/ircchannel.h +++ b/noncore/net/opieirc/ircchannel.h @@ -46,12 +46,13 @@ public: /* hasPeople identifies whether the irc channel is done synchronizing with the current state - this is only relevant when joining a channel */ void setHasPeople(bool hasPeople); QString channelname(); bool hasPeople(); + static bool isValid(const QString &channel); protected: QList<IRCChannelPerson> m_people; QString m_channelname; bool m_hasPeople; }; diff --git a/noncore/net/opieirc/ircservereditor.cpp b/noncore/net/opieirc/ircservereditor.cpp index 1fda868..e5c9ab5 100644 --- a/noncore/net/opieirc/ircservereditor.cpp +++ b/noncore/net/opieirc/ircservereditor.cpp @@ -1,7 +1,8 @@ #include "ircservereditor.h" +#include "ircchannel.h" /* OPIE */ #include <qpe/qpeapplication.h> /* QT */ #include <qmessagebox.h> @@ -66,14 +67,16 @@ void IRCServerEditor::accept() { // QMessageBox::critical(this, tr("Error"), tr("Realname required")); else { /* Now verify whether the channel list has a valid format */ QStringList channels = QStringList::split(QChar(','), m_channels->text()); for (QStringList::Iterator it = channels.begin(); it != channels.end(); ++it) { QString channelName = (*it).stripWhiteSpace(); - if (!channelName.startsWith("#") && !channelName.startsWith("+")) { - QMessageBox::critical(this, tr("Error"), tr("The channel list needs to contain a\ncomma separated list of channel\n names which start with either '#' or '+'")); + if (!IRCChannel::isValid(channelName)) { + QMessageBox::critical(this, tr("Error"), tr("The channel list needs to contain a\ncomma " + "separated list of valid\n channel names (starting \n" + "with one of '#' '+' '&' '!'")); return; } } QDialog::accept(); } } |