fixed member selection

This commit is contained in:
Roland Gruber 2005-04-22 13:33:34 +00:00
parent 5bfcf6f0fc
commit 67e22d8dcf
1 changed files with 48 additions and 34 deletions

View File

@ -146,7 +146,7 @@ class posixGroup extends baseModule {
1 => array ( 'kind' => 'input', 'name' => 'description', 'type' => 'text', 'size' => '30', 'maxlength' => '255', 'value' => $this->attributes['description'][0]), 1 => array ( 'kind' => 'input', 'name' => 'description', 'type' => 'text', 'size' => '30', 'maxlength' => '255', 'value' => $this->attributes['description'][0]),
2 => array ('kind' => 'help', 'value' => 'description')); 2 => array ('kind' => 'help', 'value' => 'description'));
$return[] = array ( 0 => array ( 'kind' => 'text', 'text' => _("Group members").'*' ), $return[] = array ( 0 => array ( 'kind' => 'text', 'text' => _("Group members").'*' ),
1 => array ( 'kind' => 'input', 'name' => 'adduser', 'type' => 'submit', 'value' => _('Edit groups')), 1 => array ( 'kind' => 'input', 'name' => 'adduser', 'type' => 'submit', 'value' => _('Edit members')),
2 => array ('kind' => 'help', 'value' => 'adduser')); 2 => array ('kind' => 'help', 'value' => 'adduser'));
$return[] = array ( 0 => array ( 'kind' => 'text', 'text' => _('Password') ), $return[] = array ( 0 => array ( 'kind' => 'text', 'text' => _('Password') ),
1 => array ( 'kind' => 'input', 'name' => 'userPassword', 'type' => 'password', 'size' => '20', 'maxlength' => '255', 'value' => $this->userPassword()), 1 => array ( 'kind' => 'input', 'name' => 'userPassword', 'type' => 'password', 'size' => '20', 'maxlength' => '255', 'value' => $this->userPassword()),
@ -178,17 +178,22 @@ class posixGroup extends baseModule {
return 0; return 0;
} }
/**
* Displays selections to add or remove users from current group.
*
* @param array $post HTTP-POST
* @return array meta HTML output
*/
function display_html_user(&$post) { function display_html_user(&$post) {
// load list with all groups // load list with all users
$dn_users = $_SESSION['cache']->get_cache('uid', 'posixAccount', 'user'); $dn_users = $_SESSION['cache']->get_cache('uid', 'posixAccount', 'user');
if (is_array($dn_users)) { if (is_array($dn_users)) {
foreach ($dn_users as $user) $users[] = $user[0]; foreach ($dn_users as $user) $users[] = $user[0];
// sort groups // sort users
sort($users, SORT_STRING); sort($users, SORT_STRING);
// remove groups the user is member of from grouplist // remove users which are already members
$users = array_delete($this->attributes['memberUid'], $users); $users = array_delete($this->attributes['memberUid'], $users);
// Remove primary group from grouplist // remove users with this group as their primary group
$users_dn = $_SESSION['cache']->get_cache('gidNumber', 'posixAccount', 'user'); $users_dn = $_SESSION['cache']->get_cache('gidNumber', 'posixAccount', 'user');
$DNs = array_keys($users_dn); $DNs = array_keys($users_dn);
for ($i=0; $i<count($DNs); $i++) { for ($i=0; $i<count($DNs); $i++) {
@ -204,19 +209,28 @@ class posixGroup extends baseModule {
// sort users // sort users
sort($users); sort($users);
} }
$return[] = array ( 0 => array ( 'kind' => 'fieldset', 'legend' => _("Group members"), 'value' => $return[] = array(
array ( 0 => array ( 0 => array ('kind' => 'fieldset', 'td' => array ('valign' => 'top'), 'legend' => _("Selected users"), 'value' => 0 => array('kind' => 'fieldset', 'legend' => _("Group members"), 'value' => array (
array ( 0 => array ( 0 => array ( 'kind' => 'select', 'name' => 'removeusers[]', 'size' => '15', 'multiple', 'options' => $this->attributes['memberUid'])))), 0 => array(
1 => array ( 'kind' => 'table', 'value' => array ( 0 => array ( 0 => array ( 'kind' => 'input', 'type' => 'submit', 'name' => 'addusers_button', 0 => array('kind' => 'fieldset', 'td' => array ('valign' => 'top'), 'legend' => _("Selected users"), 'value' => array (
'value' => '<=')), 1 => array ( 0 => array ( 'kind' => 'input', 'type' => 'submit', 'name' => 'removeusers_button', 'value' => '=>' )), 0 => array(
2 => array ( 0 => array ( 'kind' => 'help', 'value' => 'adduser' )))), 0 => array ( 'kind' => 'select', 'name' => 'removeusers', 'size' => '15', 'multiple' => true, 'options' => $this->attributes['memberUid'])))),
2 => array ('kind' => 'fieldset', 'td' => array ('valign' => 'top'), 'legend' => _("Available users"), 'value' => 1 => array('kind' => 'table', 'value' => array(
array ( 0 => array ( 0 => array ( 'kind' => 'select', 'name' => 'addusers[]', 'size' => '15', 'multiple', 'options' => $users)))) 0 => array(
0 => array('kind' => 'input', 'type' => 'submit', 'name' => 'addusers_button', 'value' => '<=')),
1 => array(
0 => array('kind' => 'input', 'type' => 'submit', 'name' => 'removeusers_button', 'value' => '=>' )),
2 => array(
0 => array('kind' => 'help', 'value' => 'adduser' )))),
2 => array('kind' => 'fieldset', 'td' => array('valign' => 'top'), 'legend' => _("Available users"), 'value' => array(
0 => array(
0 => array('kind' => 'select', 'name' => 'addusers', 'size' => '15', 'multiple' => true, 'options' => $users))))
)))); ))));
$return[] = array ( 0 => array ( 'kind' => 'input', 'name' => 'toattributes' ,'type' => 'submit', 'value' => _('Back') ), $return[] = array(
1 => array ( 'kind' => 'text'), 0 => array('kind' => 'input', 'name' => 'toattributes' ,'type' => 'submit', 'value' => _('Back') ),
2 => array ('kind' => 'text')); 1 => array('kind' => 'text'),
2 => array('kind' => 'text'));
return $return; return $return;
} }
@ -603,28 +617,28 @@ class posixGroup extends baseModule {
} }
/* Write variables into object and do some regexp checks /**
* Processes input data and adds or removes users from current group.
*
* @param array $post HTTP-POST
* @return string name of next page
*/ */
function process_user(&$post) { function process_user(&$post) {
do { // X-Or, only one if() can be true if (isset($post['addusers']) && isset($post['addusers_button'])) { // Add users to list
if (isset($post['addusers']) && isset($post['addusers_button'])) { // Add groups to list // Add new user
// Add new user $this->attributes['memberUid'] = @array_merge($this->attributes['memberUid'], $post['addusers']);
$this->attributes['memberUid'] = @array_merge($this->attributes['memberUid'], $post['addusers']); // remove duplicates
// remove doubles $this->attributes['memberUid'] = @array_flip($this->attributes['memberUid']);
$this->attributes['memberUid'] = @array_flip($this->attributes['memberUid']); array_unique($this->attributes['memberUid']);
array_unique($this->attributes['memberUid']); $this->attributes['memberUid'] = @array_flip($this->attributes['memberUid']);
$this->attributes['memberUid'] = @array_flip($this->attributes['memberUid']); // sort users
// sort groups sort($this->attributes['memberUid']);
sort($this->attributes['memberUid']);
break;
} }
if (isset($post['removeusers']) && isset($post['removeusers_button'])) { // remove groups from list elseif (isset($post['removeusers']) && isset($post['removeusers_button'])) { // remove users from list
$this->attributes['memberUid'] = array_delete($post['removeusers'], $this->attributes['memberUid']); $this->attributes['memberUid'] = array_delete($post['removeusers'], $this->attributes['memberUid']);
break;
} }
} while(0);
if (isset($post['adduser_button']) || isset($post['removeuser_button'])) return 'user'; if (isset($post['adduser_button']) || isset($post['removeuser_button'])) return 'user';
if ($post['toattributes']) return 'attributes'; elseif ($post['toattributes']) return 'attributes';
return 0; return 0;
} }