summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
39c33d8)
We'd like to have the display name translatable, so it should not
be used as an identifer. Instead, introduce a backendId property
for this purpose.
*/
virtual bool isAvailable() const = 0;
*/
virtual bool isAvailable() const = 0;
+ //! Returns the identifier of the authenticator backend
+ /** \return A string that can be used by the client to identify the authenticator backend */
+ virtual QString backendId() const = 0;
+
//! Returns the display name of the authenticator backend
/** \return A string that can be used by the client to name the authenticator backend */
//! Returns the display name of the authenticator backend
/** \return A string that can be used by the client to name the authenticator backend */
- virtual QString backendId() const = 0;
+ virtual QString displayName() const = 0;
//! Returns a description of this authenticator backend
/** \return A string that can be displayed by the client to describe the authenticator */
//! Returns a description of this authenticator backend
/** \return A string that can be displayed by the client to describe the authenticator */
QVariantList backends;
foreach(const Authenticator *backend, instance()->_authenticators.values()) {
QVariantMap v;
QVariantList backends;
foreach(const Authenticator *backend, instance()->_authenticators.values()) {
QVariantMap v;
- v["DisplayName"] = backend->backendId();
+ v["BackendId"] = backend->backendId();
+ v["DisplayName"] = backend->displayName();
v["Description"] = backend->description();
v["SetupKeys"] = backend->setupKeys();
v["SetupDefaults"] = backend->setupDefaults();
v["Description"] = backend->description();
v["SetupKeys"] = backend->setupKeys();
v["SetupDefaults"] = backend->setupDefaults();
QString LdapAuthenticator::backendId() const
{
QString LdapAuthenticator::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("LDAP");
}
// so only change this string if you _really_ have to and make sure the core
// setup for the mono client still works ;)
return QString("LDAP");
}
+QString LdapAuthenticator::displayName() const
+{
+ return tr("LDAP");
+}
+
+
QString LdapAuthenticator::description() const
{
return tr("Authenticate users using an LDAP server.");
QString LdapAuthenticator::description() const
{
return tr("Authenticate users using an LDAP server.");
/* General */
bool isAvailable() const;
QString backendId() const;
/* General */
bool isAvailable() const;
QString backendId() const;
+ QString displayName() const;
QString description() const;
virtual QStringList setupKeys() const;
virtual QVariantMap setupDefaults() const;
QString description() const;
virtual QStringList setupKeys() const;
virtual QVariantMap setupDefaults() const;
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
{
return tr("Do not auth against any remote authentication service, but instead save a hashed and salted password "
QString SqlAuthenticator::description() const
{
return tr("Do not auth against any remote authentication service, but instead save a hashed and salted password "
/* General */
bool isAvailable() const;
QString backendId() const;
/* General */
bool isAvailable() const;
QString backendId() const;
+ QString displayName() const;
QString description() const;
virtual inline QStringList setupKeys() const { return QStringList(); }
virtual inline QVariantMap setupDefaults() const { return QVariantMap(); }
QString description() const;
virtual inline QStringList setupKeys() const { return QStringList(); }
virtual inline QVariantMap setupDefaults() const { return QVariantMap(); }
_backends[v.toMap()["DisplayName"].toString()] = v;
foreach(const QVariant &v, authenticators)
_backends[v.toMap()["DisplayName"].toString()] = v;
foreach(const QVariant &v, authenticators)
- _authenticators[v.toMap()["DisplayName"].toString()] = v;
+ _authenticators[v.toMap()["BackendId"].toString()] = v;
setPage(IntroPage, new CoreConfigWizardPages::IntroPage(this));
setPage(AdminUserPage, new CoreConfigWizardPages::AdminUserPage(this));
setPage(IntroPage, new CoreConfigWizardPages::IntroPage(this));
setPage(AdminUserPage, new CoreConfigWizardPages::AdminUserPage(this));
setTitle(tr("Select Authentication Backend"));
setSubTitle(tr("Please select a backend for Quassel Core to use for authenticating users."));
setTitle(tr("Select Authentication Backend"));
setSubTitle(tr("Please select a backend for Quassel Core to use for authenticating users."));
registerField("authentication.backend", ui.backendList);
registerField("authentication.backend", ui.backendList);