projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a Configure menu item to Networks in the buffer list
[quassel.git]
/
src
/
core
/
sqlauthenticator.cpp
diff --git
a/src/core/sqlauthenticator.cpp
b/src/core/sqlauthenticator.cpp
index
f1ed169
..
57a6aa1
100644
(file)
--- a/
src/core/sqlauthenticator.cpp
+++ b/
src/core/sqlauthenticator.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
5
by the Quassel Project *
+ * Copyright (C) 2005-201
8
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-36,41
+36,63
@@
SqlAuthenticator::~SqlAuthenticator()
{
}
{
}
+
bool SqlAuthenticator::isAvailable() const
{
// FIXME: probably this should query the current storage (see the ::init routine too).
return true;
}
bool SqlAuthenticator::isAvailable() const
{
// FIXME: probably this should query the current storage (see the ::init routine too).
return true;
}
+
QString SqlAuthenticator::backendId() const
{
QString SqlAuthenticator::backendId() const
{
- // We identify the backend to use for the monolithic core by
its displayname
.
+ // We identify the backend to use for the monolithic core by
this identifier
.
// so only change this string if you _really_ have to and make sure the core
// setup for the mono client still works ;)
return QString("Database");
}
// so only change this string if you _really_ have to and make sure the core
// setup for the mono client still works ;)
return QString("Database");
}
+
+QString SqlAuthenticator::displayName() const
+{
+ return tr("Database");
+}
+
+
QString SqlAuthenticator::description() const
{
QString SqlAuthenticator::description() const
{
- return tr("Do not auth
against any remote authentication
service, but instead save a hashed and salted password "
- "in the
selected database
.");
+ return tr("Do not auth
enticate against any remote
service, but instead save a hashed and salted password "
+ "in the
database selected in the next step
.");
}
}
+
UserId SqlAuthenticator::validateUser(const QString &user, const QString &password)
{
return Core::validateUser(user, password);
}
UserId SqlAuthenticator::validateUser(const QString &user, const QString &password)
{
return Core::validateUser(user, password);
}
-bool SqlAuthenticator::setup(const QVariantMap &settings)
+
+bool SqlAuthenticator::setup(const QVariantMap &settings, const QProcessEnvironment &environment,
+ bool loadFromEnvironment)
{
{
+ Q_UNUSED(settings)
+ Q_UNUSED(environment)
+ Q_UNUSED(loadFromEnvironment)
return true;
}
return true;
}
-Authenticator::State SqlAuthenticator::init(const QVariantMap &settings)
+
+Authenticator::State SqlAuthenticator::init(const QVariantMap &settings,
+ const QProcessEnvironment &environment,
+ bool loadFromEnvironment)
{
{
+ Q_UNUSED(settings)
+ Q_UNUSED(environment)
+ Q_UNUSED(loadFromEnvironment)
+
// TODO: FIXME: this should check if the storage provider is ready, but I don't
// know if there's an exposed way to do that at the moment.
// TODO: FIXME: this should check if the storage provider is ready, but I don't
// know if there's an exposed way to do that at the moment.
- quInfo() << qPrintable(backendId()) << "
A
uthenticator is ready.";
+ quInfo() << qPrintable(backendId()) << "
a
uthenticator is ready.";
return IsReady;
}
return IsReady;
}