Merge branch 'master' of git+ssh://github.com/adefaria/clearscm

diff --combined maps/bin/display.cgi
index 02379e6,1dbbd1b..14c2553
--- 1/maps/bin/display.cgi
--- 2/maps/bin/display.cgi
+++ b/maps/bin/display.cgi
@@@ -32,12 -32,7 +32,12 @@@ use MIME::Words qw(:all)
  
  my $userid      = cookie('MAPSUser');
  my $sender      = param('sender');
- my $msg_nbr     = param('msg_nbr');
 +
 +# CGI will replace '+' with ' ', which many mailers are starting to do,
 +# so add it back
 +$sender =~ s/ /\+/;
 +
+ my $msg_date    = param('msg_date');
  my $table_name  = 'message';
  
  sub ParseEmail(@) {
@@@ -70,22 -65,16 +70,16 @@@
  } # ParseEmail
  
  sub Body($) {
-   my ($count) = @_;
+   my ($date) = @_;
  
-   $count ||= 1;
+   # Find unique message using $date
+   my $handle = FindEmail $sender, $date;
  
-   my $handle = FindEmail $sender;
- 
-   my ($userid, $sender, $subject, $timestamp, $message);
- 
-   # Need to handle multiple messages
-   for (my $i = 0; $i < $count; $i++) {
-     ($userid, $sender, $subject, $timestamp, $message) = GetEmail $handle;
-   } # for
+   my ($userid, $sender, $subject, $timestamp, $message) = GetEmail $handle;
  
    my $parser = MIME::Parser->new();
  
-   $parser->output_to_core (1);
+   $parser->output_to_core(1);
  
    my $entity = $parser->parse_data ($message);
  
@@@ -112,10 -101,10 +106,10 @@@
                          -bgcolor      => "#ece9d8",
                          -width        => "100%"}) . "\n";
  
-     foreach (keys (%header)) {
+     for (keys (%header)) {
        next if /base64/;
  
-       my $str = decode_mimewords ($header{$_});
+       my $str = decode_mimewords($header{$_});
  
        print Tr ([
          th ({-align    => "right",
@@@ -123,7 -112,7 +117,7 @@@
               -width    => "8%"}, "$_:") . "\n" .
          td ({-bgcolor  => "white"}, $str)
        ]);
-     } # if
+     } # for
  
      print end_table;
      print "</td></tr>";
@@@ -179,7 -168,7 +173,7 @@@
          } # for
        } elsif ($part->mime_type eq 'multipart/related') {
          # Sometimes parts are 'multipart/relative'...
-       $part->print_body;
+         $part->print_body;
        } else {
          if ($part->mime_type =~ /text/) {
            my $encoding = '';
@@@ -218,6 -207,6 +212,6 @@@ $userid = Heading
  SetContext($userid);
  NavigationBar($userid);
  
- Body($msg_nbr);
+ Body($msg_date);
  
  Footing($table_name);