author | skyhusker <skyhusker> | 2005-01-16 02:14:38 (UTC) |
---|---|---|
committer | skyhusker <skyhusker> | 2005-01-16 02:14:38 (UTC) |
commit | 986280fcb93a2c9550aa83a3109deb885ce50e8f (patch) (unidiff) | |
tree | d507028d909e7e7f1703aa80b3b2d7201573bd93 /noncore/net | |
parent | e420e24bb1506e313cc38174111d424ba7274e33 (diff) | |
download | opie-986280fcb93a2c9550aa83a3109deb885ce50e8f.zip opie-986280fcb93a2c9550aa83a3109deb885ce50e8f.tar.gz opie-986280fcb93a2c9550aa83a3109deb885ce50e8f.tar.bz2 |
Fixed a bug in nickname handling with networks using nickname:password for auth
-rw-r--r-- | noncore/net/opieirc/ircmessageparser.cpp | 48 |
1 files changed, 28 insertions, 20 deletions
diff --git a/noncore/net/opieirc/ircmessageparser.cpp b/noncore/net/opieirc/ircmessageparser.cpp index fde156c..cfad2c1 100644 --- a/noncore/net/opieirc/ircmessageparser.cpp +++ b/noncore/net/opieirc/ircmessageparser.cpp | |||
@@ -68,16 +68,16 @@ IRCNumericalMessageParserStruct IRCMessageParser::numericalParserProcTable[] = { | |||
68 | { 391, QT_TR_NOOP("Time on server %1 is %2"), "1,2", 0 }, // RPL_TIME | 68 | { 391, QT_TR_NOOP("Time on server %1 is %2"), "1,2", 0 }, // RPL_TIME |
69 | { 401, QT_TR_NOOP("Channel or nick %1 doesn't exists"), "1", 0 }, // ERR_NOSUCHNICK | 69 | { 401, QT_TR_NOOP("Channel or nick %1 doesn't exists"), "1", 0 }, // ERR_NOSUCHNICK |
70 | { 406, QT_TR_NOOP("There is no history information for %1"), "1" }, // ERR_WASNOSUCHNICK | 70 | { 406, QT_TR_NOOP("There is no history information for %1"), "1" }, // ERR_WASNOSUCHNICK |
71 | { 409, "%1", "1", 0 }, // ERR_NOORIGIN | 71 | { 409, "%1", "1", 0 }, // ERR_NOORIGIN |
72 | { 411, "%1", "1", 0 }, // ERR_NORECIPIENT | 72 | { 411, "%1", "1", 0 }, // ERR_NORECIPIENT |
73 | { 412, "%1", "1", 0 }, // ERR_NOTEXTTOSEND | 73 | { 412, "%1", "1", 0 }, // ERR_NOTEXTTOSEND |
74 | { 421, QT_TR_NOOP("Unknown command: %1"), "1", 0 }, // ERR_NOMOTD | 74 | { 421, QT_TR_NOOP("Unknown command: %1"), "1", 0 }, // ERR_ERR_UNKNOWNCOMMAND |
75 | { 422, QT_TR_NOOP("You're not on channel %1"), "1", 0}, // ERR_NOTONCHANNEL | ||
76 | { 422, "%1", "1", 0 }, // ERR_NOMOTD | 75 | { 422, "%1", "1", 0 }, // ERR_NOMOTD |
77 | { 433, QT_TR_NOOP("Can't change nick to %1: %2"), "1,2", FUNC(parseNumericalNicknameInUse) }, // ERR_NICKNAMEINUSE | 76 | { 433, QT_TR_NOOP("Can't change nick to %1: %2"), "1,2", FUNC(parseNumericalNicknameInUse) }, // ERR_NICKNAMEINUSE |
77 | { 442, QT_TR_NOOP("You're not on channel %1"), "1", 0}, // ERR_NOTONCHANNEL | ||
78 | { 477, "%1", "1", 0 }, // ERR_NOCHANMODES || ERR_NEEDREGGEDNICK | 78 | { 477, "%1", "1", 0 }, // ERR_NOCHANMODES || ERR_NEEDREGGEDNICK |
79 | { 482, QT_TR_NOOP("[%1] Operation not permitted, you don't have enough channel privileges"), "1", 0 }, //ERR_CHANOPRIVSNEEDED | 79 | { 482, QT_TR_NOOP("[%1] Operation not permitted, you don't have enough channel privileges"), "1", 0 }, //ERR_CHANOPRIVSNEEDED |
80 | { 0, 0, 0, 0 } | 80 | { 0, 0, 0, 0 } |
81 | }; | 81 | }; |
82 | 82 | ||
83 | 83 | ||
@@ -133,12 +133,16 @@ void IRCMessageParser::parseNumerical(IRCMessage *message, int position) { | |||
133 | if(numericalParserProcTable[position].proc) | 133 | if(numericalParserProcTable[position].proc) |
134 | (this->*(numericalParserProcTable[position].proc))(message); | 134 | (this->*(numericalParserProcTable[position].proc))(message); |
135 | } | 135 | } |
136 | 136 | ||
137 | void IRCMessageParser::parseNumericalServerName(IRCMessage *message) { | 137 | void IRCMessageParser::parseNumericalServerName(IRCMessage *message) { |
138 | emit outputReady(IRCOutput(OUTPUT_TITLE, tr("Connected to")+" <b>" + message->prefix() + "</b>")); | 138 | emit outputReady(IRCOutput(OUTPUT_TITLE, tr("Connected to")+" <b>" + message->prefix() + "</b>")); |
139 | /* Register EFFECTIVE nickname, some networks (as irc-hispano) uses nick:password | ||
140 | * for authentication and the parser gets confused */ | ||
141 | m_session->m_server->setNick(message->param(0)); | ||
142 | |||
139 | } | 143 | } |
140 | 144 | ||
141 | void IRCMessageParser::parseNumericalServerFeatures(IRCMessage *message) { | 145 | void IRCMessageParser::parseNumericalServerFeatures(IRCMessage *message) { |
142 | m_session->setValidUsermodes(message->param(2)); | 146 | m_session->setValidUsermodes(message->param(2)); |
143 | m_session->setValidChannelmodes(message->param(3)); | 147 | m_session->setValidChannelmodes(message->param(3)); |
144 | 148 | ||
@@ -246,31 +250,35 @@ void IRCMessageParser::parseLiteralPrivMsg(IRCMessage *message) { | |||
246 | person = new IRCPerson(message->prefix()); | 250 | person = new IRCPerson(message->prefix()); |
247 | m_session->addPerson(person); | 251 | m_session->addPerson(person); |
248 | } | 252 | } |
249 | IRCOutput output(OUTPUT_QUERYPRIVMSG, message->param(1)); | 253 | IRCOutput output(OUTPUT_QUERYPRIVMSG, message->param(1)); |
250 | output.addParam(person); | 254 | output.addParam(person); |
251 | emit outputReady(output); | 255 | emit outputReady(output); |
252 | } else if (message->param(0).at(0) == '#' || message->param(0).at(0) == '+') { | 256 | } |
253 | /* IRC Channel message detected, verify sender, channel and display it */ | 257 | else |
254 | IRCChannel *channel = m_session->getChannel(message->param(0).lower()); | 258 | if (message->param(0).at(0) == '#' || message->param(0).at(0) == '+') { |
255 | if (channel) { | 259 | /* IRC Channel message detected, verify sender, channel and display it */ |
256 | IRCPerson mask(message->prefix()); | 260 | IRCChannel *channel = m_session->getChannel(message->param(0).lower()); |
257 | IRCChannelPerson *person = channel->getPerson(mask.nick()); | 261 | if (channel) { |
258 | if (person) { | 262 | IRCPerson mask(message->prefix()); |
259 | IRCOutput output(OUTPUT_CHANPRIVMSG, message->param(1)); | 263 | IRCChannelPerson *person = channel->getPerson(mask.nick()); |
260 | output.addParam(channel); | 264 | if (person) { |
261 | output.addParam(person); | 265 | IRCOutput output(OUTPUT_CHANPRIVMSG, message->param(1)); |
262 | emit outputReady(output); | 266 | output.addParam(channel); |
263 | } else { | 267 | output.addParam(person); |
264 | emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Channel message with unknown sender"))); | 268 | emit outputReady(output); |
269 | } | ||
270 | else { | ||
271 | emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Channel message with unknown sender"))); | ||
272 | } | ||
273 | } | ||
274 | else { | ||
275 | emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Channel message with unknown channel %1").arg(message->param(0).lower()) )); | ||
265 | } | 276 | } |
266 | } else { | 277 | } |
267 | emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Channel message with unknown channel %1").arg(message->param(0).lower()) )); | 278 | else {emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Received PRIVMSG of unknown type"))); |
268 | } | ||
269 | } else { | ||
270 | emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Received PRIVMSG of unknown type"))); | ||
271 | } | 279 | } |
272 | } | 280 | } |
273 | 281 | ||
274 | void IRCMessageParser::parseLiteralNick(IRCMessage *message) { | 282 | void IRCMessageParser::parseLiteralNick(IRCMessage *message) { |
275 | IRCPerson mask(message->prefix()); | 283 | IRCPerson mask(message->prefix()); |
276 | m_session->updateNickname(mask.nick(), message->param(0)); | 284 | m_session->updateNickname(mask.nick(), message->param(0)); |