projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
I18n fixes
[squirrelmail.git]
/
src
/
login.php
diff --git
a/src/login.php
b/src/login.php
index 7b541abaf2ffe1a1ebb9ede02305af80acf460ad..e459c0aac24a59eb57fc4188212485b8f5325a7e 100644
(file)
--- a/
src/login.php
+++ b/
src/login.php
@@
-9,11
+9,14
@@
* This a simple login screen. Some housekeeping is done to clean
* cookies and find language.
*
* This a simple login screen. Some housekeeping is done to clean
* cookies and find language.
*
- * $Id$
+ *
@version
$Id$
* @package squirrelmail
*/
* @package squirrelmail
*/
-/** Path for SquirrelMail required files. */
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
define('SM_PATH','../');
/* SquirrelMail required files. */
define('SM_PATH','../');
/* SquirrelMail required files. */
@@
-26,6
+29,7
@@
require_once(SM_PATH . 'functions/page_header.php');
require_once(SM_PATH . 'functions/html.php');
require_once(SM_PATH . 'functions/global.php');
require_once(SM_PATH . 'functions/imap_general.php');
require_once(SM_PATH . 'functions/html.php');
require_once(SM_PATH . 'functions/global.php');
require_once(SM_PATH . 'functions/imap_general.php');
+require_once(SM_PATH . 'functions/forms.php');
/**
* $squirrelmail_language is set by a cookie when the user selects
/**
* $squirrelmail_language is set by a cookie when the user selects
@@
-60,11
+64,11
@@
if($imap_auth_mech == 'login') {
$logindisabled = sqimap_capability($imap,'LOGINDISABLED');
sqimap_logout($imap);
if ($logindisabled) {
$logindisabled = sqimap_capability($imap,'LOGINDISABLED');
sqimap_logout($imap);
if ($logindisabled) {
- $string =
"The IMAP server is reporting that logins are disabled.<br>"
;
+ $string =
_("The IMAP server is reporting that logins are disabled.").'<br />'
;
if (!$use_imap_tls) {
if (!$use_imap_tls) {
- $string .=
"The use of TLS may allow SquirrelMail to login.<br>"
;
+ $string .=
_("The use of TLS may allow SquirrelMail to login.").'<br />'
;
}
}
- $string .=
"Please contact your system administrator."
;
+ $string .=
_("Please contact your system administrator and report this error.")
;
error_box($string,$color);
exit;
}
error_box($string,$color);
exit;
}
@@
-77,7
+81,6
@@
do_hook('login_cookie');
$header = "<script language=\"JavaScript\" type=\"text/javascript\">\n" .
"<!--\n".
" function squirrelmail_loginpage_onload() {\n".
$header = "<script language=\"JavaScript\" type=\"text/javascript\">\n" .
"<!--\n".
" function squirrelmail_loginpage_onload() {\n".
- " document.forms[0].js_autodetect_results.value = '" . SMPREF_JS_ON . "';\n".
" var textElements = 0;\n".
" for (i = 0; i < document.forms[0].elements.length; i++) {\n".
" if (document.forms[0].elements[i].type == \"text\" || document.forms[0].elements[i].type == \"password\") {\n".
" var textElements = 0;\n".
" for (i = 0; i < document.forms[0].elements.length; i++) {\n".
" if (document.forms[0].elements[i].type == \"text\" || document.forms[0].elements[i].type == \"password\") {\n".
@@
-98,7
+101,7
@@
if (@file_exists($theme[$theme_default]['PATH']))
displayHtmlHeader( "$org_name - " . _("Login"), $header, FALSE );
echo "<body text=\"$color[8]\" bgcolor=\"$color[4]\" link=\"$color[7]\" vlink=\"$color[7]\" alink=\"$color[7]\" onLoad=\"squirrelmail_loginpage_onload()\">" .
displayHtmlHeader( "$org_name - " . _("Login"), $header, FALSE );
echo "<body text=\"$color[8]\" bgcolor=\"$color[4]\" link=\"$color[7]\" vlink=\"$color[7]\" alink=\"$color[7]\" onLoad=\"squirrelmail_loginpage_onload()\">" .
- "\n" . '<form action="redirect.php" method="post">' . "\n";
+ "\n" . '<form action="redirect.php" method="post"
onSubmit="document.forms[0].js_autodetect_results.value=\'' . SMPREF_JS_ON .'\';"
>' . "\n";
$username_form_name = 'login_username';
$password_form_name = 'secretkey';
$username_form_name = 'login_username';
$password_form_name = 'secretkey';
@@
-121,7
+124,7
@@
if (isset($org_logo) && $org_logo) {
}
if(sqgetGlobalVar('mailto', $mailto)) {
}
if(sqgetGlobalVar('mailto', $mailto)) {
- $rcptaddress =
'<input type="hidden" name="mailto" value="' . urlencode($mailto) . '" />' . "\n"
;
+ $rcptaddress =
addHidden('mailto', $mailto)
;
} else {
$rcptaddress = '';
}
} else {
$rcptaddress = '';
}
@@
-151,7
+154,7
@@
echo html_tag( 'table',
_("Name:") ,
'right', '', 'width="30%"' ) .
html_tag( 'td',
_("Name:") ,
'right', '', 'width="30%"' ) .
html_tag( 'td',
-
'<input type="text" name="' . $username_form_name .'" value="' . $loginname_value .'" />'
,
+
addInput($username_form_name, $loginname_value)
,
'left', '', 'width="*"' )
) . "\n" .
html_tag( 'tr',
'left', '', 'width="*"' )
) . "\n" .
html_tag( 'tr',
@@
-159,10
+162,10
@@
echo html_tag( 'table',
_("Password:") ,
'right', '', 'width="30%"' ) .
html_tag( 'td',
_("Password:") ,
'right', '', 'width="30%"' ) .
html_tag( 'td',
-
'<input type="password" name="' . $password_form_name . '" />' . "\n"
.
-
'<input type="hidden" name="js_autodetect_results" value="SMPREF_JS_OFF" />' . "\n"
.
+
addPwField($password_form_name)
.
+
addHidden('js_autodetect_results', SMPREF_JS_OFF)
.
$rcptaddress .
$rcptaddress .
-
'<input type="hidden" name="just_logged_in" value="1" />' . "\n"
,
+
addHidden('just_logged_in', '1')
,
'left', '', 'width="*"' )
) ,
'center', $color[4], 'border="0" width="100%"' ) ,
'left', '', 'width="*"' )
) ,
'center', $color[4], 'border="0" width="100%"' ) ,
@@
-170,7
+173,7
@@
echo html_tag( 'table',
) .
html_tag( 'tr',
html_tag( 'td',
) .
html_tag( 'tr',
html_tag( 'td',
- '<center>
<input type="submit" value="' . _("Login") . '" />
</center>',
+ '<center>
'. addSubmit(_("Login")) .'
</center>',
'left' )
),
'', $color[4], 'border="0" width="350"' ) . '</center>',
'left' )
),
'', $color[4], 'border="0" width="350"' ) . '</center>',
@@
-183,4
+186,4
@@
echo '</form>' . "\n";
do_hook('login_bottom');
echo "</body>\n".
"</html>\n";
do_hook('login_bottom');
echo "</body>\n".
"</html>\n";
-?>
+?>
\ No newline at end of file