X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=licom.cgi;h=78270c8c2017e23b6f4d9f3c9fa7d5d40ed12023;hb=80c5c31d977378c6430408d696fac14560d838ed;hp=190a9b6f7c0ed02d9e1345409d6c439c4aaf8521;hpb=e3e82a4771bf51037237e9aafa7cb4c89a9be964;p=licom.git

diff --git a/licom.cgi b/licom.cgi
index 190a9b6..78270c8 100755
--- a/licom.cgi
+++ b/licom.cgi
@@ -63,7 +63,9 @@ 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 ();
@@ -98,7 +100,7 @@ if (!$UserCN)
 
 if (!defined ($Actions{$Action}))
 {
-	die;
+	die ("No such action: $Action");
 }
 
 if (ref ($Actions{$Action}) eq 'CODE')
@@ -129,17 +131,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 ($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 +161,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 ($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 ($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 +193,46 @@ 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 &quot;$group&quot;" : 'List of all addresses';
+	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,11 +251,15 @@ 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)
 		{
@@ -236,9 +272,9 @@ EOF
 	}
 	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
@@ -722,36 +758,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 ('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)
@@ -976,6 +1025,67 @@ 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;