From ec125061590fb67121720792bc08b9faaa3faa49 Mon Sep 17 00:00:00 2001
From: soranzo <soranzo>
Date: Wed, 26 May 2004 11:27:00 +0000
Subject: [PATCH] Revert login disallowed message, but in case of login error
 add a link to the online FAQ

---
 lang/english.php         | 6 +++---
 lang/italian.php         | 6 +++---
 lang/recoded/english.php | 6 +++---
 lang/recoded/italian.php | 6 +++---
 login.php                | 8 +++++---
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/lang/english.php b/lang/english.php
index 096a0bff..9bfec843 100755
--- a/lang/english.php
+++ b/lang/english.php
@@ -4,7 +4,7 @@
 	 * English language file for phpPgAdmin.  Use this as a basis
 	 * for new translations.
 	 *
-	 * $Id: english.php,v 1.144 2004/05/24 15:01:22 chriskl Exp $
+	 * $Id: english.php,v 1.145 2004/05/26 11:27:00 soranzo Exp $
 	 */
 
 	// Language and character set
@@ -20,13 +20,13 @@
 	$lang['strpgsqlhome_url'] = 'http://www.postgresql.org/';
 	$lang['strlocaldocs'] = 'PostgreSQL Documentation (local)';
 	$lang['strreportbug'] = 'Report a Bug';
-	$lang['strviewfaq'] = 'View FAQ';
+	$lang['strviewfaq'] = 'View online FAQ';
 	$lang['strviewfaq_url'] = 'http://phppgadmin.sourceforge.net/?page=faq';
 	
 	// Basic strings
 	$lang['strlogin'] = 'Login';
 	$lang['strloginfailed'] = 'Login failed';
-	$lang['strlogindisallowed'] = 'Login disallowed for security reasons.  Please read the FAQ and check the \'extra_login_security\' option in your configuration file.';
+	$lang['strlogindisallowed'] = 'Login disallowed for security reasons.';
 	$lang['strserver'] = 'Server';
 	$lang['strlogout'] = 'Logout';
 	$lang['strowner'] = 'Owner';
diff --git a/lang/italian.php b/lang/italian.php
index 57295235..4ac15b1a 100644
--- a/lang/italian.php
+++ b/lang/italian.php
@@ -4,7 +4,7 @@
 	 * Italian language file, based on the english language file for phpPgAdmin.
 	 * Nicola Soranzo [nsoranzo@tiscali.it]
          *
-	 * $Id: italian.php,v 1.30 2004/05/17 20:35:00 soranzo Exp $
+	 * $Id: italian.php,v 1.31 2004/05/26 11:27:00 soranzo Exp $
 	 */
 
 	// Language and character set - Lingua e set di caratteri
@@ -20,13 +20,13 @@
 	$lang['strpgsqlhome_url'] = 'http://www.postgresql.org/';
 	$lang['strlocaldocs'] = 'Documentazione su PostgreSQL (locale)';
 	$lang['strreportbug'] = 'Riferisci un bug';
-	$lang['strviewfaq'] = 'Visualizza le FAQ (domande ricorrenti)';
+	$lang['strviewfaq'] = 'Visualizza le FAQ (domande ricorrenti) on line';
 	$lang['strviewfaq_url'] = 'http://phppgadmin.sourceforge.net/?page=faq';
 
 	// Basic strings - Stringhe basilari
 	$lang['strlogin'] = 'Login';
 	$lang['strloginfailed'] = 'Login fallito';
-	$lang['strlogindisallowed'] = 'Login disabilitato per questione di sicurezza';
+	$lang['strlogindisallowed'] = 'Login disabilitato per ragioni di sicurezza';
 	$lang['strserver'] = 'Server';
 	$lang['strlogout'] = 'Logout';
 	$lang['strowner'] = 'Proprietario';
diff --git a/lang/recoded/english.php b/lang/recoded/english.php
index 02fdb5ba..3799b066 100644
--- a/lang/recoded/english.php
+++ b/lang/recoded/english.php
@@ -4,7 +4,7 @@
 	 * English language file for phpPgAdmin.  Use this as a basis
 	 * for new translations.
 	 *
-	 * $Id: english.php,v 1.97 2004/05/24 15:01:23 chriskl Exp $
+	 * $Id: english.php,v 1.98 2004/05/26 11:27:00 soranzo Exp $
 	 */
 
 	// Language and character set
@@ -20,13 +20,13 @@
 	$lang['strpgsqlhome_url'] = 'http://www.postgresql.org/';
 	$lang['strlocaldocs'] = 'PostgreSQL Documentation (local)';
 	$lang['strreportbug'] = 'Report a Bug';
-	$lang['strviewfaq'] = 'View FAQ';
+	$lang['strviewfaq'] = 'View online FAQ';
 	$lang['strviewfaq_url'] = 'http://phppgadmin.sourceforge.net/?page=faq';
 	
 	// Basic strings
 	$lang['strlogin'] = 'Login';
 	$lang['strloginfailed'] = 'Login failed';
-	$lang['strlogindisallowed'] = 'Login disallowed for security reasons.  Please read the FAQ and check the \'extra_login_security\' option in your configuration file.';
+	$lang['strlogindisallowed'] = 'Login disallowed for security reasons.';
 	$lang['strserver'] = 'Server';
 	$lang['strlogout'] = 'Logout';
 	$lang['strowner'] = 'Owner';
diff --git a/lang/recoded/italian.php b/lang/recoded/italian.php
index 8e1b00fd..747a3124 100644
--- a/lang/recoded/italian.php
+++ b/lang/recoded/italian.php
@@ -4,7 +4,7 @@
 	 * Italian language file, based on the english language file for phpPgAdmin.
 	 * Nicola Soranzo [nsoranzo@tiscali.it]
          *
-	 * $Id: italian.php,v 1.25 2004/05/17 20:35:00 soranzo Exp $
+	 * $Id: italian.php,v 1.26 2004/05/26 11:27:00 soranzo Exp $
 	 */
 
 	// Language and character set - Lingua e set di caratteri
@@ -20,13 +20,13 @@
 	$lang['strpgsqlhome_url'] = 'http://www.postgresql.org/';
 	$lang['strlocaldocs'] = 'Documentazione su PostgreSQL (locale)';
 	$lang['strreportbug'] = 'Riferisci un bug';
-	$lang['strviewfaq'] = 'Visualizza le FAQ (domande ricorrenti)';
+	$lang['strviewfaq'] = 'Visualizza le FAQ (domande ricorrenti) on line';
 	$lang['strviewfaq_url'] = 'http://phppgadmin.sourceforge.net/?page=faq';
 
 	// Basic strings - Stringhe basilari
 	$lang['strlogin'] = 'Login';
 	$lang['strloginfailed'] = 'Login fallito';
-	$lang['strlogindisallowed'] = 'Login disabilitato per questione di sicurezza';
+	$lang['strlogindisallowed'] = 'Login disabilitato per ragioni di sicurezza';
 	$lang['strserver'] = 'Server';
 	$lang['strlogout'] = 'Logout';
 	$lang['strowner'] = 'Proprietario';
diff --git a/login.php b/login.php
index c4215be1..597d5204 100755
--- a/login.php
+++ b/login.php
@@ -3,7 +3,7 @@
 	/**
 	 * Login screen
 	 *
-	 * $Id: login.php,v 1.15 2003/12/17 09:11:32 chriskl Exp $
+	 * $Id: login.php,v 1.16 2004/05/26 11:27:00 soranzo Exp $
 	 */
 
 	// This needs to be an include once to prevent lib.inc.php infinite recursive includes.
@@ -40,8 +40,10 @@
 				<?php 
 					if (isset($_failed) && $_failed) 
 						echo "<p class=\"message\">{$lang['strloginfailed']}</p>";
-					elseif (isset($_allowed) && !$_allowed)
-						echo "<p class=\"message\">{$lang['strlogindisallowed']}</p>";
+					elseif (isset($_allowed) && !$_allowed) {
+						echo "<p class=\"message\">{$lang['strlogindisallowed']}\n";
+						echo "<br /><a href=\"{$lang['strviewfaq_url']}\">{$lang['strviewfaq']}</a></p>";
+					}
 				?>
 				<form action="<?php echo $_SERVER['PHP_SELF'] ?>" method="post" name="login_form">
 				<table class="navbar" border="0" cellpadding="5" cellspacing="3">
-- 
2.39.5