hedgewars: comparison QTfrontend/hwform.cpp

equal deleted inserted replaced

-:fae7a18afe03
+:0e5782b0dd54
 }
 void HWForm::NetPassword(const QString & nick)
 {
 //Get hashes
-QString hash =  config->value("net/passwordhash", "").toString();
+QString hash =  config->passwordHash();
-QString temphash =  config->value("net/temppasswordhash", "").toString();
+QString temphash =  config->tempHash();
 //Check them
 if (temphash.isEmpty() && hash.isEmpty()) { //If the user enters a registered nick with no password, sends a bogus hash
 hwnet->SendPasswordHash("THISISNOHASH");
 else { //Send the hash
 hwnet->SendPasswordHash(temphash);
 }
 //Remove temporary hash from config
-clearPasswordHashes(true, false);
+config->clearPasswordHash();
-}
-inline void HWForm::clearPasswordHashes(bool clearTempHash, bool clearHash)
-{
-if (clearTempHash) {
-QString key = "net/temppasswordhash";
-config->setValue(key, "");
-config->remove(key);
-}
-if (clearHash) {
-config->setValue("net/passwordhash", "");
-config->setValue("net/passwordlength", 0);
-}
 }
 void HWForm::NetNickRegistered(const QString & nick)
 {
 //Get hashes
-QString hash =  config->value("net/passwordhash", "").toString();
+QString hash =  config->passwordHash();
-QString temphash =  config->value("net/temppasswordhash", "").toString();
+QString temphash =  config->tempHash();
+qDebug("NETNICKREGISTERED");
 if (hash.isEmpty()) {
-if (temphash.isEmpty()) { //If the user enters a registered nick with no password
+qDebug("NNR - HASH EMPTY");
-	  QString suppliedpass;
+if (temphash.isEmpty()) { //If the user enters a registered nick with no password
-	  while (suppliedpass.isEmpty()) {
+qDebug("NNR - TEMPHASH EMTPY");
-	      QInputDialog nickRegedDialog(this);
+QString suppliedpass;
-	      nickRegedDialog.setWindowModality(Qt::WindowModal);
+while (suppliedpass.isEmpty()) {
-	      nickRegedDialog.setInputMode(QInputDialog::TextInput);
+QInputDialog nickRegedDialog(this);
-	      nickRegedDialog.setWindowTitle(tr("Hedgewars - Nick registered"));
+nickRegedDialog.setWindowModality(Qt::WindowModal);
-	      nickRegedDialog.setLabelText(tr("This nick is registered, and you haven't specified a password.\n\nIf this nick isn't yours, please register your own nick at www.hedgewars.org\n\nPassword:"));
+nickRegedDialog.setInputMode(QInputDialog::TextInput);
-	      nickRegedDialog.setTextEchoMode(QLineEdit::Password);
+nickRegedDialog.setWindowTitle(tr("Hedgewars - Nick registered"));
-	      nickRegedDialog.exec();
+nickRegedDialog.setLabelText(tr("This nick is registered, and you haven't specified a password.\n\nIf this nick isn't yours, please register your own nick at www.hedgewars.org\n\nPassword:"));
+nickRegedDialog.setTextEchoMode(QLineEdit::Password);
-	      suppliedpass = nickRegedDialog.textValue();
+nickRegedDialog.exec();
-	      if (nickRegedDialog.result() == QDialog::Rejected) {
+suppliedpass = nickRegedDialog.textValue();
-		clearPasswordHashes(true, true);
-		GoBack();
+if (nickRegedDialog.result() == QDialog::Rejected) {
-		return;
+config->clearPasswordHash();
-	      }
+config->clearTempHash();
-	      temphash = QCryptographicHash::hash(suppliedpass.toUtf8(), QCryptographicHash::Md5).toHex();
+GoBack();
-	      config->setValue("net/temppasswordhash", temphash);
+return;
-	  }
+}
-}
+temphash = QCryptographicHash::hash(suppliedpass.toUtf8(), QCryptographicHash::Md5).toHex();
-}
+config->setTempHash(temphash);
+}
+}
+}
 NetPassword(nick);
 }
 void HWForm::NetNickTaken(const QString & nick)
 {
 }
 void HWForm::NetAuthFailed()
 {
 // Set the password blank if case the user tries to join and enter his password again
-clearPasswordHashes(false, true);
+config->clearTempHash();
 //Try to login again
 bool retry = RetryDialog("Hedgewars - Wrong password", "You entered a wrong password.");
 GoBack();
 if (retry) {
 // config stuff
 connect(hwnet, SIGNAL(paramChanged(const QString &, const QStringList &)), ui.pageNetGame->pGameCFG, SLOT(setParam(const QString &, const QStringList &)));
 connect(ui.pageNetGame->pGameCFG, SIGNAL(paramChanged(const QString &, const QStringList &)), hwnet, SLOT(onParamChanged(const QString &, const QStringList &)));
 connect(hwnet, SIGNAL(configAsked()), ui.pageNetGame->pGameCFG, SLOT(fullNetConfig()));
 //nick and pass stuff
 //remove temppasswordhash just in case
-clearPasswordHashes(true, false);
+config->clearTempHash();
 //initialize
-QString hash = config->value("net/passwordhash", "").toString();
+QString hash = config->passwordHash();
-QString temphash = config->value("net/temppasswordhash", "").toString();
+QString temphash = config->tempHash();
 QString nickname = config->value("net/nick", "").toString();
 QString password;
 if (nickname.isEmpty() || hash.isEmpty()) { //if something from login is missing, start dialog loop
 while (nickname.isEmpty() || (hash.isEmpty() && temphash.isEmpty())) //while a nickname, or both hashes are missing
 {
-	//open dialog
+//open dialog
-HWPasswordDialog * hpd = new HWPasswordDialog(this);
+HWPasswordDialog * pwDialog = new HWPasswordDialog(this);
-hpd->cbSave->setChecked(config->value("net/savepassword", true).toBool());
+pwDialog->cbSave->setChecked(config->value("net/savepassword", true).toBool());
-	//if nickname is present, put it into the field
+//if nickname is present, put it into the field
-	if (!nickname.isEmpty()) {
+if (!nickname.isEmpty()) {
-	    hpd->leNickname->setText(nickname);
+pwDialog->leNickname->setText(nickname);
-	    hpd->lePassword->setFocus();
+pwDialog->lePassword->setFocus();
-	}
+}
-	//if dialog close, create an error message
+//if dialog close, create an error message
-if (hpd->exec() != QDialog::Accepted)
+if (pwDialog->exec() != QDialog::Accepted) {
-{
+delete pwDialog;
-delete hpd;
+GoBack();
-	    GoBack();
 return;
 }
-	//set nick and pass from the dialog
+//set nick and pass from the dialog
-	nickname = hpd->leNickname->text();
+nickname = pwDialog->leNickname->text();
-password = hpd->lePassword->text();
+password = pwDialog->lePassword->text();
-	//check the nickname variable
+//check the nickname variable
-	if (nickname.isEmpty()) {
+if (nickname.isEmpty()) {
-	    //ForcedDisconnect(tr("No nickname supplied."));
+int retry = RetryDialog("Hedgewars - Empty nickname", "No nickname supplied.");
-	    int retry = RetryDialog("Hedgewars - Empty nickname", "No nickname supplied.");
+GoBack();
-	    GoBack();
+delete pwDialog;
-delete hpd;
 if (retry) {
 NetConnectOfficialServer();
 }
-	    //delete hpd;
+return;
-	    return;
+}
-	}
+if (!password.isEmpty()) {
-	if (!password.isEmpty()) {
+//calculate temphash and set it into config
-	  //calculate temphash and set it into config
+temphash = QCryptographicHash::hash(password.toUtf8(), QCryptographicHash::Md5).toHex();
-	  temphash = QCryptographicHash::hash(password.toUtf8(), QCryptographicHash::Md5).toHex();
+config->setTempHash(temphash);
-	  config->setValue("net/temppasswordhash", temphash);
+//if user wants to save password
-	  //if user wants to save password
+bool save = pwDialog->cbSave->isChecked();
-	  bool save = hpd->cbSave->isChecked();
+config->setValue("net/savepassword", save);
-	  config->setValue("net/savepassword", save);
+if (save) // user wants to save password
-	  if (save) // user wants to save password
+{
-	  {
+config->setPasswordHash(temphash);
-	    config->setValue("net/passwordhash", temphash);
+config->setNetPasswordLength(password.size());
-	    config->setValue("net/passwordlength", password.size());
+}
-	    config->setNetPasswordLength(password.size());
+}
-	  }
+else {
-	}
+delete pwDialog;
-	else {
+config->setValue("net/nick", nickname);
-	  config->setValue("net/temppasswordhash", "EMPTY");
+config->updNetNick();
-	}
+config->clearPasswordHash();
+break;
-delete hpd;
+}
-	//update nickname
+delete pwDialog;
+//update nickname
 config->setValue("net/nick", nickname);
 config->updNetNick();
-	//and all the variables
+//and all the variables
-	hash = config->value("net/passwordhash", "").toString();
+hash = config->passwordHash();
-	temphash = config->value("net/temppasswordhash", "").toString();
+temphash = config->tempHash();
-	nickname = config->value("net/nick", "").toString();
+nickname = config->value("net/nick", "").toString();
 }
-	//if pass is none (hash is generated anyway), remove the hash
-	if (password.size() <= 0) {
-	    clearPasswordHashes(true, false);
-	}
 }
 ui.pageRoomsList->setUser(nickname);
 ui.pageNetGame->setUser(nickname);

changeset 8294	0e5782b0dd54
parent 8293	fae7a18afe03
child 8295	6ef114ea2298