{
my $pkg = shift;
my $name = shift;
- my $member_dn = _cn_to_dn ($name);
+ my $obj;
+
+ my $mesg = $Ldap->search
+ (
+ base => get_config ('base_dn'),
+ filter => "(&(objectClass=groupOfNames)(cn=$name))"
+ );
+
+ if ($mesg->is_error ())
+ {
+ warn ("Error while querying LDAP server: " . $mesg->error_text ());
+ return (undef);
+ }
+
+ for ($mesg->entries ())
+ {
+ my $entry = $_;
+ $obj = new ($pkg, $entry);
+ last;
+ }
+
+ return ($obj);
+}
+
+sub load_by_member
+{
+ my $pkg = shift;
+ my $cn = shift;
+ my $dn = _cn_to_dn ($cn);
my @retval = ();
my $mesg = $Ldap->search
(
base => get_config ('base_dn'),
- filter => "(&(objectClass=groupOfNames)(|(cn=$name)(member=$member_dn)))"
+ filter => "(&(objectClass=groupOfNames)(member=$dn))"
);
if ($mesg->is_error ())
return (@retval);
}
-=item LiCoM::Group-E<gt>B<create> (I<$name>, I<$description>, I<@members>)
+
+=item LiCoM::Group-E<gt>B<create> (I<$name>, I<$description>, I<@member_cns>)
Creates and returns a new group. At least one member has to be given to meet
-LDAP requirements. I<@members> is an array of B<LiCoM::Person>-objects.
+LDAP requirements. I<@members> is an array of CNs.
=cut
my $desc = shift;
my @members = @_;
my $dn = _cn_to_dn ($name);
+ my ($ou) = get_config ('base_dn') =~ m/\bou\s*=\s*([^,]+)/i;
my $entry = Net::LDAP::Entry->new ();
$entry->add (objectClass => [qw(top groupOfNames)]);
+ $entry->add (ou => $ou);
$entry->add (cn => $name);
- $entry->add (member => [map { $_->get ('dn') } (@members)]);
+ $entry->add (member => [map { _cn_to_dn ($_) } (@members)]);
$entry->add (description => $desc);
$entry->dn ($dn);
$group = shift if (@_);
$group ||= '';
- return ('');
-
- my @all;
- if ($group)
- {
- @all = LiCoM::Person->search ([[group => $group]]);
- }
- else
- {
- @all = LiCoM::Person->search ();
- }
-
if (!$group)
{
- my @nogroup = ();
- my %groups = ();
- for (@all)
- {
- my $person = $_;
- my @g = $person->get ('group');
-
- $groups{$_} = (defined ($groups{$_}) ? $groups{$_} + 1 : 1) for (@g);
-
- push (@nogroup, $person) if (!@g);
- }
- @all = @nogroup;
+ my @groups = LiCoM::Group->all ();
print qq(\t\t<h2>Contact Groups</h2>\n\t\t<ul class="groups">\n);
- for (sort (keys (%groups)))
+ for (@groups)
{
my $group = $_;
- my $group_esc = uri_escape ($group);
- my $num = $groups{$group};
-
- print qq(\t\t\t<li><a href="$MySelf?action=browse&group=$group_esc">$group</a> ($num)</li>\n);
+ my @members = $group->get_members ();
+ my $members = scalar (@members);
+ my $group_name = $group->name ();
+ my $group_esc = uri_escape ($group_name);
+ my $desc = $group->description ();
+
+ print qq#\t\t\t<li><a href="$MySelf?action=browse&group=$group_esc">$group_name</a> ($members Members)#;
+ print qq(<br />\n\t\t\t\t<span class="description">$desc</span>) if ($desc);
+ print "</li>\n";
}
- if (!%groups)
+ if (!@groups)
{
print qq(\t\t\t<li class="empty">There are no groups yet.</li>\n);
}
- print qq(\t\t</ul>\n\n);
- }
-
- if ($group)
- {
- print qq(\t\t<h2>Contact Group "$group"</h2>\n);
+ print <<EOF;
+ </ul>
+ <div class="menu">
+ [<a href="$MySelf?action=list">List all</a>]
+ </div>
+EOF
}
else
{
- print qq(\t\t<h2>Contacts without a group</h2>\n);
- }
-
- print qq(\t\t<ul class="results">\n);
- for (sort { $a->name () cmp $b->name () } (@all))
- {
- my $person = $_;
- my $cn = $person->name ();
- my $cn_esc = uri_escape ($cn);
-
- print qq(\t\t\t<li><a href="$MySelf?action=detail&cn=$cn_esc">$cn</a></li>\n);
- }
- if (!@all)
- {
- print "\t\t\t<li>There are no matching entries.</li>\n";
- }
- print qq(\t\t</ul>\n\n);
+ my $group_obj = LiCoM::Group->load ($group);
+ my $group_esc = uri_escape ($group_obj->name ());
+ my @member_names = $group_obj->get_members ();
+
+ print qq(\t\t<h2>Contact Group "$group"</h2>\n),
+ qq(\t\t<ul class="results">\n);
+ for (sort (@member_names))
+ {
+ my $cn = $_;
+ my $cn_esc = uri_escape ($cn);
- print qq(\t\t<div class="menu">\n);
- if ($group)
- {
- my $group_esc = uri_escape ($group);
- print qq(\t\t\t[<a href="$MySelf?action=list&group=$group_esc">List</a>]\n),
- qq(\t\t\t[<a href="$MySelf?action=browse">Back</a>]\n);
- }
- else
- {
- print qq(\t\t\t[<a href="$MySelf?action=list">List</a>]\n);
+ print qq(\t\t\t<li><a href="$MySelf?action=detail&cn=$cn_esc">$cn</a></li>\n);
+ }
+
+ print <<EOF;
+ </ul>
+ <div class="menu">
+ [<a href="$MySelf?action=list&group=$group_esc">List</a>]
+ [<a href="$MySelf?action=browse">Back</a>]
+ [Edit]
+ </div>
+EOF
}
- print qq(\t\t</div>\n);
}
sub action_list
if ($UserID)
{
- my %c_groups = map { $_ => 1 } (@{$contacts->{'group'}});
- my %a_groups = ();
- my @a_persons = LiCoM::Person->search ();
+ my @all_groups = LiCoM::Group->all ();
- for (@a_persons)
+ if (@all_groups)
{
- $a_groups{$_} = 1 for ($_->get ('group'));
- }
+ print "\t\t\t<tr>\n",
+ "\t\t\t\t<th>Group(s)</th>\n",
+ qq(\t\t\t\t<td><select name="group" multiple="multiple" size="5">\n);
- print "\t\t\t<tr>\n",
- "\t\t\t\t<th>", $FieldNames{'group'}, "</th>\n",
- qq(\t\t\t\t<td><select name="group" multiple="multiple">\n);
- for (sort (keys %a_groups))
- {
- my $group = $_;
- my $selec = defined ($c_groups{$group}) ? ' selected="selected"' : '';
+ for (@all_groups)
+ {
+ my $group = $_;
+ my $group_name = $group->name ();
+ my $selected = '';
+
+ if (grep { $cn eq $_ } ($group->get_members ()))
+ {
+ $selected = ' selected="selected"';
+ }
- print qq(\t\t\t\t\t<option value="$group"$selec>$group</option>\n);
+ print qq(\t\t\t\t\t<option value="$group_name"$selected>$group_name</option>\n);
+ }
+ print "\t\t\t\t</select></td>\n",
+ "\t\t\t</tr>\n";
}
- print "\t\t\t\t</select></td>\n",
+
+ print "\t\t\t<tr>\n",
+ "\t\t\t\t<th>New Group</th>\n",
+ qq(\t\t\t\t<td><input type="text" name="newgroup" value="" /></td>\n),
"\t\t\t</tr>\n";
}
$cn = $person->name ();
+ for (param ('group'))
+ {
+ my $group_name = $_;
+ my $group = LiCoM::Group->load ($group_name);
+
+ if ($group)
+ {
+ $group->add_members ($cn);
+ }
+ else
+ {
+ print qq(\t<div class="error">Group "$group_name" does not exist or could not be loaded.</div>\n);
+ }
+ }
+
+ if (param ('newgroup'))
+ {
+ # FIXME add error handling
+ my $group_name = param ('newgroup');
+ LiCoM::Group->create ($group_name, '', $cn);
+ }
+
if ($button eq 'apply')
{
action_edit (cn => $cn);
$person->firstname ($firstname) if ($firstname and $firstname ne $person->firstname ());
$cn = $person->name ();
+ # FIXME Fix groups
}
my $contacts = get_contacts ();
}
}
+ my %changed_groups = map { $_ => 1 } (param ('group'));
+ my @current_groups = LiCoM::Group->load_by_member ($cn);
+
+ for (@current_groups)
+ {
+ my $group_obj = $_;
+ my $group_name = $group_obj->name ();
+
+ if (!defined ($changed_groups{$group_name}))
+ {
+ $group_obj->del_members ($cn);
+ }
+ else
+ {
+ delete ($changed_groups{$group_name});
+ }
+ }
+ for (keys %changed_groups)
+ {
+ my $group_name = $_;
+ my $group_obj = LiCoM::Group->load ($group_name) or die;
+
+ $group_obj->add_members ($cn);
+ }
+
+ if (param ('newgroup'))
+ {
+ # FIXME add error handling
+ my $group_name = param ('newgroup');
+ LiCoM::Group->create ($group_name, '', $cn);
+ }
+
if ($button eq 'apply' or !$UserID)
{
action_edit (cn => $cn);