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

New option 'userpics="n"' for people explicitly not wanting userpics on a
page

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

+ 1 - 0
modules/Pisg.pm

@@ -119,6 +119,7 @@ sub get_default_config_settings
         langfile => 'lang.txt',
         langfile => 'lang.txt',
         prefix => '',
         prefix => '',
         silent => 0,
         silent => 0,
+        userpics => 'y',
 
 
         # Colors / Layout
         # Colors / Layout
 
 

+ 4 - 8
modules/Pisg/HTMLGenerator.pm

@@ -365,19 +365,15 @@ 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>" : "")
     );
     );
 
 
-
-
     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} };
 
 
-    if ($self->{cfg}->{activenicks} > $nicks) {
-        $self->{cfg}->{activenicks} = $nicks;
-    }
+    if ($self->{cfg}->{activenicks} > $nicks) { $self->{cfg}->{activenicks} = $nicks; }
 
 
     my $have_userpics;
     my $have_userpics;
     for (my $c = 0; $c < $self->{cfg}->{activenicks}; $c++) {
     for (my $c = 0; $c < $self->{cfg}->{activenicks}; $c++) {
         my $nick = $active[$c];
         my $nick = $active[$c];
-        if ($self->{users}->{userpics}{$nick}) {
+        if ($self->{users}->{userpics}{$nick} && $self->{cfg}->{userpics} !~ /n/i) {
             $have_userpics = 1;
             $have_userpics = 1;
             _html("<td bgcolor=\"$self->{cfg}->{tdtop}\"><b>" . $self->_template_text('userpic') ."</b></td>");
             _html("<td bgcolor=\"$self->{cfg}->{tdtop}\"><b>" . $self->_template_text('userpic') ."</b></td>");
             last;
             last;
@@ -457,13 +453,13 @@ sub _activenicks
 
 
         my $height = $self->{cfg}->{pic_height};
         my $height = $self->{cfg}->{pic_height};
         my $width = $self->{cfg}->{pic_width};
         my $width = $self->{cfg}->{pic_width};
-        if ($self->{users}->{userpics}{$nick}) {
+        if ($self->{users}->{userpics}{$nick} && $self->{cfg}->{userpics} !~ /n/i) {
             if ($width ne '') {
             if ($width ne '') {
                 _html("<td bgcolor=\"#$col_r$col_g$col_b\" align=\"center\"><img valign=\"middle\" src=\"$self->{cfg}->{imagepath}$self->{users}->{userpics}{$nick}\" width=\"$width\" height=\"$height\"></td>");
                 _html("<td bgcolor=\"#$col_r$col_g$col_b\" align=\"center\"><img valign=\"middle\" src=\"$self->{cfg}->{imagepath}$self->{users}->{userpics}{$nick}\" width=\"$width\" height=\"$height\"></td>");
             } else {
             } else {
                 _html("<td bgcolor=\"#$col_r$col_g$col_b\" align=\"center\"><img valign=\"middle\" src=\"$self->{cfg}->{imagepath}$self->{users}->{userpics}{$nick}\"></td>");
                 _html("<td bgcolor=\"#$col_r$col_g$col_b\" align=\"center\"><img valign=\"middle\" src=\"$self->{cfg}->{imagepath}$self->{users}->{userpics}{$nick}\"></td>");
             }
             }
-        } elsif ($self->{cfg}->{default_pic} ne '')  {
+        } elsif ($self->{cfg}->{default_pic} ne '' && $self->{cfg}->{userpics} !~ /n/i)  {
             _html("<td bgcolor=\"#$col_r$col_g$col_b\" align=\"center\"><img valign=\"middle\" src=\"$self->{cfg}->{imagepath}$self->{cfg}->{default_pic}\"></td>");
             _html("<td bgcolor=\"#$col_r$col_g$col_b\" align=\"center\"><img valign=\"middle\" src=\"$self->{cfg}->{imagepath}$self->{cfg}->{default_pic}\"></td>");
         }
         }