diff --git a/htdocs/modify_member_form.php b/htdocs/modify_member_form.php index 29aea39..855c78c 100644 --- a/htdocs/modify_member_form.php +++ b/htdocs/modify_member_form.php @@ -65,7 +65,7 @@ printf('%s %s %s %s:', $possible_members = array(); for ($i=0;$igetValue('modify_member','posixgroupattr'))) - $possible_members[$i] = $possible_values[$i][$_SESSION[APPCONFIG]->getValue('modify_member','posixattr')]; + $possible_members[$i] = $possible_values[$i][$_SESSION[APPCONFIG]->getValue('modify_member','posixattr')][0]; else $possible_members[$i] = $possible_values[$i][$_SESSION[APPCONFIG]->getValue('modify_member','attr')]; } diff --git a/lib/TemplateRender.php b/lib/TemplateRender.php index 8fb52ca..0a3794e 100644 --- a/lib/TemplateRender.php +++ b/lib/TemplateRender.php @@ -271,6 +271,8 @@ class TemplateRender extends PageRender { * @todo This could probably be merged with PickList */ case 'MultiList': + $args[2] = strtolower($args[2]); + # arg5 overrides our container if (empty($args[5])) $container = $server->getContainerPath($container,$args[0]); @@ -457,6 +459,8 @@ class TemplateRender extends PageRender { * - csv list (, separator) of sort attributes (less to more important) */ case 'PickList': + $args[2] = strtolower($args[2]); + # arg5 overrides our container if (empty($args[5])) $container = $server->getContainerPath($container,$args[0]); diff --git a/lib/functions.php b/lib/functions.php index 8c89f87..b4c8860 100644 --- a/lib/functions.php +++ b/lib/functions.php @@ -1432,7 +1432,8 @@ function get_next_number($base,$attr,$increment=false,$filter=false,$startmin=nu foreach ($search as $dn => $values) { $values = array_change_key_case($values); - array_push($autonum,$values[$attr]); + foreach ($values[$attr] as $value) + array_push($autonum,$value); } $autonum = array_unique($autonum); @@ -1507,7 +1508,7 @@ function get_next_number($base,$attr,$increment=false,$filter=false,$startmin=nu foreach ($search as $dn => $values) { $values = array_change_key_case($values); - $autonum = $values[$attr]; + $autonum = $values[$attr][0]; $poolDN = $values['dn']; } @@ -2861,6 +2862,7 @@ function return_ldap_hash($base,$filter,$key,$attrs,$sort=true) { $server->getIndex(),$base,$filter,$key,$attrs,$sort); $server = $_SESSION[APPCONFIG]->getServer(get_request('server_id','REQUEST')); + $key = strtolower($key); $query = array(); $query['base'] = $base;