sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

password checking/saving fixed

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@130 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
gsherman 2002-10-12 21:17:11 +00:00
parent 12f162a554
commit 8bf24a3b01
3 changed files with 42 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
qgis/src/qgsdbsourceselect.cpp
View File

@ -22,6 +22,7 @@
#include <qstringlist.h>
#include <qcombobox.h>
#include <qmessagebox.h>
#include <qinputdialog.h>
#include "xpm/point_layer.xpm"
#include "xpm/line_layer.xpm"
#include "xpm/polygon_layer.xpm"
@ -77,11 +78,28 @@ void QgsDbSourceSelect::dbConnect()
QSettings settings;
QString key = "/Qgis/connections/" + cmbConnections->currentText();
QString host = "host=" + settings.readEntry(key + "/host");
QString database = "dbname=" + settings.readEntry(key + "/database");
QString username = "user=" + settings.readEntry(key + "/username");
QString password = "password=" + settings.readEntry(key + "/password");
m_connInfo = host + " " + database + " " + username + " " + password;
QString connString = "host=";
QString host = settings.readEntry(key + "/host");
connString += host;
connString += " dbname=";
QString database = settings.readEntry(key + "/database");
connString += database + " user=";
QString username = settings.readEntry(key + "/username");
connString += username;
QString password = settings.readEntry(key + "/password");
bool makeConnection = true;
if (password == QString::null) {
// get password from user
makeConnection = false;
QString password = QInputDialog::getText("Password for " + database + "@" + host,
"Please enter your password:",
QLineEdit::Password, QString::null, &makeConnection, this);
// allow null password entry in case its valid for the database
}
connString += " password=" + password;
if(makeConnection){
m_connInfo = connString; //host + " " + database + " " + username + " " + password;
qDebug(m_connInfo);
PgDatabase *pd = new PgDatabase((const char *) m_connInfo);
// std::cout << pd->ErrorMessage();
@ -124,8 +142,12 @@ void QgsDbSourceSelect::dbConnect()
qDebug(pd->ErrorMessage());
}
} else {
QMessageBox::warning(this,"Connection failed", "Connection to " + database + " on " + host);
QMessageBox::warning(this, "Connection failed",
"Connection to " + settings.readEntry(key + "/database") +
" on " + settings.readEntry(key + "/host") +
" failed. Either the database is down or your settings are incorrect.\n\nCheck your username and password and try again.");
}
}
}
QStringList QgsDbSourceSelect::selectedTables()

10
qgis/src/qgsnewconnection.cpp
View File

@ -18,6 +18,7 @@
#include <qsqldatabase.h>
#include <qsettings.h>
#include <qlineedit.h>
#include <qcheckbox.h>
#include <qmessagebox.h>
#include "libpq++.h"
#include "qgsnewconnection.h"
@ -71,8 +72,13 @@ void QgsNewConnection::saveConnection()
baseKey += txtName->text();
settings.writeEntry(baseKey + "/host", txtHost->text());
settings.writeEntry(baseKey + "/database", txtDatabase->text());
settings.writeEntry(baseKey + "/username", txtUsername->text());
settings.writeEntry(baseKey + "/password", txtPassword->text());
if (chkStorePassword->isChecked()) {
settings.writeEntry(baseKey + "/password", txtPassword->text());
} else{
settings.writeEntry(baseKey + "/password", "");
}
accept();
}

12
qgis/src/qgsnewconnectionbase.ui
View File

@ -112,6 +112,12 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
</spacer>
</vbox>
</widget>
@ -280,12 +286,6 @@
<receiver>QgsNewConnectionBase</receiver>
<slot>testConnection()</slot>
</connection>
<connection>
<sender>buttonOk</sender>
<signal>clicked()</signal>
<receiver>QgsNewConnectionBase</receiver>
<slot>accept()</slot>
</connection>
<connection>
<sender>buttonOk</sender>
<signal>clicked()</signal>