Jelajahi Sumber

Check if a userpic link begins with http:// -- if so, dont prepend image directory to URL

sbingner 23 tahun lalu
induk
melakukan
08095a1fe3
2 mengubah file dengan 22 tambahan dan 4 penghapusan
  1. 2 0
      docs/Changelog
  2. 20 4
      modules/Pisg/HTMLGenerator.pm

+ 2 - 0
docs/Changelog

@@ -4,6 +4,8 @@ pisg (x.xx)
    * mirc2egg script updated.
    * The random line in "Most Active Nicks" now wraps words that are longer
      than 40 characters. (thanks, glen)
+   * Check if a userpic link begins with http:// -- if so, dont prepend image
+     directory to URL
 
 pisg (0.43) - Fri Nov, 22th 2002
    * Add "ShowOnlyTop" option which can be used if you only want to have stats

+ 20 - 4
modules/Pisg/HTMLGenerator.pm

@@ -504,19 +504,35 @@ sub _activenicks
         if ($self->{users}->{userpics}{$nick} && $self->{cfg}->{userpics} !~ /n/i) {
             _html("<td style=\"background-color: $color\" align=\"center\">");
             if (defined $self->{users}->{biguserpics}{$nick}) {
-                _html("<a href=\"$self->{cfg}->{imagepath}$self->{users}->{biguserpics}{$nick}\">");
+                if ($self->{users}->{biguserpics}{$nick} =~ /^http:\/\//i) {
+                    _html("<a href=\"$self->{users}->{biguserpics}{$nick}\">");
+                } else {
+                    _html("<a href=\"$self->{cfg}->{imagepath}$self->{users}->{biguserpics}{$nick}\">");
+                }
             }
             if ($width ne '') {
-                _html("<img valign=\"middle\" src=\"$self->{cfg}->{imagepath}$self->{users}->{userpics}{$nick}\" width=\"$width\" height=\"$height\" alt=\"$nick\" />");
+                if ($self->{users}->{userpics}{$nick} =~ /^http:\/\//i) {
+                    _html("<img valign=\"middle\" src=\"$self->{users}->{userpics}{$nick}\" width=\"$width\" height=\"$height\" alt=\"$nick\" />");
+                } else {
+                    _html("<img valign=\"middle\" src=\"$self->{cfg}->{imagepath}$self->{users}->{userpics}{$nick}\" width=\"$width\" height=\"$height\" alt=\"$nick\" />");
+                }
             } else {
-                _html("<img valign=\"middle\" src=\"$self->{cfg}->{imagepath}$self->{users}->{userpics}{$nick}\" alt=\"$nick\" />");
+                if ($self->{users}->{userpics}{$nick} =~ /^http:\/\//i) {
+                    _html("<img valign=\"middle\" src=\"$self->{users}->{userpics}{$nick}\" alt=\"$nick\" />");
+                } else {
+                    _html("<img valign=\"middle\" src=\"$self->{cfg}->{imagepath}$self->{users}->{userpics}{$nick}\" alt=\"$nick\" />");
+                }
             }
             if (defined $self->{users}->{biguserpics}{$nick}) {
                 _html("</a>");
             }
             _html("</td>");
         } elsif ($self->{cfg}->{defaultpic} ne '' && $self->{cfg}->{userpics} !~ /n/i)  {
-            _html("<td style=\"background-color: $color\" align=\"center\"><img valign=\"middle\" src=\"$self->{cfg}->{imagepath}$self->{cfg}->{defaultpic}\" alt=\"\" /></td>");
+             if ($self->{cfg}->{defaultpic} =~ /^http:\/\//i) {
+                _html("<td style=\"background-color: $color\" align=\"center\"><img valign=\"middle\" src=\"$self->{cfg}->{defaultpic}\" alt=\"\" /></td>");
+             } else {
+                _html("<td style=\"background-color: $color\" align=\"center\"><img valign=\"middle\" src=\"$self->{cfg}->{imagepath}$self->{cfg}->{defaultpic}\" alt=\"\" /></td>");
+             }
         }
 
         _html("</tr>");