stv0g/spectrum2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed registration form

Browse source
This commit is contained in:
HanzZ 2011-11-12 12:56:56 +01:00
parent c9288e615b
commit ece0179d3e
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/config.cpp
View file

@ -82,10 +82,10 @@ bool Config::load(std::istream &ifs, boost::program_options::options_description
("identity.type", value<std::string>()->default_value(""), "Type of transport ('icq','msn','gg','irc', ...)")
("registration.enable_public_registration", value<bool>()->default_value(true), "True if users should be able to register.")
("registration.language", value<std::string>()->default_value("en"), "Default language for registration form")
("registration.instructions", value<std::string>()->default_value(""), "Instructions showed to user in registration form")
("registration.username_field", value<std::string>()->default_value(""), "Label for username field")
("registration.instructions", value<std::string>()->default_value("Enter your legacy network username and password."), "Instructions showed to user in registration form")
("registration.username_label", value<std::string>()->default_value("Legacy network username:"), "Label for username field")
("registration.username_mask", value<std::string>()->default_value(""), "Username mask")
("registration.encoding", value<std::string>()->default_value("en"), "Default encoding in registration form")
("registration.encoding", value<std::string>()->default_value("utf8"), "Default encoding in registration form")
("database.type", value<std::string>()->default_value("none"), "Database type.")
("database.database", value<std::string>()->default_value(""), "Database used to store data")
("database.server", value<std::string>()->default_value("localhost"), "Database server.")

3
src/userregistration.cpp
View file

@ -181,7 +181,7 @@ bool UserRegistration::handleGetRequest(const Swift::JID& from, const Swift::JID
bool registered = m_storageBackend->getUser(barejid, res);
std::string instructions = CONFIG_STRING(m_config, "registration.instructions");
std::string usernameField = CONFIG_STRING(m_config, "registration.username_field");
std::string usernameField = CONFIG_STRING(m_config, "registration.username_label");
// normal jabber:iq:register
reg->setInstructions(instructions);
@ -219,6 +219,7 @@ bool UserRegistration::handleGetRequest(const Swift::JID& from, const Swift::JID
ListSingleFormField::ref language = ListSingleFormField::create();
language->setName("language");
language->setLabel((("Language")));
language->addOption(Swift::FormField::Option(CONFIG_STRING(m_config, "registration.language"), CONFIG_STRING(m_config, "registration.language")));
if (registered)
language->setValue(res.language);
else