Commit c378888c authored by Michael Herold's avatar Michael Herold
Browse files

Adds support for new auth backend

E-Mail-Address is now valid as user account
parent 6c9fa6e7
msgid ""
msgstr ""
"Project-Id-Version: edentata\n"
"POT-Creation-Date: 2015-08-08 14:52+0100\n"
"PO-Revision-Date: 2015-08-08 14:52+0100\n"
"POT-Creation-Date: 2015-11-07 17:01+0100\n"
"PO-Revision-Date: 2015-11-07 17:02+0100\n"
"Last-Translator: Michael Herold <quabla@hemio.de>\n"
"Language-Team: \n"
"Language: de_DE\n"
......@@ -40,6 +40,62 @@ msgstr ""
msgid "Invalid input with key \"%s\"."
msgstr ""
#: src/class/Utils.php:33
msgid "IDNA_ERROR_EMPTY_LABEL"
msgstr ""
#: src/class/Utils.php:36
msgid "IDNA_ERROR_LABEL_TOO_LONG"
msgstr ""
#: src/class/Utils.php:39
msgid "IDNA_ERROR_DOMAIN_NAME_TOO_LONG"
msgstr ""
#: src/class/Utils.php:42
msgid "IDNA_ERROR_LEADING_HYPHEN"
msgstr ""
#: src/class/Utils.php:45
msgid "IDNA_ERROR_TRAILING_HYPHEN"
msgstr ""
#: src/class/Utils.php:48
msgid "IDNA_ERROR_HYPHEN_3_4"
msgstr ""
#: src/class/Utils.php:51
msgid "IDNA_ERROR_LEADING_COMBINING_MARK"
msgstr ""
#: src/class/Utils.php:54
msgid "IDNA_ERROR_DISALLOWED"
msgstr "The domain contains disallowed characters."
#: src/class/Utils.php:57
msgid "IDNA_ERROR_PUNYCODE"
msgstr ""
#: src/class/Utils.php:60
msgid "IDNA_ERROR_LABEL_HAS_DOT"
msgstr ""
#: src/class/Utils.php:63
msgid "IDNA_ERROR_INVALID_ACE_LABEL"
msgstr ""
#: src/class/Utils.php:66
msgid "IDNA_ERROR_BIDI"
msgstr ""
#: src/class/Utils.php:69
msgid "IDNA_ERROR_CONTEXTJ"
msgstr ""
#: src/class/Utils.php:72
msgid "Unkown IDNA Error"
msgstr ""
#: src/class/Window.php:116
msgid "Permit Deletion"
msgstr "Löschen zulassen"
......@@ -118,19 +174,23 @@ msgstr ""
msgid "Refresh View"
msgstr "Ansicht Aktualisieren"
#: src/class/gui/Progress.php:81
#: src/class/gui/Progress.php:84
msgid "Deletion Pending"
msgstr "Ausstehende Löschung"
#: src/class/gui/Progress.php:85
#: src/class/gui/Progress.php:88
msgid "Changes Pending"
msgstr "Ausstehende Änderungen"
#: src/class/gui/Progress.php:89
#: src/class/gui/Progress.php:92
msgid "Setup Pending"
msgstr "Ausstehende Einrichtung"
#: src/class/gui/Progress.php:93
#: src/class/gui/Progress.php:96
msgid "Deleted"
msgstr "Gelöscht"
#: src/class/gui/Progress.php:100
msgid "Unknown Status"
msgstr "Unbekannter Status"
......@@ -170,42 +230,42 @@ msgstr ""
"kontaktieren und die Fehler-Nummer \"%s\" angeben. Sie können die \"Zurück\"-"
"Funktion Ihres Browsers benutzen und es noch einmal versuchen."
#: src/load/main.php:141
#: src/load/main.php:143
msgid "Logout successfull"
msgstr "Abmeldung Erfolgreich"
#: src/load/main.php:153 src/load/main.php:174
#: src/load/main.php:155 src/load/main.php:176
msgid "Login failed"
msgstr "Anmeldung fehlgeschlagen"
#: src/load/main.php:182
#: src/load/main.php:184
msgid "User"
msgstr "Benutzer"
#: src/load/main.php:187
#: src/load/main.php:189
msgid "User Settings"
msgstr "Benutzereinstellungen"
#: src/load/main.php:201
#: src/load/main.php:203
msgid "Stop acting as deputy"
msgstr "Stellvertretung aufgeben"
#: src/load/main.php:211
#: src/load/main.php:213
msgid "Act as Deputy"
msgstr "Stellvertretung Ausüben"
#: src/load/main.php:220
#: src/load/main.php:222
msgid "Support"
msgstr ""
#: src/load/main.php:225
#: src/load/main.php:227
msgid "Logout"
msgstr "Abmelden"
#: src/load/main.php:245 src/load/main.php:247
#: src/load/main.php:247 src/load/main.php:249
msgid "Settings"
msgstr "Optionen"
#: src/load/main.php:271
#: src/load/main.php:273
msgid "Tried to access unknown or disabled module"
msgstr ""
......@@ -161,7 +161,7 @@ try {
}
$usrData = [
'p_owner' => $_SERVER['PHP_AUTH_USER'],
'p_login' => $_SERVER['PHP_AUTH_USER'],
'p_password' => $_SERVER['PHP_AUTH_PW']
];
......@@ -288,4 +288,4 @@ try {
}
echo $doc->__toString();
echo System::reportString();
//echo System::reportString();
......@@ -37,10 +37,17 @@ class Login extends Window
return $container;
}
public static function loginTitle()
{
global $config;
return sprintf($config['title'], _('User Login'));
}
protected function nojsLogin()
{
$noscript = new html\Noscript();
$window = $this->newWindow(_('Edentata Userlogin'), null, false);
$window = $this->newWindow(self::loginTitle(), null, false);
$window->addCssClass('login_window');
$selecting = new gui\Selecting();
......@@ -68,7 +75,7 @@ class Login extends Window
{
$window = $this->newFormWindow(
'login'
, _('Edentata Userlogin')
, self::loginTitle()
, null
, _('Login')
, false
......@@ -78,7 +85,8 @@ class Login extends Window
$window->setId('js_window');
$window->addCssClass('login_window');
$user = new form\FieldText('username', _('Username'));
$user = new form\FieldText('username', _('User Account'));
$user->setPlaceholder(_('Username or Email Address'));
$user->setRequired();
$password = new form\FieldPassword('password', _('Password'));
......
msgid ""
msgstr ""
"Project-Id-Version: edenetata login http\n"
"POT-Creation-Date: 2015-03-25 21:31+0100\n"
"PO-Revision-Date: 2015-03-25 21:31+0100\n"
"POT-Creation-Date: 2015-12-03 14:53+0100\n"
"PO-Revision-Date: 2015-12-03 14:53+0100\n"
"Last-Translator: Michael Herold <quabla@hemio.de>\n"
"Language-Team: \n"
"Language: de_DE\n"
......@@ -15,32 +15,39 @@ msgstr ""
"X-Poedit-SourceCharset: UTF-8\n"
"X-Poedit-SearchPath-0: .\n"
#: Login.php:43 Login.php:69
msgid "Edentata Userlogin"
msgstr "Edentata Benutzerlogin"
#: Login.php:44
msgid "User Login"
msgstr "Benutzeranmeldung"
#: Login.php:52
#: Login.php:60
msgid "Perform Logout"
msgstr "Abmelden durchführen"
#: Login.php:55
#: Login.php:64
msgid "Open Login Prompt"
msgstr "Anmeldefenster Öffnen"
#: Login.php:71 Module.php:55
#: Login.php:80 Module.php:52
msgid "Login"
msgstr "Anmelden"
#: Login.php:79
msgid "Username"
msgstr "Benutzername"
#: Login.php:88
msgid "User Account"
msgstr "Benutzerkonto"
#: Login.php:82
#: Login.php:89
msgid "Username or Email Address"
msgstr "Benutzername oder E-Mail-Adresse"
#: Login.php:92
msgid "Password"
msgstr "Passwort"
#: Login.php:95
#: Login.php:105
msgid "Login failed: Invalid username or password. Please try again."
msgstr ""
"Anmeldung fehlgeschlagen: Falscher Benutzername oder flasches Passwort. "
"Anmeldung fehlgeschlagen: Falscher Benutzername oder falsches Passwort. "
"Bitte erneut versuchen."
#~ msgid "Username"
#~ msgstr "Benutzername"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment