verify => [\&html_start, \&action_verify, \&html_end],
delete => [\&html_start, \&action_ask_del, \&html_end],
expunge => [\&html_start, \&action_do_del, \&html_end],
- vcard => \&action_vcard
+ vcard => \&action_vcard,
+ edit_group => [\&html_start, \&action_edit_group, \&html_end],
+ save_group => [\&html_start, \&action_save_group, \&html_end]
);
read_config ();
if (!defined ($Actions{$Action}))
{
- die;
+ die ("No such action: $Action");
}
if (ref ($Actions{$Action}) eq 'CODE')
{
my @groups = LiCoM::Group->all ();
- print qq(\t\t<h2>Contact Groups</h2>\n\t\t<ul class="groups">\n);
+ print qq(\t\t<h2>Contact groups</h2>\n\t\t<ul class="groups">\n);
for (@groups)
{
my $group = $_;
my @members = $group->get_members ();
my $members = scalar (@members);
my $group_name = $group->name ();
- my $group_esc = uri_escape ($group_name);
+ my $group_uri = uri_escape ($group_name);
my $desc = $group->description ();
- print qq#\t\t\t<li><a href="$MySelf?action=browse&group=$group_esc">#,
+ print qq#\t\t\t<li><a href="$MySelf?action=browse&group=$group_uri">#,
encode_entities ($group_name),
qq#</a> ($members Member#, ($members == 1 ? ')' : 's)');
print qq(<br />\n\t\t\t\t<span class="description">),
}
else
{
- my $group_obj = LiCoM::Group->load ($group);
- my $group_esc = uri_escape ($group_obj->name ());
+ my $group_obj = LiCoM::Group->load ($group);
+ my $group_uri = uri_escape ($group_obj->name ());
+ my $group_html = encode_entities ($group_obj->name ());
my @member_names = $group_obj->get_members ();
+ my $desc = $group_obj->description ();
+ my $desc_html = encode_entities ($desc || '');
- print qq(\t\t<h2>Contact Group "$group"</h2>\n),
- qq(\t\t<ul class="results">\n);
+ print qq(\t\t<h2>Contact group "$group_html"</h2>\n);
+ print qq(\t\t<div>$desc_html</div>\n) if ($desc);
+ print qq(\t\t<ul class="results">\n);
for (sort (@member_names))
{
my $cn = $_;
- my $cn_esc = uri_escape ($cn);
+ my $cn_uri = uri_escape ($cn);
+ my $cn_html = encode_entities ($cn);
- print qq(\t\t\t<li><a href="$MySelf?action=detail&cn=$cn_esc">$cn</a></li>\n);
+ print qq(\t\t\t<li><a href="$MySelf?action=detail&cn=$cn_uri">$cn_html</a></li>\n);
}
print <<EOF;
</ul>
<div class="menu">
- [<a href="$MySelf?action=list&group=$group_esc">List</a>]
+ [<a href="$MySelf?action=list&group=$group_uri">List</a>]
[<a href="$MySelf?action=browse">Back</a>]
- [Edit]
+ [<a href="$MySelf?action=edit_group&group=$group_uri">Edit</a>]
</div>
EOF
}
sub action_list
{
- my $group = param ('group');
- $group = shift if (@_);
- $group ||= '';
+ my $group_name = param ('group');
+ $group_name = shift if (@_);
+ $group_name ||= '';
+
+ my $group_name_html = encode_entities ($group_name || '');
- my $title = $group ? "List of group "$group"" : 'List of all addresses';
+ my $title = $group_name
+ ? "List of group "$group_name_html""
+ : 'List of all addresses';
my @fields = (qw(address homephone cellphone officephone fax mail));
my @all = ();
- if ($group)
+ if ($group_name)
{
- @all = LiCoM::Person->search ([[group => $group]]);
+ my $group_obj = LiCoM::Group->load ($group_name);
+ if (!$group_obj)
+ {
+ print <<HTML;
+ <div class="error">
+ Unable to load group "$group_name_html".
+ </div>
+HTML
+ return;
+ }
+ for ($group_obj->get_members ())
+ {
+ my $cn = $_;
+ my $person_obj = LiCoM::Person->load ($cn);
+
+ if (!$person_obj)
+ {
+ print STDERR "Unable to load cn = $cn;\n";
+ next;
+ }
+ push (@all, $person_obj);
+ }
}
else
{
- @all = LiCoM::Person->search ();
+ @all = LiCoM::Person->search ([[group => $group_name]]);
}
print <<EOF;
for (sort { $a->name () cmp $b->name () } (@all))
{
my $person = $_;
+ my $cn = $person->name ();
my $sn = $person->lastname ();
my $gn = $person->firstname ();
+ my $cn_uri = uri_escape ($cn);
+ my $cn_html = encode_entities ("$sn, $gn");
+
print "\t\t\t<tr>\n",
- "\t\t\t\t<td>$sn, $gn</td>\n";
+ qq(\t\t\t\t<td><a href="$MySelf?action=detail&cn=$cn_uri">$cn_html</a></td>\n);
for (@fields)
{
my $field = $_;
my @values = $person->get ($field);
- print "\t\t\t\t<td>" . join ('<br />', map { encode_entities ($_) } (@values)) . "</td>\n";
+ print "\t\t\t\t<td>" . join ('<br />', map { markup_field ($field, $_) } (@values)) . "</td>\n";
}
print "\t\t\t</tr>\n";
}
print "\t\t</table>\n\n";
- if ($group)
+ if ($group_name)
{
- my $group_esc = uri_escape ($group);
+ my $group_esc = uri_escape ($group_name);
print qq(\t\t<div class="menu">[<a href="$MySelf?action=browse&group=$group_esc">Back</a>]</div>\n);
}
else
for (my $i = 0; $i < $num; $i++)
{
- my $val = $values->[$i];
- my $val_uri = uri_escape ($val);
- my $val_html = encode_entities ($val);
-
- if ($field eq 'group')
- {
- $val = qq(<a href="$MySelf?action=browse&group=$val_uri">$val_html</a>);
- }
- elsif ($field eq 'uri')
- {
- if ($val =~ m#^([a-z]+)://(.+)$#)
- {
- $val_uri = $1 . '://' . uri_escape ($2);
- }
- else
- {
- $val_uri = 'http://' . uri_escape ($val);
- }
- $val = qq(<a href="$val_uri" class="extern">$val_html</a>);
- }
- elsif ($field eq 'mail')
- {
- $val = qq(<a href="mailto:$val_uri" class="mail">$val_html</a>);
- }
- else
- {
- $val = $val_html;
- }
+ my $val = markup_field ($field, $values->[$i]);
print "\t\t\t<tr>\n" if ($i);
print "\t\t\t\t<td>$val</td>\n",
}
}
- my %changed_groups = map { $_ => 1 } (param ('group'));
- my @current_groups = LiCoM::Group->load_by_member ($cn);
-
- for (@current_groups)
+ # only `authorized' users may see and change groups
+ if ($UserID)
{
- my $group_obj = $_;
- my $group_name = $group_obj->name ();
+ my %changed_groups = map { $_ => 1 } (param ('group'));
+ my @current_groups = LiCoM::Group->load_by_member ($cn);
- if (!defined ($changed_groups{$group_name}))
+ for (@current_groups)
{
- $group_obj->del_members ($cn);
+ 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});
+ }
}
- else
+ for (keys %changed_groups)
{
- delete ($changed_groups{$group_name});
+ my $group_name = $_;
+ my $group_obj = LiCoM::Group->load ($group_name) or die;
+
+ $group_obj->add_members ($cn);
}
- }
- 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 (param ('newgroup'))
+ if (!$UserID)
{
- # FIXME add error handling
- my $group_name = param ('newgroup');
- LiCoM::Group->create ($group_name, '', $cn);
+ print <<HTML;
+ <h3>Your changes have been saved.</h3>
+ <p>Thank you very much for taking the time to keep this record up to date.</p>
+
+HTML
}
if ($button eq 'apply' or !$UserID)
action_browse ();
}
+sub action_edit_group
+{
+ my $group_name = param ('group') or die;
+
+ my $group_name_html = encode_entities ($group_name);
+
+ my $group_obj = LiCoM::Group->load ($group_name);
+
+ if (!$group_obj)
+ {
+ print qq(\t<div class="error">Group "$group_name_html" does not exist or could not be loaded.</div>\n);
+ return;
+ }
+
+ $group_name_html = encode_entities ($group_obj->name ());
+
+ my $desc_html = encode_entities ($group_obj->description () || '');
+
+ print <<HTML;
+ <h2>Edit contact group "$group_name_html"</h2>
+ <form action="$MySelf" method="post">
+ <input type="hidden" name="action" value="save_group" />
+ <input type="hidden" name="group" value="$group_name_html" />
+ <table>
+ <tr>
+ <th>Group Name</th>
+ <td>$group_name_html</td>
+ </tr>
+ <tr>
+ <th>Description</th>
+ <td><input type="text" name="description" value="$desc_html" /></td>
+ </tr>
+ <tr>
+ <th colspan="2"><input type="submit" name="button" value="Save" /></th>
+ </tr>
+ </table>
+ </form>
+HTML
+}
+
+sub action_save_group
+{
+ my $group_name = param ('group') or die;
+
+ my $group_name_html = encode_entities ($group_name);
+
+ my $group_obj = LiCoM::Group->load ($group_name);
+
+ if (!$group_obj)
+ {
+ print qq(\t<div class="error">Group "$group_name_html" does not exist or could not be loaded.</div>\n);
+ return;
+ }
+
+ my $desc = param ('description');
+ $group_obj->description ($desc);
+
+ action_browse ();
+ return;
+}
+
sub html_start
{
my $title = shift;
table.list
{
width: 100%;
+ border: 2px solid #d0d0d0;
}
table.list td
td
{
color: black;
- background-color: #cccccc;
+ background-color: #e8e8e8;
vertical-align: top;
}
th
{
color: black;
- background-color: #999999;
+ background-color: #d0d0d0;
padding: 0.3ex;
text-align: left;
vertical-align: top;
}
+
+ ul.groups li
+ {
+ margin-top: 0.5ex;
+ }
}
\@media print
return (scalar (@errors));
}
+sub markup_field
+{
+ my $field = shift;
+ my $value = shift;
+
+ my $value_uri = uri_escape ($value);
+ my $value_html = encode_entities ($value);
+
+ if ($field eq 'group')
+ {
+ return (qq(<a href="$MySelf?action=browse&group=$value_uri">$value_html</a>));
+ }
+ elsif ($field eq 'uri')
+ {
+ if ($value =~ m#^([a-z]+)://(.+)$#)
+ {
+ $value_uri = $1 . '://' . uri_escape ($2);
+ }
+ else
+ {
+ $value_uri = 'http://' . uri_escape ($value);
+ }
+ return (qq(<a href="$value_uri" class="extern">$value_html</a>));
+ }
+ elsif ($field eq 'mail')
+ {
+ return (qq(<a href="mailto:$value_uri" class="mail">$value_html</a>));
+ }
+ return ($value_html);
+}
+
sub get_contacts
{
my $contacts = @_ ? shift : {};