projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed typo in location variable.
[fa-stable.git]
/
access
/
login.php
diff --git
a/access/login.php
b/access/login.php
index e8a9e9dcbca22cde8c26790eaa933e58140c7a00..3bbf0060ec37fcab5ebe32d4a7ee4ad04be2267a 100644
(file)
--- a/
access/login.php
+++ b/
access/login.php
@@
-12,21
+12,15
@@
if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_to_root']))
die(_("Restricted access"));
include_once($path_to_root . "/includes/ui.inc");
if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_to_root']))
die(_("Restricted access"));
include_once($path_to_root . "/includes/ui.inc");
-
+ include_once($path_to_root . "/includes/page/header.inc");
+
$js = "<script language='JavaScript' type='text/javascript'>
function defaultCompany()
{
document.forms[0].company_login_name.options[".$_SESSION["wa_current_user"]->company."].selected = true;
}
$js = "<script language='JavaScript' type='text/javascript'>
function defaultCompany()
{
document.forms[0].company_login_name.options[".$_SESSION["wa_current_user"]->company."].selected = true;
}
-".get_js_png_fix()."</script>";
- $js2 = "<script language='JavaScript' type='text/javascript'>
-function set_fullmode() {
- document.getElementById('ui_mode').value = 1;
- document.loginform.submit();
- return true;
-}
</script>";
</script>";
-
+ add_js_file('login.js');
// Display demo user name and password within login form if "$allow_demo_mode" is true
if ($allow_demo_mode == true)
{
// Display demo user name and password within login form if "$allow_demo_mode" is true
if ($allow_demo_mode == true)
{
@@
-51,22
+45,24
@@
function set_fullmode() {
echo "<html dir='$rtl' >\n";
echo "<head><title>$title</title>\n";
echo "<meta http-equiv='Content-type' content='text/html; charset=$encoding' />\n";
echo "<html dir='$rtl' >\n";
echo "<head><title>$title</title>\n";
echo "<meta http-equiv='Content-type' content='text/html; charset=$encoding' />\n";
- echo "<link href='$path_to_root/themes/$def_theme/
login
.css' rel='stylesheet' type='text/css'> \n";
-
echo $js2
;
+ echo "<link href='$path_to_root/themes/$def_theme/
default
.css' rel='stylesheet' type='text/css'> \n";
+
send_scripts()
;
if (!$login_timeout)
{
echo $js;
if (!$login_timeout)
{
echo $js;
- }
+ }
echo "</head>\n";
echo "</head>\n";
- echo "<body $onload>\n";
+ echo "<body
id='loginscreen'
$onload>\n";
echo "<table class='titletext'><tr><td>$title</td></tr></table>\n";
echo "<table class='titletext'><tr><td>$title</td></tr></table>\n";
+ div_start('_page_body');
br();br();
br();br();
- start_table($table_style2);
+ start_form(false, false, $_SESSION['timeout']['uri'], "loginform");
+ start_table(false, "class='login'");
start_row();
start_row();
- echo "<td align='center'>";
+ echo "<td align='center'
colspan=2
>";
if (!$login_timeout) { // FA logo
echo "<a target='_blank' href='$power_url'><img src='$path_to_root/themes/$def_theme/images/logo_frontaccounting.png' alt='FrontAccounting' height='50' onload='fixPNG(this)' border='0' /></a>";
} else {
if (!$login_timeout) { // FA logo
echo "<a target='_blank' href='$power_url'><img src='$path_to_root/themes/$def_theme/images/logo_frontaccounting.png' alt='FrontAccounting' height='50' onload='fixPNG(this)' border='0' /></a>";
} else {
@@
-75,9
+71,6
@@
function set_fullmode() {
echo "</td>\n";
end_row();
echo "</td>\n";
end_row();
- br();
- start_form(false, false, $_SESSION['timeout']['uri'], "loginform");
- start_table($table_style2);
echo "<input type='hidden' id=ui_mode name='ui_mode' value='".$_SESSION["wa_current_user"]->ui_mode."' />\n";
if (!$login_timeout)
table_section_title(_("Version")." $version Build $build_version - "._("Login"));
echo "<input type='hidden' id=ui_mode name='ui_mode' value='".$_SESSION["wa_current_user"]->ui_mode."' />\n";
if (!$login_timeout)
table_section_title(_("Version")." $version Build $build_version - "._("Login"));
@@
-87,7
+80,7
@@
function set_fullmode() {
$password = $allow_demo_mode ? "password":"";
$password = $allow_demo_mode ? "password":"";
-
echo "<tr><td>"._("Password")."</td><td><input type='password' name='password' value='$password' /></td></tr>\n"
;
+
password_row(_("Password:"), 'password', $password)
;
if ($login_timeout) {
hidden('company_login_name', $_SESSION["wa_current_user"]->company);
if ($login_timeout) {
hidden('company_login_name', $_SESSION["wa_current_user"]->company);
@@
-105,8
+98,8
@@
function set_fullmode() {
end_row();
};
end_table(1);
end_row();
};
end_table(1);
- echo "<center><input type='submit' value=' "._("Login -->")." ' name='SubmitUser'
onclick='set_fullmode();' /></center>\n";
-
end_form(1)
;
+ echo "<center><input type='submit' value=' "._("Login -->")." ' name='SubmitUser'
"
+
.($login_timeout ? '':" onclick='set_fullmode();'")." /></center>\n"
;
foreach($_SESSION['timeout']['post'] as $p => $val) {
// add all request variables to be resend together with login data
foreach($_SESSION['timeout']['post'] as $p => $val) {
// add all request variables to be resend together with login data
@@
-114,7
+107,9
@@
function set_fullmode() {
'password', 'SubmitUser', 'company_login_name')))
echo "<input type='hidden' name='$p' value='$val'>";
}
'password', 'SubmitUser', 'company_login_name')))
echo "<input type='hidden' name='$p' value='$val'>";
}
- end_table();
+ end_form(1);
+ $Ajax->addScript(true, "document.forms[0].password.focus();");
+
echo "<script language='JavaScript' type='text/javascript'>
//<![CDATA[
<!--
echo "<script language='JavaScript' type='text/javascript'>
//<![CDATA[
<!--
@@
-123,6
+118,7
@@
function set_fullmode() {
//-->
//]]>
</script>";
//-->
//]]>
</script>";
+ div_end();
echo "<table class='bottomBar'>\n";
echo "<tr>";
if (isset($_SESSION['wa_current_user']))
echo "<table class='bottomBar'>\n";
echo "<tr>";
if (isset($_SESSION['wa_current_user']))