jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-10 00:04:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Publish username rules in login failure, too

Browse source
This commit is contained in:
Fabio Bas 2015-06-30 18:44:40 +02:00
parent 4c27304047
commit 02dcaff356
4 changed files with 48 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

73
cockatrice/src/window_main.cpp
View file

@ -83,7 +83,7 @@ void MainWindow::processConnectionClosedEvent(const Event_ConnectionClosed &even
break;
}
case Event_ConnectionClosed::SERVER_SHUTDOWN: reasonStr = tr("Scheduled server shutdown."); break;
case Event_ConnectionClosed::USERNAMEINVALID: reasonStr = tr("Invalid username.\nYou may only use A-Z, a-z, 0-9, _, ., and - in your username."); break;
case Event_ConnectionClosed::USERNAMEINVALID: reasonStr = tr("Invalid username."); break;
default: reasonStr = QString::fromStdString(event.reason_str());
}
QMessageBox::critical(this, tr("Connection closed"), tr("The server has terminated your connection.\nReason: %1").arg(reasonStr));
@ -306,9 +306,12 @@ void MainWindow::loginError(Response::ResponseCode r, QString reasonStr, quint32
QMessageBox::critical(this, tr("Error"), bannedStr);
break;
}
case Response::RespUsernameInvalid:
QMessageBox::critical(this, tr("Error"), tr("Invalid username.\nYou may only use A-Z, a-z, 0-9, _, ., and - in your username."));
case Response::RespUsernameInvalid: {
QString errorStr;
extractInvalidUsernameMessage(reasonStr, errorStr);
QMessageBox::critical(this, tr("Error"), errorStr);
break;
}
case Response::RespRegistrationRequired:
if (QMessageBox::question(this, tr("Error"), tr("This server requires user registration. Do you want to register now?"), QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
actRegister();
@ -332,6 +335,36 @@ void MainWindow::loginError(Response::ResponseCode r, QString reasonStr, quint32
actConnect();
}
void MainWindow::extractInvalidUsernameMessage(QString & in, QString & out)
{
out = tr("Invalid username.") + "<br/>";
QStringList rules = in.split(QChar('|'));
if (rules.size() == 7)
{
out += tr("The username must respect these rules:") + "<br/><ul>"
+ "<li>" + tr("length between %1 and %2 characters").arg(rules.at(0)).arg(rules.at(1)) + "</li>";
if(rules.at(2).toInt() > 0)
out += "<li>" + tr("it can contain lowercase characters") + "</li>";
if(rules.at(3).toInt() > 0)
out += "<li>" + tr("it can contain uppercase characters") + "</li>";
if(rules.at(4).toInt() > 0)
out += "<li>" + tr("it can contain numeric characters") + "</li>";
if(rules.at(6).size() > 0)
out += "<li>" + tr("it can contain the following punctuation: %1").arg(
#if QT_VERSION < 0x050000
Qt::escape(rules.at(6))
#else
rules.at(6).toHtmlEscaped()
#endif
) + "</li>";
if(rules.at(5).toInt() > 0)
out += "<li>" + tr("the first character can't be a punctuation") + "</li>";
out += "</ul>";
} else {
out += tr("You may only use A-Z, a-z, 0-9, _, ., and - in your username.");
}
}
void MainWindow::registerError(Response::ResponseCode r, QString reasonStr, quint32 endTime)
{
switch (r) {
@ -362,36 +395,10 @@ void MainWindow::registerError(Response::ResponseCode r, QString reasonStr, quin
QMessageBox::critical(this, tr("Error"), bannedStr);
break;
}
case Response::RespUsernameInvalid:
{
QString error = tr("Invalid username.") + "<br/>";
QStringList rules = reasonStr.split(QChar('|'));
if (rules.size() == 7)
{
error += tr("The username must respect these rules:") + "<br/><ul>"
+ "<li>" + tr("length between %1 and %2 characters").arg(rules.at(0)).arg(rules.at(1)) + "</li>";
if(rules.at(2).toInt() > 0)
error += "<li>" + tr("it can contain lowercase characters") + "</li>";
if(rules.at(3).toInt() > 0)
error += "<li>" + tr("it can contain uppercase characters") + "</li>";
if(rules.at(4).toInt() > 0)
error += "<li>" + tr("it can contain numeric characters") + "</li>";
if(rules.at(6).size() > 0)
error += "<li>" + tr("it can contain the following punctuation: %1").arg(
#if QT_VERSION < 0x050000
Qt::escape(rules.at(6))
#else
rules.at(6).toHtmlEscaped()
#endif
) + "</li>";
if(rules.at(5).toInt() > 0)
error += "<li>" + tr("the first character can't be a punctuation") + "</li>";
error += "</ul>";
} else {
error += tr("You may only use A-Z, a-z, 0-9, _, ., and - in your username.");
}
QMessageBox::critical(this, tr("Error"), error);
case Response::RespUsernameInvalid: {
QString errorStr;
extractInvalidUsernameMessage(reasonStr, errorStr);
QMessageBox::critical(this, tr("Error"), errorStr);
break;
}
case Response::RespRegistrationFailed: