forked from extern/egroupware
Fixed lang support AGAIN! Also, reformated the file
This commit is contained in:
parent
f22569eddd
commit
7b3a8e038b
231
login.php
231
login.php
@ -3,6 +3,7 @@
|
|||||||
* phpGroupWare *
|
* phpGroupWare *
|
||||||
* http://www.phpgroupware.org *
|
* http://www.phpgroupware.org *
|
||||||
* Written by Dan Kuykendall <seek3r@phpgroupware.org> *
|
* Written by Dan Kuykendall <seek3r@phpgroupware.org> *
|
||||||
|
* Joseph Engo <jengo@phpgroupware.org> *
|
||||||
* -------------------------------------------- *
|
* -------------------------------------------- *
|
||||||
* This program is free software; you can redistribute it and/or modify it *
|
* This program is free software; you can redistribute it and/or modify it *
|
||||||
* under the terms of the GNU General Public License as published by the *
|
* under the terms of the GNU General Public License as published by the *
|
||||||
@ -12,37 +13,54 @@
|
|||||||
|
|
||||||
/* $Id$ */
|
/* $Id$ */
|
||||||
|
|
||||||
$phpgw_info["flags"] = array("disable_template_class" => True, "login" => True, "currentapp" => "login", "noheader" => True);
|
$phpgw_info['flags'] = array(
|
||||||
include("./header.inc.php");
|
'disable_template_class' => True,
|
||||||
|
'login' => True,
|
||||||
|
'currentapp' => 'login',
|
||||||
|
'noheader' => True
|
||||||
|
);
|
||||||
|
include('./header.inc.php');
|
||||||
|
|
||||||
$deny_login = False;
|
$deny_login = False;
|
||||||
|
|
||||||
|
// !! NOTE !!
|
||||||
|
// Do NOT and I repeat, do NOT touch ANYTHING to do with lang in this file.
|
||||||
|
// If there is a problem, tell me and I will fix it. (jengo)
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
if ($code != 10 && $phpgw_info["server"]["usecookies"] == False) {
|
if ($code != 10 && $phpgw_info['server']['usecookies'] == False)
|
||||||
Setcookie("sessionid");
|
{
|
||||||
Setcookie("kp3");
|
Setcookie('sessionid');
|
||||||
Setcookie("domain");
|
Setcookie('kp3');
|
||||||
|
Setcookie('domain');
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* This is not working yet because I need to figure out a way to clear the $cd =1
|
/* This is not working yet because I need to figure out a way to clear the $cd =1
|
||||||
if(isset($PHP_AUTH_USER) && $cd == "1") {
|
if (isset($PHP_AUTH_USER) && $cd == '1')
|
||||||
Header("HTTP/1.0 401 Unauthorized");
|
{
|
||||||
Header("WWW-Authenticate: Basic realm=\"phpGroupWare\"");
|
Header('HTTP/1.0 401 Unauthorized');
|
||||||
echo "You have to re-authentificate yourself \n";
|
Header('WWW-Authenticate: Basic realm="phpGroupWare"');
|
||||||
|
echo 'You have to re-authentificate yourself';
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
$phpgw_info["server"]["template_dir"] = PHPGW_SERVER_ROOT."/phpgwapi/templates/default";
|
$phpgw_info['server']['template_dir'] = PHPGW_SERVER_ROOT . '/phpgwapi/templates/default';
|
||||||
$tmpl = CreateObject("phpgwapi.Template", $phpgw_info["server"]["template_dir"]);
|
$tmpl = CreateObject('phpgwapi.Template', $phpgw_info['server']['template_dir']);
|
||||||
|
|
||||||
if (! $deny_login && ! $phpgw_info["server"]["show_domain_selectbox"]) {
|
if (! $deny_login && ! $phpgw_info['server']['show_domain_selectbox'])
|
||||||
$tmpl->set_file(array("login_form" => "login.tpl"));
|
{
|
||||||
} else if ($phpgw_info["server"]["show_domain_selectbox"]) {
|
$tmpl->set_file(array('login_form' => 'login.tpl'));
|
||||||
$tmpl->set_file(array("login_form" => "login_selectdomain.tpl"));
|
}
|
||||||
} else {
|
else if ($phpgw_info['server']['show_domain_selectbox'])
|
||||||
$tmpl->set_file(array("login_form" => "login_denylogin.tpl"));
|
{
|
||||||
|
$tmpl->set_file(array('login_form' => 'login_selectdomain.tpl'));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$tmpl->set_file(array('login_form' => 'login_denylogin.tpl'));
|
||||||
}
|
}
|
||||||
|
|
||||||
// When I am updating my server, I don't want people logging in a messing
|
// When I am updating my server, I don't want people logging in a messing
|
||||||
@ -50,8 +68,9 @@
|
|||||||
function deny_login()
|
function deny_login()
|
||||||
{
|
{
|
||||||
global $tmpl;
|
global $tmpl;
|
||||||
$tmpl->parse("loginout", "login_form");
|
|
||||||
$tmpl->p("loginout");
|
$tmpl->set_var('template_set','default');
|
||||||
|
$tmpl->pfp('loginout','login_form');
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -59,7 +78,8 @@
|
|||||||
{
|
{
|
||||||
global $phpgw_info, $code, $last_loginid, $login;
|
global $phpgw_info, $code, $last_loginid, $login;
|
||||||
/* This needs to be this way, because if someone doesnt want to use cookies, we shouldnt sneak one in */
|
/* This needs to be this way, because if someone doesnt want to use cookies, we shouldnt sneak one in */
|
||||||
if ($code != 5 && (isset($phpgw_info["server"]["usecookies"]) && $phpgw_info["server"]["usecookies"])){
|
if ($code != 5 && (isset($phpgw_info['server']['usecookies']) && $phpgw_info['server']['usecookies']))
|
||||||
|
{
|
||||||
return $last_loginid;
|
return $last_loginid;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -67,119 +87,152 @@
|
|||||||
function check_logoutcode($code)
|
function check_logoutcode($code)
|
||||||
{
|
{
|
||||||
global $phpgw_info;
|
global $phpgw_info;
|
||||||
switch($code){
|
switch($code)
|
||||||
case "1":
|
{
|
||||||
return "You have been successfully logged out";
|
case 1:
|
||||||
|
return lang('You have been successfully logged out');
|
||||||
break;
|
break;
|
||||||
case "2":
|
case 2:
|
||||||
return "Sorry, your login has expired";
|
return lang('Sorry, your login has expired');
|
||||||
break;
|
break;
|
||||||
case "5":
|
case 5:
|
||||||
return "<font color=FF0000>" . "Bad login or password" . "</font>";
|
return '<font color="FF0000">' . lang('Bad login or password') . '</font>';
|
||||||
break;
|
break;
|
||||||
case "10":
|
case 10:
|
||||||
Setcookie("sessionid");
|
Setcookie('sessionid');
|
||||||
Setcookie("kp3");
|
Setcookie('kp3');
|
||||||
Setcookie("domain");
|
Setcookie('domain');
|
||||||
return "<font color=FF0000>" . "Your session could not be verified." . "</font>";
|
return '<font color=FF0000>' . lang('Your session could not be verified.') . '</font>';
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return " ";
|
return ' ';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Program starts here */
|
/* Program starts here */
|
||||||
|
|
||||||
if ($deny_login) {
|
if ($deny_login)
|
||||||
|
{
|
||||||
deny_login();
|
deny_login();
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($phpgw_info["server"]["auth_type"] == "http" && isset($PHP_AUTH_USER)) {
|
if ($phpgw_info['server']['auth_type'] == 'http' && isset($PHP_AUTH_USER))
|
||||||
|
{
|
||||||
$submit = True;
|
$submit = True;
|
||||||
$login = $PHP_AUTH_USER;
|
$login = $PHP_AUTH_USER;
|
||||||
$passwd = $PHP_AUTH_PW;
|
$passwd = $PHP_AUTH_PW;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isset($submit) && $submit) {
|
if (isset($submit) && $submit)
|
||||||
if (getenv(REQUEST_METHOD) != "POST" && !isset($PHP_AUTH_USER)) {
|
{
|
||||||
$phpgw->redirect($phpgw->link("","code=5"));
|
if (getenv(REQUEST_METHOD) != 'POST' && !isset($PHP_AUTH_USER))
|
||||||
|
{
|
||||||
|
$phpgw->redirect($phpgw->link('','code=5'));
|
||||||
}
|
}
|
||||||
$sessionid = $phpgw->session->create($login,$passwd);
|
$sessionid = $phpgw->session->create($login,$passwd);
|
||||||
if (!isset($sessionid) || !$sessionid) {
|
if (! isset($sessionid) || ! $sessionid)
|
||||||
$phpgw->redirect($phpgw_info["server"]["webserver_url"]."/login.php?cd=5");
|
{
|
||||||
} else {
|
$phpgw->redirect($phpgw_info['server']['webserver_url'] . '/login.php?cd=5');
|
||||||
if ($phpgw_forward) {
|
}
|
||||||
while (list($name,$value) = each($HTTP_GET_VARS)) {
|
else
|
||||||
if (ereg("phpgw_",$name)) {
|
{
|
||||||
$extra_vars .= "&" . $name . "=" . urlencode($value);
|
if ($phpgw_forward)
|
||||||
|
{
|
||||||
|
while (list($name,$value) = each($HTTP_GET_VARS))
|
||||||
|
{
|
||||||
|
if (ereg('phpgw_',$name))
|
||||||
|
{
|
||||||
|
$extra_vars .= '&' . $name . '=' . urlencode($value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$phpgw->redirect($phpgw->link($phpgw_info["server"]["webserver_url"] . "/index.php", "cd=yes$extra_vars"));
|
$phpgw->redirect($phpgw->link($phpgw_info['server']['webserver_url'] . '/index.php','cd=yes' . $extra_vars));
|
||||||
}
|
}
|
||||||
} else {
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
// !!! DONT CHANGE THESE LINES !!!
|
// !!! DONT CHANGE THESE LINES !!!
|
||||||
// If there is something wrong with this code TELL ME!
|
// If there is something wrong with this code TELL ME!
|
||||||
// Commenting out the code will not fix it. (jengo)
|
// Commenting out the code will not fix it. (jengo)
|
||||||
if (isset($last_loginid)) {
|
if (isset($last_loginid))
|
||||||
$prefs = CreateObject("phpgwapi.preferences", $last_loginid);
|
{
|
||||||
if ($prefs->account_id == ""){
|
$accounts = CreateObject('phpgwapi.accounts');
|
||||||
$phpgw_info["user"]["preferences"]["common"]["lang"] = "en";
|
$prefs = CreateObject('phpgwapi.preferences', $accounts->name2id($last_loginid));
|
||||||
}else{
|
|
||||||
$phpgw_info["user"]["preferences"] = $prefs->read_repository();
|
if (! $prefs->account_id)
|
||||||
|
{
|
||||||
|
$phpgw_info['user']['preferences']['common']['lang'] = 'en';
|
||||||
}
|
}
|
||||||
#print "LANG:".$phpgw_info["user"]["preferences"]["common"]["lang"]."<br>";
|
else
|
||||||
$phpgw->translation->add_app("login");
|
{
|
||||||
$phpgw->translation->add_app("loginscreen");
|
$phpgw_info['user']['preferences'] = $prefs->read_repository();
|
||||||
if (lang("loginscreen_message") != "loginscreen_message*") {
|
|
||||||
$tmpl->set_var("lang_message",stripslashes(lang("loginscreen_message")));
|
|
||||||
}
|
}
|
||||||
} else {
|
#print 'LANG:' . $phpgw_info['user']['preferences']['common']['lang'] . '<br>';
|
||||||
|
$phpgw->translation->add_app('login');
|
||||||
|
$phpgw->translation->add_app('loginscreen');
|
||||||
|
if (lang('loginscreen_message') != 'loginscreen_message*')
|
||||||
|
{
|
||||||
|
$tmpl->set_var('lang_message',stripslashes(lang('loginscreen_message')));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
// If the lastloginid cookies isn't set, we will default to english.
|
// If the lastloginid cookies isn't set, we will default to english.
|
||||||
// Change this if you need.
|
// Change this if you need.
|
||||||
$phpgw_info["user"]["preferences"]["common"]["lang"] = "en";
|
$phpgw_info['user']['preferences']['common']['lang'] = 'en';
|
||||||
$phpgw->translation->add_app("login");
|
$phpgw->translation->add_app('login');
|
||||||
$phpgw->translation->add_app("loginscreen");
|
$phpgw->translation->add_app('loginscreen');
|
||||||
if (lang("loginscreen_message") != "loginscreen_message*") {
|
if (lang('loginscreen_message') != 'loginscreen_message*')
|
||||||
$tmpl->set_var("lang_message",stripslashes(lang("loginscreen_message")));
|
{
|
||||||
|
$tmpl->set_var('lang_message',stripslashes(lang('loginscreen_message')));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!isset($cd) || !$cd) $cd="";
|
if (!isset($cd) || !$cd)
|
||||||
|
{
|
||||||
|
$cd = '';
|
||||||
|
}
|
||||||
|
|
||||||
if ($phpgw_info["server"]["show_domain_selectbox"]) {
|
if ($phpgw_info['server']['show_domain_selectbox'])
|
||||||
|
{
|
||||||
reset($phpgw_domain);
|
reset($phpgw_domain);
|
||||||
unset($domain_select); // For security ... just in case
|
unset($domain_select); // For security ... just in case
|
||||||
while ($domain = each($phpgw_domain)) {
|
while ($domain = each($phpgw_domain))
|
||||||
|
{
|
||||||
$domain_select .= '<option value="' . $domain[0] . '"';
|
$domain_select .= '<option value="' . $domain[0] . '"';
|
||||||
if ($domain[0] == $last_domain) {
|
if ($domain[0] == $last_domain)
|
||||||
$domain_select .= " selected";
|
{
|
||||||
|
$domain_select .= ' selected';
|
||||||
}
|
}
|
||||||
$domain_select .= '>' . $domain[0] . '</option>';
|
$domain_select .= '>' . $domain[0] . '</option>';
|
||||||
}
|
}
|
||||||
$tmpl->set_var("select_domain",$domain_select);
|
$tmpl->set_var('select_domain',$domain_select);
|
||||||
}
|
}
|
||||||
|
|
||||||
while (list($name,$value) = each($HTTP_GET_VARS)) {
|
while (list($name,$value) = each($HTTP_GET_VARS))
|
||||||
if (ereg("phpgw_",$name)) {
|
{
|
||||||
$extra_vars .= "&" . $name . "=" . urlencode($value);
|
if (ereg('phpgw_',$name))
|
||||||
|
{
|
||||||
|
$extra_vars .= '&' . $name . '=' . urlencode($value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ($extra_vars) {
|
|
||||||
$extra_vars = "?" . substr($extra_vars,1,strlen($extra_vars));
|
|
||||||
}
|
|
||||||
|
|
||||||
$tmpl->set_var("login_url", $phpgw_info["server"]["webserver_url"] . "/login.php" . $extra_vars);
|
if ($extra_vars)
|
||||||
$tmpl->set_var("website_title", $phpgw_info["server"]["site_title"]);
|
{
|
||||||
$tmpl->set_var("cd",check_logoutcode($cd));
|
$extra_vars = '?' . substr($extra_vars,1,strlen($extra_vars));
|
||||||
$tmpl->set_var("cookie",show_cookie());
|
}
|
||||||
$tmpl->set_var("lang_username","username");
|
|
||||||
$tmpl->set_var("lang_phpgw_login","phpGroupWare login");
|
$tmpl->set_var('login_url', $phpgw_info['server']['webserver_url'] . '/login.php' . $extra_vars);
|
||||||
$tmpl->set_var("version",$phpgw_info["server"]["versions"]["phpgwapi"]);
|
$tmpl->set_var('website_title', $phpgw_info['server']['site_title']);
|
||||||
$tmpl->set_var("lang_password","password");
|
$tmpl->set_var('cd',check_logoutcode($cd));
|
||||||
$tmpl->set_var("lang_login","login");
|
$tmpl->set_var('cookie',show_cookie());
|
||||||
$tmpl->set_var("template_set","default");
|
$tmpl->set_var('lang_username',lang('username'));
|
||||||
$tmpl->parse("loginout", "login_form");
|
$tmpl->set_var('lang_phpgw_login',lang('phpGroupWare login'));
|
||||||
$tmpl->p("loginout");
|
$tmpl->set_var('version',$phpgw_info['server']['versions']['phpgwapi']);
|
||||||
|
$tmpl->set_var('lang_password',lang('password'));
|
||||||
|
$tmpl->set_var('lang_login',lang('login'));
|
||||||
|
$tmpl->set_var('template_set','default');
|
||||||
|
|
||||||
|
$tmpl->pfp('loginout','login_form');
|
||||||
?>
|
?>
|
||||||
|
Loading…
Reference in New Issue
Block a user