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
@@ -1,48 +1,54 @@
 #include "ircchannel.h"
 #include "ircchannelperson.h"
 
 IRCChannel::IRCChannel(QString channelname) {
     m_hasPeople = FALSE;
     m_channelname = channelname;
 }
 
 IRCChannel::~IRCChannel() {
     /* We want this to get deleted */
     m_people.setAutoDelete(TRUE);
 }
 
 QString IRCChannel::channelname() {
     return m_channelname;
 }
 
 bool IRCChannel::hasPeople() {
     return m_hasPeople;
 }
 
 void IRCChannel::setHasPeople(bool hasPeople) {
     m_hasPeople = hasPeople;
 }
 
 void IRCChannel::addPerson(IRCChannelPerson *person) {
     m_people.append(person);
 }
 
 void IRCChannel::removePerson(IRCChannelPerson *person) {
     m_people.remove(person);
 }
 
 QListIterator<IRCChannelPerson> IRCChannel::people()  {
     QListIterator<IRCChannelPerson> it(m_people);
     return it;
 }
 
 IRCChannelPerson *IRCChannel::getPerson(QString nickname) {
     QListIterator<IRCChannelPerson> it(m_people);
     for (; it.current(); ++it) {
         if (it.current()->nick() == 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
@@ -4,55 +4,56 @@
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 */
 
 #ifndef __IRCCHANNEL_H
 #define __IRCCHANNEL_H
 
 #include <qobject.h>
 #include <qlist.h>
 #include <qstring.h>
 
 #include "ircperson.h"
 
 class IRCChannelPerson;
 
 /* IRCChannel is the object-oriented representation
    of an IRC channel. It basically acts as a container
    for IRCChannelPersons */
 class IRCChannel : public QObject {
     Q_OBJECT
 public:
     IRCChannel(QString channelname);
     ~IRCChannel();
    
     void addPerson(IRCChannelPerson *person);
     void removePerson(IRCChannelPerson *person);
     IRCChannelPerson *getPerson(QString nickname);
     QListIterator<IRCChannelPerson> people();
 
     /* 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;
 };
 
 #endif /* __IRCCHANNEL_H */
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,92 +1,95 @@
 #include "ircservereditor.h"
+#include "ircchannel.h"
 
 /* OPIE */
 #include <qpe/qpeapplication.h>
 
 /* QT */
 #include <qmessagebox.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qwhatsthis.h>
 
 IRCServerEditor::IRCServerEditor(IRCServer server, QWidget* parent, const char* name, bool modal, WFlags) : QDialog(parent, name, modal, WStyle_ContextHelp) {
     QGridLayout *layout = new QGridLayout(this, 7, 2, 5, 5);
     QLabel *label = new QLabel(tr("Profile name :"), this);
     m_name = new QLineEdit(server.name(), this);
     QWhatsThis::add(m_name, tr("The name of this server profile in the overview"));
     layout->addWidget(label, 0, 0);
     layout->addWidget(m_name, 0, 1);
     label = new QLabel(tr("Hostname :"), this);
     m_hostname = new QLineEdit(server.hostname(), this);
     QWhatsThis::add(m_hostname, tr("The server to connect to - can be any valid host name or IP address"));
     layout->addWidget(label, 1, 0);
     layout->addWidget(m_hostname, 1, 1);
     label = new QLabel(tr("Port :"), this);
     m_port = new QLineEdit(QString::number(server.port()), this);
     QWhatsThis::add(m_port, tr("The server port to connect to. Usually 6667"));
     layout->addWidget(label, 2, 0);
     layout->addWidget(m_port, 2, 1);
     label = new QLabel(tr("Nickname :"), this);
     m_nickname = new QLineEdit(server.nick(), this);
     QWhatsThis::add(m_nickname, tr("Your nick name on the IRC network"));
     layout->addWidget(label, 3, 0);
     layout->addWidget(m_nickname, 3, 1);
     label = new QLabel(tr("Realname :"), this);
     m_realname = new QLineEdit(server.realname(), this);
     QWhatsThis::add(m_realname, tr("Your real name"));
     layout->addWidget(label, 4, 0);
     layout->addWidget(m_realname, 4, 1);
     label = new QLabel(tr("Password :"), this);
     m_password = new QLineEdit(server.password(), this);
     m_password->setEchoMode( QLineEdit::Password );
     QWhatsThis::add(m_password, tr("Password to connect to the server (if required)"));
     layout->addWidget(label, 5, 0);
     layout->addWidget(m_password, 5, 1);
     label = new QLabel(tr("Channels :"), this);
     m_channels = new QLineEdit(server.channels(), this);
     QWhatsThis::add(m_channels, tr("Comma-Separated list of all channels you would like to join automatically"));
     layout->addWidget(label, 6, 0);
     layout->addWidget(m_channels, 6, 1);
     setCaption(tr("Edit server information"));
 
     QPEApplication::showDialog( this );
 }
 
 
 void IRCServerEditor::accept() {
     if (m_name->text().length()==0)
         QMessageBox::critical(this, tr("Error"), tr("Profile name required"));
     else if (m_hostname->text().length()==0)
         QMessageBox::critical(this, tr("Error"), tr("Host name required"));
     //else if (m_port->text().toInt()<=0)
     //    QMessageBox::critical(this, tr("Error"), tr("Port required"));
     else if (m_nickname->text().length()==0)
         QMessageBox::critical(this, tr("Error"), tr("Nickname required"));
     //else if (m_realname->text().length()==0)
     //    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();
     }
 }
 
 IRCServer IRCServerEditor::getServer() {
     IRCServer server;
     server.setName(m_name->text());
     server.setHostname(m_hostname->text());
     server.setPort(m_port->text().toInt());
     server.setNick(m_nickname->text());
     server.setRealname(m_realname->text());
     server.setUsername(m_nickname->text());
     server.setPassword(m_password->text());
     server.setChannels(m_channels->text());
     return server;
 }