extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-11 00:18:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

2 changes:

Browse Source 
- newer lang-files get now installed automaticaly when a user log's in
- Czech is added to the supported lang's
==> phpgwapi version updated to 0.9.14.002

fixed multidomain-select-box
This commit is contained in:
Ralf Becker 2003-03-22 01:33:24 +00:00
parent c2778383c5
commit a0925f7505
1 changed files with 60 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
login.php
View File

@ -11,7 +11,6 @@
* option) any later version. * * option) any later version. *
\**************************************************************************/ \**************************************************************************/
/* $Id$ */ /* $Id$ */
$phpgw_info = array(); $phpgw_info = array();
$GLOBALS['phpgw_info']['flags'] = array $GLOBALS['phpgw_info']['flags'] = array
( (
@ -99,9 +98,60 @@
break; break;
} }
} }
function check_langs()
{
//$f = fopen('/tmp/log','a'); fwrite($f,"\ncheck_langs()\n");
if ($GLOBALS['phpgw_info']['server']['lang_ctimes'] && !is_array($GLOBALS['phpgw_info']['server']['lang_ctimes']))
{
$GLOBALS['phpgw_info']['server']['lang_ctimes'] = unserialize($GLOBALS['phpgw_info']['server']['lang_ctimes']);
}
$lang = $GLOBALS['phpgw_info']['user']['preferences']['common']['lang'];
$apps = $GLOBALS['phpgw_info']['user']['apps'];
$apps['phpgwapi'] = true; // check the api too
while (list($app,$data) = each($apps))
{
$fname = PHPGW_SERVER_ROOT . "/$app/setup/phpgw_$lang.lang";
if (file_exists($fname))
{
$ctime = filectime($fname);
$ltime = intval($GLOBALS['phpgw_info']['server']['lang_ctimes'][$lang][$app]);
//fwrite($f,"checking lang='$lang', app='$app', ctime='$ctime', ltime='$ltime'\n");
if ($ctime != $ltime)
{
//fwrite($f,"\nupdate_langs()\n");
update_langs(); // update all langs
break;
}
}
}
//fclose ($f);
}
function update_langs()
{
$GLOBALS['phpgw_setup'] = CreateObject('phpgwapi.setup');
$GLOBALS['phpgw_setup']->db = $GLOBALS['phpgw']->db;
$GLOBALS['phpgw_setup']->detection->check_lang(false); // get installed langs
$langs = $GLOBALS['phpgw_info']['setup']['installed_langs'];
while (list($lang) = each($langs))
{
$langs[$lang] = $lang;
}
$GLOBALS['HTTP_POST_VARS']['submit'] = true;
$GLOBALS['HTTP_POST_VARS']['lang_selected'] = $langs;
$GLOBALS['HTTP_POST_VARS']['upgrademethod'] = 'dumpold';
$included = 'from_login';
include(PHPGW_SERVER_ROOT . '/setup/lang.php');
}
/* Program starts here */ /* Program starts here */
if ($GLOBALS['phpgw_info']['server']['auth_type'] == 'http' && isset($PHP_AUTH_USER)) if ($GLOBALS['phpgw_info']['server']['auth_type'] == 'http' && isset($PHP_AUTH_USER))
{ {
$submit = True; $submit = True;
@ -141,10 +191,10 @@
unset($val); unset($val);
unset($sslattributes); unset($sslattributes);
} }
if (isset($GLOBALS['HTTP_POST_VARS']['passwd_type']) || $submit_x || $submit_y) if (isset($GLOBALS['HTTP_POST_VARS']['passwd_type']) || $submit_x || $submit_y)
// isset($GLOBALS['HTTP_POST_VARS']['passwd']) && $GLOBALS['HTTP_POST_VARS']['passwd']) // enable konqueror to login via Return // isset($GLOBALS['HTTP_POST_VARS']['passwd']) && $GLOBALS['HTTP_POST_VARS']['passwd']) // enable konqueror to login via Return
{ {
Echo "Hallo Ralf 2";
if (getenv(REQUEST_METHOD) != 'POST' && $_SERVER['REQUEST_METHOD'] != 'POST' if (getenv(REQUEST_METHOD) != 'POST' && $_SERVER['REQUEST_METHOD'] != 'POST'
&& !isset($PHP_AUTH_USER) && !isset($HTTP_SERVER_VARS['SSL_CLIENT_S_DN'])) && !isset($PHP_AUTH_USER) && !isset($HTTP_SERVER_VARS['SSL_CLIENT_S_DN']))
{ {
@ -168,6 +218,8 @@
} }
} }
} }
check_langs();
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/home.php','code=yes' . $extra_vars,True)); $GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/home.php','code=yes' . $extra_vars,True));
} }
} }
@ -218,27 +270,15 @@
if ($GLOBALS['phpgw_info']['server']['show_domain_selectbox']) if ($GLOBALS['phpgw_info']['server']['show_domain_selectbox'])
{ {
reset($phpgw_domain); foreach ($phpgw_domain as $domain => $domain_data)
while ($domain = each($phpgw_domain))
{ {
if ($domain[0] == $last_domain) $ds = array('domain' => $domain);
if ($domain == $last_domain)
{ {
$select = 'selected'; $ds += array('selected' => 'selected');
} }
$data['login_standard']['domain_select'] = array $data['login_standard']['domain_select'][] = $ds;
(
'domain' => $domain[0],
'selected' => $selected
);
}
for ($i=0;$i<count($data['login_standard']['domain_select']);$i++)
{
if ($data['login_standard']['domain_select'][$i]['selected'] != 'selected')
{
unset($data['login_standard']['domain_select'][$i]['selected']);
}
} }
} }