Revert login disallowed message, but in case of login error add a link to the online FAQ

diff --git a/lang/english.php b/lang/english.php
index 096a0bff745427ad580a817e9d63d2ee1a7bc96c..9bfec8435f43039346844dd9d5e668756fa3dedd 100755 (executable)
--- 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 57295235d3cb13d255d459b0ce1ab3f8c54b6346..4ac15b1a656ff76b012c1fe103f871a1bcee3f9f 100644 (file)
--- 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 02fdb5baa7284f79d8e1c6e0f5841199ba0cf1a4..3799b066ec4226b9672e328376a74c8ddf71593b 100644 (file)
--- 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 8e1b00fdde6561d04b1b12c588f099b480434722..747a3124722962eabc9c0b71e140ab18b31d977e 100644 (file)
--- 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 c4215be18b87a8b1b8657fb6b802a9423f2fa010..597d5204cc42880b24d3c3b9c5be11f7eb32b151 100755 (executable)
--- 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">