mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-08 09:05:16 +01:00
Fix for bug/enhancement #486048.
This commit is contained in:
parent
c03544e09b
commit
056149ea4c
@ -84,10 +84,12 @@
|
||||
$var['current_users'] = '<a href="' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions')
|
||||
. '"> ' . lang('Current users') . ': ' . $db->f(0) . '</a>';
|
||||
}
|
||||
$now = time();
|
||||
$var['user_info'] = $GLOBALS['phpgw']->common->display_fullname() . ' - '
|
||||
. lang($GLOBALS['phpgw']->common->show_date(time(),"l")) . ' '
|
||||
. lang($GLOBALS['phpgw']->common->show_date(time(),"F")) . ' '
|
||||
. $GLOBALS['phpgw']->common->show_date(time(),"d, Y");
|
||||
. lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' '
|
||||
. $GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
|
||||
// . lang($GLOBALS['phpgw']->common->show_date($now,'F')) . ' '
|
||||
// . $GLOBALS['phpgw']->common->show_date($now,'d, Y');
|
||||
|
||||
// Maybe we should create a common function in the phpgw_accounts_shared.inc.php file
|
||||
// to get rid of duplicate code.
|
||||
|
@ -123,10 +123,12 @@
|
||||
}
|
||||
|
||||
$var['user_info_name'] = $GLOBALS['phpgw']->common->display_fullname();
|
||||
$now = time();
|
||||
$var['user_info_date'] =
|
||||
lang($GLOBALS['phpgw']->common->show_date(time(),'l')) . ' '
|
||||
. lang($GLOBALS['phpgw']->common->show_date(time(),'F')) . ' '
|
||||
. $GLOBALS['phpgw']->common->show_date(time(),'d, Y');
|
||||
lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' '
|
||||
. $GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
|
||||
// . lang($GLOBALS['phpgw']->common->show_date($now,'F')) . ' '
|
||||
// . $GLOBALS['phpgw']->common->show_date($now,'d, Y');
|
||||
$var['user_info'] = $var['user_info_name'] .' - ' .$var['user_info_date'];
|
||||
$var['user_info_size'] = '2';
|
||||
$var['user_info_color'] = '#000000';
|
||||
|
@ -83,10 +83,12 @@
|
||||
. lang('Current users') . ': ' . $db->f(0) . '</a>';
|
||||
}
|
||||
*/
|
||||
$now = time();
|
||||
$var['user_info'] = $GLOBALS['phpgw']->common->display_fullname() . ' - '
|
||||
. lang($GLOBALS['phpgw']->common->show_date(time(),"l")) . ' '
|
||||
. lang($GLOBALS['phpgw']->common->show_date(time(),"F")) . ' '
|
||||
. $GLOBALS['phpgw']->common->show_date(time(),"d, Y");
|
||||
. lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' '
|
||||
. $GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
|
||||
// . lang($GLOBALS['phpgw']->common->show_date($now,'F')) . ' '
|
||||
// . $GLOBALS['phpgw']->common->show_date($now,'d, Y');
|
||||
|
||||
/*
|
||||
* Maybe we should create a common function in the phpgw_accounts_shared.inc.php file
|
||||
|
@ -95,10 +95,12 @@
|
||||
}
|
||||
|
||||
$var['user_info_name'] = $GLOBALS['phpgw']->common->display_fullname();
|
||||
$now = time();
|
||||
$var['user_info_date'] =
|
||||
lang($GLOBALS['phpgw']->common->show_date(time(),'l')) . ' '
|
||||
. lang($GLOBALS['phpgw']->common->show_date(time(),'F')) . ' '
|
||||
. $GLOBALS['phpgw']->common->show_date(time(),'d, Y');
|
||||
lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' '
|
||||
. $GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
|
||||
// . lang($GLOBALS['phpgw']->common->show_date($now,'F')) . ' '
|
||||
// . $GLOBALS['phpgw']->common->show_date($now,'d, Y');
|
||||
$var['user_info'] = $var['user_info_name'] .' - ' .$var['user_info_date'];
|
||||
$var['user_info_size'] = '2';
|
||||
$var['user_info_color'] = '#000000';
|
||||
|
@ -95,10 +95,12 @@
|
||||
. $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions') . '"> '
|
||||
. lang('Current users') . ': ' . $db->f(0) . '</a>';
|
||||
}
|
||||
$now = time();
|
||||
$var['user_info'] = $GLOBALS['phpgw']->common->display_fullname() . ' - '
|
||||
. lang($GLOBALS['phpgw']->common->show_date(time(),'l')) . ' '
|
||||
. lang($GLOBALS['phpgw']->common->show_date(time(),'F')) . ' '
|
||||
. $GLOBALS['phpgw']->common->show_date(time(),'d, Y');
|
||||
. lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' '
|
||||
. $GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
|
||||
// . lang($GLOBALS['phpgw']->common->show_date($now,'F')) . ' '
|
||||
// . $GLOBALS['phpgw']->common->show_date($now,'d, Y');
|
||||
|
||||
// Maybe we should create a common function in the phpgw_accounts_shared.inc.php file
|
||||
// to get rid of duplicate code.
|
||||
|
Loading…
Reference in New Issue
Block a user