mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 23:00:56 +01:00
a field name has changed
removed some ugly output added utf8_decode for usernames
This commit is contained in:
parent
83032cf790
commit
412e8052f3
@ -110,7 +110,7 @@
|
|||||||
$group_info = array();
|
$group_info = array();
|
||||||
}
|
}
|
||||||
|
|
||||||
$GLOBALS['phpgw_setup']->db->query("SELECT app_name FROM phpgw_applications WHERE app_enabled!='0' AND app_enabled!='3' ORDER BY app_title",__LINE__,__FILE__);
|
$GLOBALS['phpgw_setup']->db->query("SELECT app_name FROM phpgw_applications WHERE app_enabled!='0' AND app_enabled!='3' ORDER BY app_name",__LINE__,__FILE__);
|
||||||
while ($GLOBALS['phpgw_setup']->db->next_record())
|
while ($GLOBALS['phpgw_setup']->db->next_record())
|
||||||
{
|
{
|
||||||
$apps[$GLOBALS['phpgw_setup']->db->f('app_name')] = lang($GLOBALS['phpgw_setup']->db->f('app_name'));
|
$apps[$GLOBALS['phpgw_setup']->db->f('app_name')] = lang($GLOBALS['phpgw_setup']->db->f('app_name'));
|
||||||
@ -188,7 +188,9 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Now make the members a member of this group in phpgw. */
|
/* Now make the members a member of this group in phpgw. */
|
||||||
while (list($key,$members) = each($thismembers))
|
if(is_array($thismembers))
|
||||||
|
{
|
||||||
|
foreach($thismembers as $key => $members)
|
||||||
{
|
{
|
||||||
if ($key == 'count')
|
if ($key == 'count')
|
||||||
{
|
{
|
||||||
@ -223,6 +225,7 @@
|
|||||||
$acl->save_repository();
|
$acl->save_repository();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
/* Now give this group some rights */
|
/* Now give this group some rights */
|
||||||
$phpgw_info['user']['account_id'] = $thisacctid;
|
$phpgw_info['user']['account_id'] = $thisacctid;
|
||||||
$acl->account_id = intval($thisacctid);
|
$acl->account_id = intval($thisacctid);
|
||||||
@ -362,18 +365,18 @@
|
|||||||
|
|
||||||
while (list($key,$account) = @each($account_info))
|
while (list($key,$account) = @each($account_info))
|
||||||
{
|
{
|
||||||
$user_list .= '<option value="' . $account['uidnumber'][0] . '">' . $account['cn'][0] . '(' . $account['uid'][0] . ')</option>';
|
$user_list .= '<option value="' . $account['uidnumber'][0] . '">' . utf8_decode($account['cn'][0]) . '(' . $account['uid'][0] . ')</option>';
|
||||||
}
|
}
|
||||||
|
|
||||||
@reset($account_info);
|
@reset($account_info);
|
||||||
while (list($key,$account) = @each($account_info))
|
while (list($key,$account) = @each($account_info))
|
||||||
{
|
{
|
||||||
$admin_list .= '<option value="' . $account['uidnumber'][0] . '">' . $account['cn'][0] . '(' . $account['uid'][0] . ')</option>';
|
$admin_list .= '<option value="' . $account['uidnumber'][0] . '">' . utf8_decode($account['cn'][0]) . '(' . $account['uid'][0] . ')</option>';
|
||||||
}
|
}
|
||||||
|
|
||||||
while (list($key,$group) = @each($group_info))
|
while (list($key,$group) = @each($group_info))
|
||||||
{
|
{
|
||||||
$group_list .= '<option value="' . $group['gidnumber'][0] . '">' . $group['cn'][0] . '</option>';
|
$group_list .= '<option value="' . $group['gidnumber'][0] . '">' . utf8_decode($group['cn'][0]) . '</option>';
|
||||||
}
|
}
|
||||||
|
|
||||||
while(list($appname,$apptitle) = each($apps))
|
while(list($appname,$apptitle) = each($apps))
|
||||||
|
Loading…
Reference in New Issue
Block a user