X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=licom.cgi;h=70398b26f0a9d7cfaab059ee4c6c28577a216b79;hb=HEAD;hp=190a9b6f7c0ed02d9e1345409d6c439c4aaf8521;hpb=e3e82a4771bf51037237e9aafa7cb4c89a9be964;p=licom.git

diff --git a/licom.cgi b/licom.cgi
index 190a9b6..70398b2 100755
--- a/licom.cgi
+++ b/licom.cgi
@@ -20,6 +20,7 @@ use strict;
 use warnings;
 use lib (qw(lib));
 
+use Encode (qw(encode decode is_utf8));
 use CGI (':cgi');
 use CGI::Carp (qw(fatalsToBrowser));
 use URI::Escape;
@@ -48,7 +49,7 @@ our %FieldNames =
 
 our $MySelf = $ENV{'SCRIPT_NAME'};
 
-our $Action = param ('action');
+our $Action = param_utf8 ('action');
 $Action ||= 'default';
 
 our %Actions =
@@ -63,16 +64,18 @@ our %Actions =
 	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 ();
 
 # make sure AuthLDAPRemoteUserIsDN is enabled.
 die unless ($ENV{'REMOTE_USER'});
-set_config ('base_dn', $ENV{'REMOTE_USER'});
+#set_config ('base_dn', $ENV{'REMOTE_USER'});
 
-die unless (defined (get_config ('uri'))
+die ("Configuration is incomplete") unless (defined (get_config ('uri'))
 	and defined (get_config ('base_dn'))
 	and defined (get_config ('bind_dn'))
 	and defined (get_config ('password')));
@@ -82,7 +85,7 @@ LiCoM::Connection->connect
 	uri	 => get_config ('uri'),
 	bind_dn  => get_config ('bind_dn'),
 	password => get_config ('password')
-) or die;
+) or die ("Unable to connect to LDAP directory server " . get_config ('uri'));
 
 our ($UserCN, $UserID) = LiCoM::Person->get_user ($ENV{'REMOTE_USER'});
 
@@ -93,12 +96,12 @@ if (!$UserID and $Action ne 'save')
 
 if (!$UserCN)
 {
-	die;
+	die ("No such user in the LDAP directory: " . $ENV{'REMOTE_USER'});
 }
 
 if (!defined ($Actions{$Action}))
 {
-	die;
+	die ("No such action: $Action");
 }
 
 if (ref ($Actions{$Action}) eq 'CODE')
@@ -121,7 +124,7 @@ exit (0);
 
 sub action_browse
 {
-	my $group = param ('group');
+	my $group = param_utf8 ('group');
 	$group = shift if (@_);
 	$group ||= '';
 
@@ -129,17 +132,17 @@ sub action_browse
 	{
 		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_utf8 ($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">),
@@ -159,26 +162,31 @@ EOF
 	}
 	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_utf8 ($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&quot;</h2>\n),
-		qq(\t\t<ul class="results">\n);
+		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_esc = uri_escape ($cn);
+			my $cn_uri  = uri_escape_utf8 ($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
 	}
@@ -186,21 +194,46 @@ EOF
 
 sub action_list
 {
-	my $group = param ('group');
-	$group = shift if (@_);
-	$group ||= '';
+	my $group_name = param_utf8 ('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 = 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 &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 = LiCoM::Person->search ();
+		@all = LiCoM::Person->search ([[group => $group_name]]);
 	}
 
 	print <<EOF;
@@ -219,26 +252,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_utf8 ($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_utf8 ($group_name);
 		print qq(\t\t<div class="menu">[<a href="$MySelf?action=browse&group=$group_esc">Back</a>]</div>\n);
 	}
 	else
@@ -249,12 +286,12 @@ EOF
 
 sub action_detail
 {
-	my $cn = param ('cn');
+	my $cn = param_utf8 ('cn');
 	$cn = shift if (@_);
 	die unless ($cn);
 
 	my $cn_html = encode_entities ($cn);
-	my $cn_uri  = uri_escape ($cn);
+	my $cn_uri  = uri_escape_utf8 ($cn);
 
 	my $person = LiCoM::Person->load ($cn);
 	if (!$person)
@@ -295,34 +332,7 @@ EOF
 
 		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",
@@ -340,7 +350,7 @@ EOF
 		{
 			my $group = $groups[$i];
 			my $group_name = $group->name ();
-			my $group_uri  = uri_escape ($group_name);
+			my $group_uri  = uri_escape_utf8 ($group_name);
 			my $group_html = encode_entities ($group_name);
 
 			print "\t\t\t<tr>\n" if ($i != 0);
@@ -364,7 +374,7 @@ EOF
 
 sub action_search
 {
-	my $search = param ('search');
+	my $search = param_utf8 ('search');
 
 	$search ||= '';
 	$search =~ s/[^\s\w]//g;
@@ -406,7 +416,7 @@ sub action_search
 	{
 		my $person = $_;
 		my $cn = $person->name ();
-		my $cn_uri  = uri_escape ($cn);
+		my $cn_uri  = uri_escape_utf8 ($cn);
 		my $cn_html = encode_entities ($cn);
 
 		print qq(\t\t<li><a href="$MySelf?action=detail&cn=$cn_uri">$cn_html</a></li>\n);
@@ -418,7 +428,7 @@ sub action_edit
 {
 	my %opts = @_;
 
-	my $cn = param ('cn');
+	my $cn = param_utf8 ('cn');
 
 	$cn = $opts{'cn'} if (defined ($opts{'cn'}));
 	$cn ||= '';
@@ -435,6 +445,9 @@ sub action_edit
 	my $lastname;
 	my $firstname;
 
+	my $lastname_html;
+	my $firstname_html;
+
 	my $contacts = {};
 	$contacts->{$_} = [] for (@MultiFields);
 
@@ -457,13 +470,16 @@ sub action_edit
 		}
 	}
 
-	$lastname    = param ('lastname')    if (param ('lastname')  and $UserID);
-	$firstname   = param ('firstname')   if (param ('firstname') and $UserID);
+	$lastname  = param_utf8 ('lastname')  if (param_utf8 ('lastname')  and $UserID);
+	$firstname = param_utf8 ('firstname') if (param_utf8 ('firstname') and $UserID);
 
 	get_contacts ($contacts);
 	
 	$lastname    =   $opts{'lastname'}     if (defined ($opts{'lastname'}));
 	$firstname   =   $opts{'firstname'}    if (defined ($opts{'firstname'}));
+	$lastname_html  = encode_entities ($lastname);
+	$firstname_html = encode_entities ($firstname);
+
 	for (@MultiFields)
 	{
 		my $field = $_;
@@ -480,7 +496,7 @@ sub action_edit
 	}
 
 	print <<EOF;
-		<form action="$MySelf" method="post">
+		<form action="$MySelf" method="post" accept-charset="UTF-8">
 		<input type="hidden" name="action" value="save" />
 		<input type="hidden" name="cn" value="$cn_html" />
 		<table class="edit">
@@ -489,11 +505,11 @@ sub action_edit
 EOF
 	if ($UserID)
 	{
-		print qq(\t\t\t\t<td><input type="text" name="lastname" value="$lastname" /></td>\n);
+		print qq(\t\t\t\t<td><input type="text" name="lastname" value="$lastname_html" /></td>\n);
 	}
 	else
 	{
-		print qq(\t\t\t\t<td>$lastname</td>\n);
+		print qq(\t\t\t\t<td>$lastname_html</td>\n);
 	}
 	print <<EOF;
 			</tr>
@@ -502,11 +518,11 @@ EOF
 EOF
 	if ($UserID)
 	{
-		print qq(\t\t\t\t<td><input type="text" name="firstname" value="$firstname" /></td>\n);
+		print qq(\t\t\t\t<td><input type="text" name="firstname" value="$firstname_html" /></td>\n);
 	}
 	else
 	{
-		print qq(\t\t\t\t<td>$firstname</td>\n);
+		print qq(\t\t\t\t<td>$firstname_html</td>\n);
 	}
 	
 	print "\t\t\t</tr>\n";
@@ -592,7 +608,7 @@ EOF
 
 sub action_save
 {
-	my $cn = $UserID ? param ('cn') : $UserCN;
+	my $cn = $UserID ? param_utf8 ('cn') : $UserCN;
 
 	if (verify_fields ())
 	{
@@ -608,7 +624,7 @@ sub action_save
 
 	die unless ($UserID);
 
-	my $button = lc (param ('button'));
+	my $button = lc (param_utf8 ('button'));
 	$button ||= 'save';
 
 	if ($button eq 'cancel')
@@ -617,15 +633,15 @@ sub action_save
 		return;
 	}
 
-	if (!param ('lastname') or !param ('firstname'))
+	if (!param_utf8 ('lastname') or !param_utf8 ('firstname'))
 	{
 		print qq(\t<div class="error">You have to give both, first and lastname, to identify this record.</div>\n);
 		action_edit (cn => '');
 		return;
 	}
 
-	my $lastname  = param ('lastname');
-	my $firstname = param ('firstname');
+	my $lastname  = param_utf8 ('lastname');
+	my $firstname = param_utf8 ('firstname');
 
 	my $contacts = get_contacts ();
 
@@ -639,7 +655,7 @@ sub action_save
 	
 	$cn = $person->name ();
 
-	for (param ('group'))
+	for (param_utf8 ('group'))
 	{
 		my $group_name = $_;
 		my $group = LiCoM::Group->load ($group_name);
@@ -655,10 +671,10 @@ sub action_save
 		}
 	}
 
-	if (param ('newgroup'))
+	if (param_utf8 ('newgroup'))
 	{
 		# FIXME add error handling
-		my $group_name = param ('newgroup');
+		my $group_name = param_utf8 ('newgroup');
 		LiCoM::Group->create ($group_name, '', $cn);
 	}
 
@@ -674,12 +690,12 @@ sub action_save
 
 sub action_update
 {
-	my $cn = $UserID ? param ('cn') : $UserCN;
-	my $person = LiCoM::Person->load ($cn);
+	my $cn = $UserID ? param_utf8 ('cn') : $UserCN;
 
-	die unless ($person);
+	my $person = LiCoM::Person->load ($cn);
+	die ("Unable to load CN `$cn'") unless ($person);
 
-	my $button = lc (param ('button'));
+	my $button = lc (param_utf8 ('button'));
 	$button ||= 'save';
 
 	if ($UserID and $button eq 'cancel')
@@ -690,17 +706,39 @@ sub action_update
 
 	if ($UserID)
 	{
-		my $lastname  = param ('lastname');
-		my $firstname = param ('firstname');
+		my $lastname  = param_utf8 ('lastname');
+		my $firstname = param_utf8 ('firstname');
+
+		my $old_cn = $person->name ();
+
+		print <<HTML;
+<div><code>
+	\$lastname = $lastname<br />
+	\$firstname = $firstname<br />
+	\$old_cn = $old_cn
+</code></div>
+HTML
 
 		$person->lastname  ($lastname)  if ($lastname  and $lastname  ne $person->lastname ());
 		$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.
+
+		# Change the cn's saved in the groups
+		if ($old_cn ne $cn)
+		{
+			my @groups = LiCoM::Group->load_by_member ($old_cn);
+			for (@groups)
+			{
+				# ->del_members automatically deleted the
+				# group, if no more members exist. So this
+				# order is important.
+				print "<div><code>\$cn = " . encode_entities ($cn) . "; "
+				. "\$old_cn = " . encode_entities ($old_cn) . ";</code></div>\n";
+				$_->add_members ($cn);
+				$_->del_members ($old_cn);
+			}
+		} # if ($old_cn ne $cn)
 	}
 
 	my $contacts = get_contacts ();
@@ -722,36 +760,49 @@ sub action_update
 		}
 	}
 
-	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_utf8 ('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_utf8 ('newgroup'))
+		{
+			# FIXME add error handling
+			my $group_name = param_utf8 ('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)
@@ -766,7 +817,7 @@ sub action_update
 
 sub action_vcard
 {
-	my $cn = param ('cn');
+	my $cn = param_utf8 ('cn');
 	$cn = shift if (@_);
 	die unless ($cn);
 
@@ -786,7 +837,7 @@ sub action_vcard
 
 	my $sn = $person->lastname ();
 	my $gn = $person->firstname ();
-	my $cn_esc = uri_escape ($cn);
+	my $cn_esc = uri_escape_utf8 ($cn);
 
 	print <<EOF;
 Content-Type: text/x-vcard
@@ -817,7 +868,7 @@ EOF
 
 sub action_verify
 {
-	my $cn = param ('cn');
+	my $cn = param_utf8 ('cn');
 	$cn = shift if (@_);
 	die unless ($cn);
 
@@ -869,7 +920,7 @@ sub action_verify_send_mail
 	my ($owner_mail) = $owner->get ('mail');
 	if (!$owner_mail)
 	{
-		my $cn_uri = uri_escape ($UserCN);
+		my $cn_uri = uri_escape_utf8 ($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);
 	}
@@ -932,13 +983,13 @@ EOM
 
 sub action_ask_del
 {
-	my $cn = param ('cn');
+	my $cn = param_utf8 ('cn');
 	$cn or die;
 
 	my $person = LiCoM::Person->load ($cn);
 	$person or die;
 
-	my $cn_uri  = uri_escape ($cn);
+	my $cn_uri  = uri_escape_utf8 ($cn);
 	my $cn_html = encode_entities ($cn);
 
 	print <<EOF;
@@ -959,7 +1010,7 @@ EOF
 
 sub action_do_del
 {
-	my $cn = param ('cn');
+	my $cn = param_utf8 ('cn');
 	$cn or die;
 
 	my $cn_html = encode_entities ($cn);
@@ -976,6 +1027,67 @@ EOF
 	action_browse ();
 }
 
+sub action_edit_group
+{
+	my $group_name = param_utf8 ('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" accept-charset="UTF-8">
+	  <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_utf8 ('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_utf8 ('description');
+	$group_obj->description ($desc);
+
+	action_browse ();
+	return;
+}
+
 sub html_start
 {
 	my $title = shift;
@@ -1102,6 +1214,7 @@ Content-Type: text/html; charset=UTF-8
 			table.list
 			{
 				width: 100%;
+				border: 2px solid #d0d0d0;
 			}
 
 			table.list td
@@ -1112,18 +1225,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
@@ -1197,20 +1315,20 @@ EOF
 
 	if ($UserID)
 	{
-		my $search = param ('search') || '';
+		my $search = param_utf8 ('search') || '';
 		$search = encode_entities ($search);
 		print <<EOF;
 		<div class="topmenu">
-			<form action="$MySelf" method="post">
+			<form action="$MySelf" method="post" accept-charset="UTF-8">
 				<input type="hidden" name="action" value="browse" />
 				<input type="submit" name="button" value="Browse" />
 			</form>
-			<form action="$MySelf" method="post">
+			<form action="$MySelf" method="post" accept-charset="UTF-8">
 				<input type="hidden" name="action" value="search" />
 				<input type="text" name="search" value="$search" />
 				<input type="submit" name="button" value="Search" />
 			</form>
-			<form action="$MySelf" method="post">
+			<form action="$MySelf" method="post" accept-charset="UTF-8">
 				<input type="hidden" name="action" value="edit" />
 				<input type="hidden" name="dn" value="" />
 				<input type="submit" name="button" value="Add New" />
@@ -1277,7 +1395,7 @@ sub pwgen
 sub verify_fields
 {
 	my @errors = ();
-	for (param ('uri'))
+	for (param_utf8 ('uri'))
 	{
 		my $val = $_;
 		next unless ($val);
@@ -1289,7 +1407,7 @@ sub verify_fields
 		}
 	}
 
-	for (param ('homephone'), param ('cellphone'), param ('officephone'), param ('fax'))
+	for (param_utf8 ('homephone'), param_utf8 ('cellphone'), param_utf8 ('officephone'), param_utf8 ('fax'))
 	{
 		my $number = $_;
 		next unless ($number);
@@ -1314,6 +1432,37 @@ sub verify_fields
 	return (scalar (@errors));
 }
 
+sub markup_field
+{
+	my $field = shift;
+	my $value = shift;
+
+	my $value_uri  = uri_escape_utf8 ($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_utf8 ($2);
+		}
+		else
+		{
+			$value_uri = 'http://' . uri_escape_utf8 ($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 : {};
@@ -1321,7 +1470,7 @@ sub get_contacts
 	for (@MultiFields)
 	{
 		my $field = $_;
-		my @values = grep { $_ } (param ($field));
+		my @values = grep { $_ } (param_utf8 ($field));
 
 		next unless (@values);
 
@@ -1339,3 +1488,35 @@ sub get_contacts
 
 	return ($contacts);
 }
+
+sub is_valid_utf8
+{
+	my $str = join ('', @_);
+
+	# Taken from here: <http://www.w3.org/International/questions/qa-forms-utf-8>
+	return ($str =~ m/^(
+     [\x09\x0A\x0D\x20-\x7E]            # ASCII
+   | [\xC2-\xDF][\x80-\xBF]             # non-overlong 2-byte
+   |  \xE0[\xA0-\xBF][\x80-\xBF]        # excluding overlongs
+   | [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}  # straight 3-byte
+   |  \xED[\x80-\x9F][\x80-\xBF]        # excluding surrogates
+   |  \xF0[\x90-\xBF][\x80-\xBF]{2}     # planes 1-3
+   | [\xF1-\xF3][\x80-\xBF]{3}          # planes 4-15
+   |  \xF4[\x80-\x8F][\x80-\xBF]{2}     # plane 16
+  )*$/x);
+}
+
+sub param_utf8
+{
+	my @args = @_;
+	my @ret = ();
+
+	@ret = grep { is_valid_utf8 ($_) } (param (@args));
+	$_ = decode ('UTF-8', $_) for (@ret);
+	return (wantarray () ? @ret : $ret[0]);
+}
+
+sub uri_escape_utf8
+{
+	return (uri_escape (encode ('UTF-8', shift)));
+}