diff --git a/lam/lib/modules/nisnetgroup.inc b/lam/lib/modules/nisnetgroup.inc index db774da1..7207e9e6 100644 --- a/lam/lib/modules/nisnetgroup.inc +++ b/lam/lib/modules/nisnetgroup.inc @@ -193,6 +193,7 @@ class nisnetgroup extends baseModule { array('kind' => 'input', 'type' => 'text', 'name' => 'user_' . $i, 'value' => $triple[1]), array('kind' => 'input', 'type' => 'submit', 'name' => 'form_subpage_nisnetgroup_select_user' . $i, 'image' => 'user.png', 'value' => ' ', 'title' => _('Select user')), array('kind' => 'input', 'type' => 'text', 'name' => 'domain_' . $i, 'value' => $triple[2]), + array('kind' => 'text', 'text' => ' '), array('kind' => 'input', 'type' => 'submit', 'name' => 'del_' . $i, 'image' => 'delete.png', 'value' => ' ', 'title' => _('Delete')) ); } @@ -214,6 +215,7 @@ class nisnetgroup extends baseModule { array('kind' => 'input', 'type' => 'text', 'name' => 'user_new', 'value' => $userNew), array('kind' => 'input', 'type' => 'submit', 'name' => 'form_subpage_nisnetgroup_select_userNew', 'image' => 'user.png', 'value' => ' ', 'title' => _('Select user')), array('kind' => 'input', 'type' => 'text', 'name' => 'domain_new', 'value' => $domainNew), + array('kind' => 'text', 'text' => ' '), array('kind' => 'input', 'type' => 'submit', 'name' => 'add_new', 'image' => 'add.png', 'value' => ' ', 'title' => _('Add')) ); $return[] = array( @@ -514,10 +516,22 @@ class nisnetgroup extends baseModule { $return[get_class($this) . '_subgroups'] = array('' . _('Subgroups') . '' . implode(', ', $this->attributes['memberNisNetgroup']) . ''); } if (sizeof($this->attributes['nisNetgroupTriple']) > 0) { - $return[get_class($this) . '_members'][0] = '' . _('Members') . '' . $this->attributes['nisNetgroupTriple'][0] . ''; - for ($i = 1; $i < sizeof($this->attributes['nisNetgroupTriple']); $i++) { - $return[get_class($this) . '_members'][] = '' . $this->attributes['nisNetgroupTriple'][$i] . ''; + $return[get_class($this) . '_subgroups'] = array('' . _('Members') . ' '); + $return[get_class($this) . '_members'][] = ' ' . + '' . _('Host') . '' . + '' . _('User') . '' . + '' . _('Domain') . '' . + ''; + for ($i = 0; $i < sizeof($this->attributes['nisNetgroupTriple']); $i++) { + $triple = substr($this->attributes['nisNetgroupTriple'][$i], 1, strlen($this->attributes['nisNetgroupTriple'][$i]) - 2); + $triple = explode(',', $triple); + $return[get_class($this) . '_members'][] = ' ' . + '' . $triple[0] . ' ' . + '' . $triple[1] . ' ' . + '' . $triple[2] . ' ' . + ''; } + $return[get_class($this) . '_members'][] = ' '; } return $return; }