From fec15b76036ebc651c581a344f4815cd2512f239 Mon Sep 17 00:00:00 2001 From: Christian Wieninger Date: Tue, 5 Jun 2007 18:30:10 +0000 Subject: - check and save login/password only if changed - message "Setup saved." after saving --- i18n.cpp | 22 ++++++++++++++++++++++ pages/setup.ecpp | 25 ++++++++++++++++--------- 2 files changed, 38 insertions(+), 9 deletions(-) diff --git a/i18n.cpp b/i18n.cpp index 93b991e..fd05ae0 100644 --- a/i18n.cpp +++ b/i18n.cpp @@ -4187,6 +4187,28 @@ const tI18nPhrase Phrases[] = { "", // Dansk "", // Czech }, + { "Setup saved.", // English + "Einstellungen gespeichert.", // Deutsch + "", // Slovenski + "", // Italiano + "", // Nederlands + "", // Português + "", // Français + "", // Norsk + "", // Finnish + "", // Polski + "", // Español + "", // Greek + "", // Svenska + "", // Românã + "", // Magyar + "", // Català + "", // Russian + "", // Hrvatski + "", // Eesti + "", // Dansk + "", // Czech + }, /* { "", // English "", // Deutsch diff --git a/pages/setup.ecpp b/pages/setup.ecpp index 88ea00d..d7708df 100644 --- a/pages/setup.ecpp +++ b/pages/setup.ecpp @@ -16,6 +16,7 @@ using namespace std; string startscreen; string theme; string localnetmask; + int authchanged = 0; <%session scope="global"> bool logged_in(false); @@ -30,7 +31,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); std::string message; if ( request.getMethod() == "POST") { - if (useauth && (login.empty() || pass.empty())) + if (authchanged && useauth && (login.empty() || pass.empty())) message = tr("Please set login and password!"); else { @@ -47,6 +48,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); LiveSetup().SetStartScreen(startscreen); LiveSetup().SetTheme(theme); LiveSetup().SaveSetup(); + message = tr("Setup saved."); } } pageTitle = tr("Setup"); @@ -72,13 +74,19 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); <& pageelems.ajax_js &> @@ -86,7 +94,9 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); <& menu active=("setup") &>
- + + +
@@ -105,11 +115,11 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
<$ tr("Setup") $>
- + - + @@ -168,15 +178,12 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
<$ tr("Admin login") $>:
<$ tr("Admin password") $>:
<$ tr("Local net (no login required)") $>:
- +
-
- <$ message $> -
-- cgit v1.2.3