X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=licom.cgi;h=cd0269060ba760153c82b332078d8fd86fcdd44c;hb=561ad6221dd53bd1c4295073e67a6ad41b0cbf7b;hp=4af14ad7b37a84e185cf24b420d28fc7502891fd;hpb=0b46496344123e462825844a676997b77823b365;p=licom.git

diff --git a/licom.cgi b/licom.cgi
index 4af14ad..cd02690 100755
--- a/licom.cgi
+++ b/licom.cgi
@@ -1,5 +1,21 @@
 #!/usr/bin/perl
 
+# LiCoM - Lightweight contact manager
+# Copyright (c) 2005-2006  Florian octo Forster <octo at verplant.org>
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; only version 2 of the License is applicable.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software # Foundation, Inc.,
+# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
 use strict;
 use warnings;
 use lib (qw(lib));
@@ -7,14 +23,16 @@ use lib (qw(lib));
 use CGI (':cgi');
 use CGI::Carp (qw(fatalsToBrowser));
 use URI::Escape;
-use Data::Dumper;
+use HTML::Entities (qw(encode_entities));
 
-use Person;
+use LiCoM::Config (qw(get_config set_config read_config));
+use LiCoM::Connection ();
+use LiCoM::Group ();
+use LiCoM::Person ();
 
 our $Debug = 0;
-our %Config = ();
 
-our @MultiFields = (qw(address homephone cellphone officephone fax mail uri group));
+our @MultiFields = (qw(address homephone cellphone officephone fax mail uri));
 
 our %FieldNames = 
 (
@@ -43,24 +61,32 @@ our %Actions =
 	save	=> [\&html_start, \&action_save,    \&html_end],
 	search	=> [\&html_start, \&action_search,  \&html_end],
 	verify	=> [\&html_start, \&action_verify,  \&html_end],
-	vcard	=> \&action_vcard
+	delete	=> [\&html_start, \&action_ask_del,  \&html_end],
+	expunge	=> [\&html_start, \&action_do_del,  \&html_end],
+	vcard	=> \&action_vcard,
+	edit_group => [\&html_start, \&action_edit_group, \&html_end],
+	save_group => [\&html_start, \&action_save_group, \&html_end]
 );
 
 read_config ();
 
 # make sure AuthLDAPRemoteUserIsDN is enabled.
 die unless ($ENV{'REMOTE_USER'});
-$Config{'base_dn'} = $ENV{'REMOTE_USER'};
+set_config ('base_dn', $ENV{'REMOTE_USER'});
+
+die unless (defined (get_config ('uri'))
+	and defined (get_config ('base_dn'))
+	and defined (get_config ('bind_dn'))
+	and defined (get_config ('password')));
 
-Person->connect
+LiCoM::Connection->connect
 (
-	uri	=> $Config{'uri'},
-	base_dn => $Config{'base_dn'},
-	bind_dn => $Config{'bind_dn'},
-	password => $Config{'password'}
+	uri	 => get_config ('uri'),
+	bind_dn  => get_config ('bind_dn'),
+	password => get_config ('password')
 ) or die;
 
-our ($UserCN, $UserID) = Person->get_user ($Config{'base_dn'});
+our ($UserCN, $UserID) = LiCoM::Person->get_user ($ENV{'REMOTE_USER'});
 
 if (!$UserID and $Action ne 'save')
 {
@@ -74,7 +100,7 @@ if (!$UserCN)
 
 if (!defined ($Actions{$Action}))
 {
-	die;
+	die ("No such action: $Action");
 }
 
 if (ref ($Actions{$Action}) eq 'CODE')
@@ -89,9 +115,7 @@ elsif (ref ($Actions{$Action}) eq 'ARRAY')
 	}
 }
 
-#print qq#<div>Authenticated as ($UserCN, $UserID, #, $Config{'base_dn'}, qq#)</div>\n#;
-
-Person->disconnect ();
+LiCoM::Connection->disconnect ();
 
 exit (0);
 
@@ -103,94 +127,112 @@ sub action_browse
 	$group = shift if (@_);
 	$group ||= '';
 
-	my @all;
-	if ($group)
-	{
-		@all = Person->search ([[group => $group]]);
-	}
-	else
-	{
-		@all = Person->search ();
-	}
-
 	if (!$group)
 	{
-		my %groups = ();
-		for (@all)
-		{
-			my $person = $_;
-			my @g = $person->get ('group');
+		my @groups = LiCoM::Group->all ();
 
-			$groups{$_} = (defined ($groups{$_}) ? $groups{$_} + 1 : 1) for (@g);
-		}
-
-		print qq(\t\t<h2>Contact Groups</h2>\n\t\t<ul class="groups">\n);
-		for (sort (keys (%groups)))
+		print qq(\t\t<h2>Contact groups</h2>\n\t\t<ul class="groups">\n);
+		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_uri  = uri_escape ($group_name);
+			my $desc = $group->description ();
+
+			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">),
+			encode_entities ($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 &quot;$group&quot;</h2>\n);
+		print <<EOF;
+		</ul>
+		<div class="menu">
+			[<a href="$MySelf?action=list">List&nbsp;all</a>]
+		</div>
+EOF
 	}
 	else
 	{
-		print qq(\t\t<h2>All Contacts</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);
-	}
-	print qq(\t\t</ul>\n\n);
+		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 &quot;$group_html&quot;</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_uri  = uri_escape ($cn);
+			my $cn_html = encode_entities ($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_uri">$cn_html</a></li>\n);
+		}
+		
+		print <<EOF;
+		</ul>
+		<div class="menu">
+			[<a href="$MySelf?action=list&group=$group_uri">List</a>]
+			[<a href="$MySelf?action=browse">Back</a>]
+			[<a href="$MySelf?action=edit_group&group=$group_uri">Edit</a>]
+		</div>
+EOF
 	}
-	print qq(\t\t</div>\n);
 }
 
 sub action_list
 {
-	my $group = param ('group');
-	$group = shift if (@_);
-	$group ||= '';
+	my $group_name = param ('group');
+	$group_name = shift if (@_);
+	$group_name ||= '';
 
-	my $title = $group ? "List of group &quot;$group&quot;" : 'List of all addresses';
+	my $group_name_html = encode_entities ($group_name || '');
+
+	my $title = $group_name
+		? "List of group &quot;$group_name_html&quot;"
+		: 'List of all addresses';
 	my @fields = (qw(address homephone cellphone officephone fax mail));
 
 	my @all = ();
-	if ($group)
+	if ($group_name)
 	{
-		@all = Person->search ([[group => $group]]);
+		my $group_obj = LiCoM::Group->load ($group_name);
+		if (!$group_obj)
+		{
+			print <<HTML;
+		<div class="error">
+			Unable to load group &quot;$group_name_html&quot;.
+		</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 = Person->search ();
+		@all = LiCoM::Person->search ([[group => $group_name]]);
 	}
 
 	print <<EOF;
@@ -209,26 +251,30 @@ 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 />', @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
@@ -243,22 +289,23 @@ sub action_detail
 	$cn = shift if (@_);
 	die unless ($cn);
 
-	my $person = Person->load ($cn);
+	my $cn_html = encode_entities ($cn);
+	my $cn_uri  = uri_escape ($cn);
+
+	my $person = LiCoM::Person->load ($cn);
 	if (!$person)
 	{
-		print qq(\t<div>Entry &quot;$cn&quot; could not be loaded from DB.</div>\n);
+		print qq(\t<div>Entry &quot;$cn_html&quot; could not be loaded from DB.</div>\n);
 		return;
 	}
 
-	print qq(\t\t<h2>Details for $cn</h2>\n);
-
-	my $cn_esc = uri_escape ($cn);
+	print qq(\t\t<h2>Details for $cn_html</h2>\n);
 
 	print <<EOF;
 		<table class="detail">
 			<tr>
 				<th>Name</th>
-				<td>$cn</td>
+				<td>$cn_html</td>
 			</tr>
 EOF
 	for (@MultiFields)
@@ -266,52 +313,59 @@ EOF
 		my $field = $_;
 		my $values = $person->get ($field);
 		my $num = scalar (@$values);
-		my $print = defined ($FieldNames{$field}) ? $FieldNames{$field} : $field;
+		my $field_name = defined ($FieldNames{$field}) ? $FieldNames{$field} : $field;
 
 		next unless ($num);
 
+		$field_name = encode_entities ($field_name);
+
 		print "\t\t\t<tr>\n";
 		if ($num > 1)
 		{
-			print qq(\t\t\t\t<th rowspan="$num">$print</th>\n);
+			print qq(\t\t\t\t<th rowspan="$num">$field_name</th>\n);
 		}
 		else
 		{
-			print qq(\t\t\t\t<th>$print</th>\n);
+			print qq(\t\t\t\t<th>$field_name</th>\n);
 		}
 
 		for (my $i = 0; $i < $num; $i++)
 		{
-			my $val = $values->[$i];
-
-			if ($field eq 'group')
-			{
-				my $val_esc = uri_escape ($val);
-				$val = qq(<a href="$MySelf?action=browse&group=$val_esc">$val</a>);
-			}
-			elsif ($field eq 'uri')
-			{
-				my $uri = $val;
-				$uri = qq(http://$val) unless ($val =~ m#^[a-z]+://#);
-				$val = qq(<a href="$uri" class="extern">$val</a>);
-			}
-			elsif ($field eq 'mail')
-			{
-				$val = qq(<a href="mailto:$val" class="mail">$val</a>);
-			}
+			my $val = markup_field ($field, $values->[$i]);
 			
 			print "\t\t\t<tr>\n" if ($i);
 			print "\t\t\t\t<td>$val</td>\n",
 			"\t\t\t</tr>\n";
 		}
 	}
+
+	my @groups = LiCoM::Group->load_by_member ($cn);
+	if (@groups)
+	{
+		my $num = scalar (@groups);
+		print "\t\t\t<tr>\n",
+		"\t\t\t\t<th", ($num == 1 ? '' : qq( rowspan="$num")), ">Group", ($num == 1 ? '' : 's'), "</th>\n";
+		for (my $i = 0; $i < $num; $i++)
+		{
+			my $group = $groups[$i];
+			my $group_name = $group->name ();
+			my $group_uri  = uri_escape ($group_name);
+			my $group_html = encode_entities ($group_name);
+
+			print "\t\t\t<tr>\n" if ($i != 0);
+			print qq(\t\t\t\t<td><a href="$MySelf?action=browse&group=$group_uri">$group_html</a></td>\n),
+			"\t\t\t</tr>\n";
+		}
+	}
+	
 	print <<EOF;
 		</table>
 
 		<div class="menu">
-			[<a href="$MySelf?action=verify&cn=$cn_esc">Verify</a>]
-			[<a href="$MySelf?action=vcard&cn=$cn_esc">vCard</a>]
-			[<a href="$MySelf?action=edit&cn=$cn_esc">Edit</a>]
+			[<a href="$MySelf?action=verify&cn=$cn_uri">Verify</a>]
+			[<a href="$MySelf?action=vcard&cn=$cn_uri">vCard</a>]
+			[<a href="$MySelf?action=edit&cn=$cn_uri">Edit</a>]
+			[<a href="$MySelf?action=delete&cn=$cn_uri">Delete</a>]
 		</div>
 
 EOF
@@ -340,7 +394,7 @@ sub action_search
 		push (@filter, [[lastname => $pattern], [firstname => $pattern]]);
 	}
 
-	my @matches = Person->search (@filter);
+	my @matches = LiCoM::Person->search (@filter);
 
 	if (!@matches)
 	{
@@ -357,13 +411,14 @@ sub action_search
 	}
 
 	print qq(\t<ul class="result">\n);
-	for (@matches)
+	for (sort { $a->name () cmp $b->name () } (@matches))
 	{
 		my $person = $_;
 		my $cn = $person->name ();
-		my $cn_esc = uri_escape ($cn);
+		my $cn_uri  = uri_escape ($cn);
+		my $cn_html = encode_entities ($cn);
 
-		print qq(\t\t<li><a href="$MySelf?action=detail&cn=$cn_esc">$cn</a></li>\n);
+		print qq(\t\t<li><a href="$MySelf?action=detail&cn=$cn_uri">$cn_html</a></li>\n);
 	}
 	print qq(\t</ul>\n);
 }
@@ -377,6 +432,8 @@ sub action_edit
 	$cn = $opts{'cn'} if (defined ($opts{'cn'}));
 	$cn ||= '';
 
+	my $cn_html = encode_entities ($cn);
+
 	if (!$UserID)
 	{
 		$cn = $UserCN;
@@ -392,7 +449,7 @@ sub action_edit
 
 	if ($cn)
 	{
-		$person = Person->load ($cn);
+		$person = LiCoM::Person->load ($cn);
 
 		if (!$person)
 		{
@@ -424,7 +481,7 @@ sub action_edit
 
 	if ($cn)
 	{
-		print "\t\t<h2>Edit contact $cn</h2>\n";
+		print "\t\t<h2>Edit contact $cn_html</h2>\n";
 	}
 	else
 	{
@@ -434,7 +491,7 @@ sub action_edit
 	print <<EOF;
 		<form action="$MySelf" method="post">
 		<input type="hidden" name="action" value="save" />
-		<input type="hidden" name="cn" value="$cn" />
+		<input type="hidden" name="cn" value="$cn_html" />
 		<table class="edit">
 			<tr>
 				<th>Lastname</th>
@@ -469,11 +526,16 @@ EOF
 		my $print = defined ($FieldNames{$field}) ? $FieldNames{$field} : $field;
 		my @values = @{$contacts->{$field}};
 
+		next if ($field eq 'group');
+
 		push (@values, '');
+
+		$field = encode_entities ($field);
+		$print = encode_entities ($print);
 		
 		for (@values)
 		{
-			my $value = $_;
+			my $value = encode_entities ($_);
 
 			print <<EOF;
 			<tr>
@@ -484,6 +546,39 @@ EOF
 		}
 	}
 
+	if ($UserID)
+	{
+		my @all_groups = LiCoM::Group->all ();
+
+		if (@all_groups)
+		{
+			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);
+
+			for (@all_groups)
+			{
+				my $group = $_;
+				my $group_name = encode_entities ($group->name ());
+				my $selected = '';
+
+				if (grep { $cn eq $_ } ($group->get_members ()))
+				{
+					$selected = ' selected="selected"';
+				}
+
+				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<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";
+	}
+
 	print <<EOF;
 			<tr>
 				<th colspan="2" class="menu">
@@ -543,7 +638,7 @@ sub action_save
 
 	my $contacts = get_contacts ();
 
-	my $person = Person->create (lastname => $lastname, firstname => $firstname, %$contacts);
+	my $person = LiCoM::Person->create (lastname => $lastname, firstname => $firstname, %$contacts);
 
 	if (!$person)
 	{
@@ -553,6 +648,29 @@ sub action_save
 	
 	$cn = $person->name ();
 
+	for (param ('group'))
+	{
+		my $group_name = $_;
+		my $group = LiCoM::Group->load ($group_name);
+
+		if ($group)
+		{
+			$group->add_members ($cn);
+		}
+		else
+		{
+			my $group_html = encode_entities ($group_name);
+			print qq(\t<div class="error">Group &quot;$group_html&quot; 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);
@@ -566,7 +684,7 @@ sub action_save
 sub action_update
 {
 	my $cn = $UserID ? param ('cn') : $UserCN;
-	my $person = Person->load ($cn);
+	my $person = LiCoM::Person->load ($cn);
 
 	die unless ($person);
 
@@ -588,6 +706,10 @@ sub action_update
 		$person->firstname ($firstname) if ($firstname and $firstname ne $person->firstname ());
 
 		$cn = $person->name ();
+		# FIXME Fix groups:
+		# Each group is one entry of type (objectClass=groupOfNames)
+		# with one or more `member' attributes. These attributes are
+		# the `dn' (distinguished name) of the member entries.
 	}
 
 	my $contacts = get_contacts ();
@@ -596,6 +718,8 @@ sub action_update
 	{
 		my $field = $_;
 		
+		next if (!$UserID and $field eq 'group');
+
 		if (defined ($contacts->{$field}))
 		{
 			my $values = $contacts->{$field};
@@ -607,6 +731,51 @@ sub action_update
 		}
 	}
 
+	# only `authorized' users may see and change groups
+	if ($UserID)
+	{
+		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 (!$UserID)
+	{
+		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_edit (cn => $cn);
@@ -623,7 +792,7 @@ sub action_vcard
 	$cn = shift if (@_);
 	die unless ($cn);
 
-	my $person = Person->load ($cn);
+	my $person = LiCoM::Person->load ($cn);
 	die unless ($person);
 
 	my %vcard_types =
@@ -657,6 +826,8 @@ EOF
 		my $vc_fld = $vcard_types{$field};
 		my $values = $person->get ($field);
 
+		next unless ($vc_fld);
+
 		for (@$values)
 		{
 			my $value = $_;
@@ -672,28 +843,33 @@ sub action_verify
 	$cn = shift if (@_);
 	die unless ($cn);
 
-	my $person = Person->load ($cn);
+	my $cn_html = encode_entities ($cn);
+
+	my $person = LiCoM::Person->load ($cn);
 	die unless ($person);
 
 	my ($mail) = $person->get ('mail');
 	$mail ||= '';
 
 	my $message;
-	my $password = $person->password ();
+	my ($password) = $person->get ('password');
+	my $password_html;
 
 	if (!$password)
 	{
 		$password = pwgen ();
-		$person->password ($password);
+		$person->set ('password', [$password]);
 	}
+	$password_html = encode_entities ($password);
 
-	$message = qq(The password for the record &quot;$cn&quot; is &quot;$password&quot;.);
+	$message = qq(The password for the record &quot;$cn_html&quot; is &quot;$password_html&quot;.);
 
 	if ($mail)
 	{
 		if (action_verify_send_mail ($person))
 		{
-			$message .= qq( A request for verification has been sent to $mail.);
+			my $mail_html = encode_entities ($mail);
+			$message .= qq( A request for verification has been sent to $mail_html.);
 		}
 	}
 	else
@@ -709,14 +885,14 @@ sub action_verify
 sub action_verify_send_mail
 {
 	my $person = shift;
-	my $owner = Person->load ($UserCN);
+	my $owner = LiCoM::Person->load ($UserCN);
 	my $smh;
 
 	my ($owner_mail) = $owner->get ('mail');
 	if (!$owner_mail)
 	{
-		my $cn = uri_escape ($UserCN);
-		print qq(\t\t<div class="error">You have no email set in your own profile. <a href="$MySelf?action=edit&cn=$cn">Edit it now</a>!</div>\n);
+		my $cn_uri = uri_escape ($UserCN);
+		print qq(\t\t<div class="error">You have no email set in your own profile. <a href="$MySelf?action=edit&cn=$cn_uri">Edit it now</a>!</div>\n);
 		return (0);
 	}
 
@@ -727,15 +903,15 @@ sub action_verify_send_mail
 	}
 	$max_width++;
 
-	my $person_name = $person->name ();
+	my $person_name   = $person->name ();
 	my ($person_mail) = $person->get ('mail');
-	my $person_gn = $person->firstname ();
-	my $password = $person->password ();
+	my $person_gn     = $person->firstname ();
+	my ($password)    = $person->get ('password');
 
 	my $host = $ENV{'HTTP_HOST'};
-	my $url = 'http://' . $host . $MySelf;
+	my $url = (defined ($ENV{'HTTPS'}) ? 'https://' : 'http://') . $host . $MySelf;
 	
-	open ($smh, "| /usr/sbin/sendmail -t -f $owner_mail") or die ("open pipe to sendmail: $!");
+	open ($smh, '|-', '/usr/sbin/sendmail', '-t', '-f', $owner_mail) or die ("open (sendmail): $!");
 	print $smh <<EOM;
 To: $person_name <$person_mail>
 From: $UserCN <$owner_mail>
@@ -759,23 +935,137 @@ EOM
 	print $smh <<EOM;
 
 If this entry is outdated or incomplete, please take a minute and correct it.
-  Address:  $url
+  Address: $url
  Username: $person_name
  Password: $password
 
-Thank you very much :) Regards,
+Thank you very much :)
+
+Regards,
 $UserCN
+--
+This message was automatically generated by LiCoM,
+http://verplant.org/licom/
 EOM
 	close ($smh);
 
 	return (1);
 }
 
+sub action_ask_del
+{
+	my $cn = param ('cn');
+	$cn or die;
+
+	my $person = LiCoM::Person->load ($cn);
+	$person or die;
+
+	my $cn_uri  = uri_escape ($cn);
+	my $cn_html = encode_entities ($cn);
+
+	print <<EOF;
+		<h2>Really delete $cn_html?</h2>
+
+		<div>
+			You are about to delete <strong>$cn_html</strong>.
+			Are you totally, absolutely sure you want to do this?
+		</div>
+
+		<div class="menu">
+			[<a href="$MySelf?action=expunge&cn=$cn_uri">Yes, delete</a>]
+			[<a href="$MySelf?action=detail&cn=$cn_uri">No, keep</a>]
+		</div>
+
+EOF
+}
+
+sub action_do_del
+{
+	my $cn = param ('cn');
+	$cn or die;
+
+	my $cn_html = encode_entities ($cn);
+
+	my $person = LiCoM::Person->load ($cn);
+	$person or die;
+
+	$person->delete ();
+
+	print <<EOF;
+		<div>$cn_html has been deleted.</div>
+
+EOF
+	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 &quot;$group_name_html&quot; 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 &quot;$group_name_html&quot;</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 &quot;$group_name_html&quot; 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;
 	$title = q(Lightweight Contact Manager) unless ($title);
 
+	$title = encode_entities ($title);
+
 	print <<EOF;
 Content-Type: text/html; charset=UTF-8
 
@@ -895,6 +1185,7 @@ Content-Type: text/html; charset=UTF-8
 			table.list
 			{
 				width: 100%;
+				border: 2px solid #d0d0d0;
 			}
 
 			table.list td
@@ -905,18 +1196,23 @@ Content-Type: text/html; charset=UTF-8
 			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
@@ -987,9 +1283,11 @@ Content-Type: text/html; charset=UTF-8
 
 	<body>
 EOF
+
 	if ($UserID)
 	{
 		my $search = param ('search') || '';
+		$search = encode_entities ($search);
 		print <<EOF;
 		<div class="topmenu">
 			<form action="$MySelf" method="post">
@@ -1017,7 +1315,7 @@ sub html_end
 	print <<EOF;
 		<div class="foot">
 			&quot;Lightweight Contact Manager&quot;,
-			written 2005 by <a href="http://verplant.org/">Florian octo Forster</a>
+			written 2005-2006 by <a href="http://verplant.org/">Florian octo Forster</a>
 			&lt;octo at verplant.org&gt;
 		</div>
 	</body>
@@ -1025,34 +1323,6 @@ sub html_end
 EOF
 }
 
-sub read_config
-{
-	my $file = '/var/www/html/cgi.verplant.org/address/book.conf';
-	my $fh;
-
-	open ($fh, "< $file") or die ("open ($file): $!");
-	for (<$fh>)
-	{
-		chomp;
-		my $line = $_;
-
-		if ($line =~ m/^(\w+):\s*"(.+)"\s*$/)
-		{
-			my $key = lc ($1);
-			my $val = $2;
-
-			$Config{$key} = $val;
-		}
-	}
-
-	close ($fh);
-
-	for (qw(uri bind_dn password))
-	{
-		die ("Not defined: $_") unless (defined ($Config{$_}));
-	}
-}
-
 sub pwgen
 {
 	my $len = @_ ? shift : 6;
@@ -1113,9 +1383,9 @@ sub verify_fields
 		my $number = $_;
 		next unless ($number);
 
-		if ($number !~ m/^\+/)
+		if ($number !~ m/^\+[0-9 \-]+$/)
 		{
-			push (@errors, 'Telephone numbers have to begin with the country code, e.g. &quot;+49 911 123456&quot;');
+			push (@errors, 'Telephone numbers have to begin with the country code and only numbers, spaces and dashes are allowed, e.g. &quot;+49 911-123456&quot;');
 			last;
 		}
 	}
@@ -1133,6 +1403,37 @@ sub verify_fields
 	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 : {};
@@ -1148,8 +1449,8 @@ sub get_contacts
 		{
 			for (@values)
 			{
-				$_ =~ s/\D//g;
-				$_ = '+' . $_;
+				$_ =~ s/[^0-9 \-]//g;
+				$_ = '+' . $_ if ($_);
 			}
 		}