LiCoM::Group: Encode all strings as UTF-8 when sending to the LDAP-server.

[licom.git] / licom.cgi

diff --git a/licom.cgi b/licom.cgi
index 68e3581..cd02690 100755 (executable)
--- a/licom.cgi
+++ b/licom.cgi
@@ -193,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 "$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 &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;
@@ -226,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 />', 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
@@ -302,34 +331,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",
@@ -1183,6 +1185,7 @@ Content-Type: text/html; charset=UTF-8
                        table.list
                        {
                                width: 100%;
+                               border: 2px solid #d0d0d0;
                        }
 
                        table.list td
@@ -1193,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
@@ -1395,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 : {};