Fixed bug #840: User Authentification: Error Message with correct rea…

…son if Login fails git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/phpsurveyor@2792 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Apr 24, 2007 · 449fdea · 449fdea
1 parent fc3ad49
commit 449fdea
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 4 deletions.
diff --git a/admin/login_check.php b/admin/login_check.php
@@ -64,15 +64,15 @@
 							</table>						
 						</form>";	
 	}
-	else
+	elseif (!isset($loginsummary))
 	{
 		$refererargs=''; // If this is a direct access to admin.php, no args are given
 		// If we are called from a link with action and other args set, get them
 		if (isset($_SERVER['QUERY_STRING']) && $_SERVER['QUERY_STRING'])
 		{
 			$refererargs = html_escape($_SERVER['QUERY_STRING']);
 		}
-
+        
 		$loginsummary = "<form name='login' id='login' method='post' action='$rooturl/admin/admin.php' ><br /><strong>".$clang->gT("You have to login first.")."</strong><br />	<br />
 							<table>
 								<tr>

diff --git a/locale/de-informal/LC_MESSAGES/de-informal.mo b/locale/de-informal/LC_MESSAGES/de-informal.mo
diff --git a/locale/de-informal/LC_MESSAGES/de-informal.po b/locale/de-informal/LC_MESSAGES/de-informal.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PHPSurveyor German language file\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2007-04-24 19:17+0100\n"
+"PO-Revision-Date: 2007-04-24 21:38+0100\n"
 "Last-Translator: Carsten Schmitz <c_schmitz@users.sourceforge.net>\n"
 "Language-Team: Carsten Schmitz <c_schmitz@users.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -2479,6 +2479,9 @@ msgstr "Neues Beschriftung-Set hinzufügen"
 msgid "Labelsets"
 msgstr "Beschriftungsvorlage"
 
+msgid "Error: You have to enter a name for this label set."
+msgstr "Fehler: Du musst einen Titel für dieses Beschriftungsset angeben."
+
 msgid "Create New Label Set"
 msgstr "Neues Beschriftung-Set"
 
@@ -3084,6 +3087,10 @@ msgstr "Eine Sicherheitskopie dieser Tabelle wurde erstellt. Nur der Systemadmin
 msgid "Email Invitation"
 msgstr "Einladung an Zugangsschlüssel versenden"
 
+# D:\web\xampp\htdocs\phpsurveyor/admin/tokens.php:746
+msgid "to TokenID No"
+msgstr "bis TokenID-Nr"
+
 msgid "From"
 msgstr "Von"
 

diff --git a/locale/de/LC_MESSAGES/de.mo b/locale/de/LC_MESSAGES/de.mo
diff --git a/locale/de/LC_MESSAGES/de.po b/locale/de/LC_MESSAGES/de.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PHPSurveyor German language file\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2007-04-24 19:16+0100\n"
+"PO-Revision-Date: 2007-04-24 21:37+0100\n"
 "Last-Translator: Carsten Schmitz <c_schmitz@users.sourceforge.net>\n"
 "Language-Team: PHPSurveyor <c_schmitz@users.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -2447,6 +2447,9 @@ msgstr "Neues Beschriftung-Set hinzufügen"
 msgid "Labelsets"
 msgstr "Beschriftungsvorlage"
 
+msgid "Error: You have to enter a name for this label set."
+msgstr "Fehler: Sie müssen einen Titel für dieses Beschriftungsset angeben."
+
 msgid "Create New Label Set"
 msgstr "Neues Beschriftung-Set"
 
@@ -3039,6 +3042,10 @@ msgstr "Eine Sicherheitskopie dieser Tabelle wurde erstellt. Nur der Systemadmin
 msgid "Email Invitation"
 msgstr "Einladung an Probanden versenden"
 
+# D:\web\xampp\htdocs\phpsurveyor/admin/tokens.php:746
+msgid "to TokenID No"
+msgstr "an TokenID-Nr:"
+
 msgid "From"
 msgstr "Von"