Просмотр исходного кода

When using multiple channels, and not all channels have user pics, it was
showing a big empty coloumn with no userpics. Now it checks whether any
users in top xx has a userpic, and if yes, add the coloumn.

Morten Brix Pedersen 25 лет назад
Родитель
Сommit
d185873439
1 измененных файлов с 11 добавлено и 4 удалено
  1. 11 4
      modules/Pisg/HTMLGenerator.pm

+ 11 - 4
modules/Pisg/HTMLGenerator.pm

@@ -365,11 +365,7 @@ sub _activenicks
     . ($self->{cfg}->{show_randquote} ? "<td bgcolor=\"$self->{cfg}->{tdtop}\"><b>".$self->_template_text('randquote')."</b></td>" : "")
     . ($self->{cfg}->{show_randquote} ? "<td bgcolor=\"$self->{cfg}->{tdtop}\"><b>".$self->_template_text('randquote')."</b></td>" : "")
     );
     );
 
 
-    if (scalar keys %{$self->{users}->{userpics}} > 0 or $self->{cfg}->{default_pic} ne '') {
-        _html("<td bgcolor=\"$self->{cfg}->{tdtop}\"><b>" . $self->_template_text('userpic') ."</b></td>");
-    }
 
 
-    _html("</tr>");
 
 
     my @active = sort { $self->{stats}->{lines}{$b} <=> $self->{stats}->{lines}{$a} } keys %{ $self->{stats}->{lines} };
     my @active = sort { $self->{stats}->{lines}{$b} <=> $self->{stats}->{lines}{$a} } keys %{ $self->{stats}->{lines} };
     my $nicks = scalar keys %{ $self->{stats}->{lines} };
     my $nicks = scalar keys %{ $self->{stats}->{lines} };
@@ -378,6 +374,17 @@ sub _activenicks
         $self->{cfg}->{activenicks} = $nicks;
         $self->{cfg}->{activenicks} = $nicks;
     }
     }
 
 
+    my $have_userpics;
+    for (my $c = 0; $c < $self->{cfg}->{activenicks}; $c++) {
+        my $nick = $active[$c];
+        if ($self->{users}->{userpics}{$nick}) {
+            $have_userpics = 1;
+            _html("<td bgcolor=\"$self->{cfg}->{tdtop}\"><b>" . $self->_template_text('userpic') ."</b></td>");
+            last;
+        }
+    }
+    _html("</tr>");
+
     my ($nick, $visiblenick, $randomline, %hash);
     my ($nick, $visiblenick, $randomline, %hash);
     my $i = 1;
     my $i = 1;
     for (my $c = 0; $c < $self->{cfg}->{activenicks}; $c++) {
     for (my $c = 0; $c < $self->{cfg}->{activenicks}; $c++) {