1.1 --- a/l3-frontend	Tue Dec 16 00:18:23 2008 +0200
     1.2 +++ b/l3-frontend	Tue Jun 23 01:15:02 2009 +0300
     1.3 @@ -354,7 +354,12 @@
     1.4      $dir=$_[0];
     1.5      for $i (glob("$dir/*.png")) {
     1.6        $i =~ s@.*/(([0-9-]+)_([0-9]+).*)@$1@;
     1.7 -      $Uploads{$2}{$3}=$i;
     1.8 +      if (defined($Uploads{$2}{$3})) {
     1.9 +        $Uploads{$2}{$3} .= " ".$i;
    1.10 +      }
    1.11 +      else {
    1.12 +        $Uploads{$2}{$3}=$i;
    1.13 +      }
    1.14      }
    1.15  }
    1.16  
    1.17 @@ -633,7 +638,7 @@
    1.18  
    1.19          my $cl=$Command_Lines[$Command_Lines_Index[$current_command++]];
    1.20          next unless $cl;
    1.21 -        my $next_cl=$Command_Lines[$Command_Lines_Index[$current_command+1]];
    1.22 +        my $next_cl=$Command_Lines[$Command_Lines_Index[$current_command]];
    1.23  
    1.24          next if $current_command < $Config{"start_from_command"};
    1.25          last if $current_command > $Config{"start_from_command"} + $Config{"commands_to_show_at_a_go"};
    1.26 @@ -834,23 +839,28 @@
    1.27              if ( $Config{"show_diffs"} =~ /^y/i && $cl->{"diff"});
    1.28  # SHOT
    1.29  
    1.30 -        $this_day_result .= join(".", key(%Uploads));
    1.31 -        $this_day_result .= "PRIVET";
    1.32 +        #$this_day_result .= join(".", keys(%Uploads));
    1.33 +        #$this_day_result .= "PRIVET";
    1.34          for $t (sort { $a <=> $b } keys %{ $Uploads{$cl->{"local_session_id"}} }) {
    1.35 -        #    if ($t > $cl->{"time"} && $t < $next_cl->{"time"}) {
    1.36 -            $this_day_result .= "<IMG src='"
    1.37 -                .$Config{l3shot_path}
    1.38 -                .$Uploads{$cl->{"local_session_id"}}
    1.39 -                ."' alt ='screenshot id ".$cl->{"screenshot"}
    1.40 -                ."'/>"
    1.41 +            if (($t >= $cl->{"time"} and $t < $next_cl->{"time"}) or ($t >= $cl->{"time"} and not defined($next_cl))) {
    1.42 +                my @shots=split(/\s+/, $Uploads{$cl->{"local_session_id"}}{$t});
    1.43 +                for my $shot (@shots) {
    1.44 +                    $this_day_result .= "<IMG src='"
    1.45 +                        .$Config{l3shot_path}
    1.46 +                        .$shot
    1.47 +                        ."' alt ='screenshot id ".$shot
    1.48 +                        ."'/><br/>"
    1.49 +                }
    1.50 +            }
    1.51          }
    1.52  
    1.53 -        $this_day_result .= "<img src='"
    1.54 -                .$Config{l3shot_path}
    1.55 -                .$cl->{"screenshot"}
    1.56 -                ."' alt ='screenshot id ".$cl->{"screenshot"}
    1.57 -                ."'/>"
    1.58 -            if ( $Config{"show_screenshots"} =~ /^y/i && $cl->{"screenshot"});
    1.59 +# Временно заблокировано
    1.60 +#        $this_day_result .= "<img src='"
    1.61 +#                .$Config{l3shot_path}
    1.62 +#                .$cl->{"screenshot"}
    1.63 +#                ."' alt ='screenshot id ".$cl->{"screenshot"}
    1.64 +#                ."'/>"
    1.65 +#            if ( $Config{"show_screenshots"} =~ /^y/i && $cl->{"screenshot"});
    1.66  
    1.67  #NOTES
    1.68          if ( $Config{"show_notes"} =~ /^y/i && $cl->{"note"}) {