Christoph Berg 20 лет назад
Родитель
Сommit
30bf8dde57
2 измененных файлов с 10 добавлено и 9 удалено
  1. 2 1
      docs/Changelog
  2. 8 8
      modules/Pisg.pm

+ 2 - 1
docs/Changelog

@@ -2,11 +2,12 @@ pisg (0.68) - ??
    Christoph:
      + ColorScheme 'none' will generate the color gradient again, the gradient
        is dropped with HiCell="".
+     + Fix <user> parsing.
      + More smileys (SF #1264834).
      + Fix English preposition (thanks, Barry Suridge).
      + Add pointer to "compatibility" theme for XChat to FORMATS.
-     + Add warning on silent option to eggdrop-pisg.tcl.
      + Strip nick modes in xchat format (SF #1304262).
+     + Add warning on silent option to eggdrop-pisg.tcl.
    Torbjörn:
      + Generate stats in multiple languages in a single run.
    Language Updates:

+ 8 - 8
modules/Pisg.pm

@@ -279,7 +279,7 @@ sub init_config
         if ($line =~ /<user.*>/) {
             my $nick;
 
-            if ($line =~ /nick=(["'])(.+?)\1/) {
+            if ($line =~ /\bnick=(["'])(.+?)\1/) {
                 $nick = $2;
                 add_alias($nick, $nick);
             } else {
@@ -287,7 +287,7 @@ sub init_config
                 next;
             }
 
-            if ($line =~ /alias=(["'])(.+?)\1/) {
+            if ($line =~ /\balias=(["'])(.+?)\1/) {
                 my @thisalias = split(/\s+/, lc($2));
                 foreach (@thisalias) {
                     if ($self->{cfg}->{regexpaliases} and /[\|\[\]\{\}\(\)\?\+\.\*\^\\]/) {
@@ -302,28 +302,28 @@ sub init_config
                 }
             }
 
-            if ($line =~ /pic=(["'])(.+?)\1/) {
+            if ($line =~ /\bpic=(["'])(.+?)\1/) {
                 $self->{users}->{userpics}{$nick} = $2;
             }
 
-            if ($line =~ /bigpic=(["'])(.+?)\1/) {
+            if ($line =~ /\bbigpic=(["'])(.+?)\1/) {
                 $self->{users}->{biguserpics}{$nick} = $2;
             }
 
-            if ($line =~ /link=(["'])(.+?)\1/) {
+            if ($line =~ /\blink=(["'])(.+?)\1/) {
                 $self->{users}->{userlinks}{$nick} = $2;
             }
 
-            if ($line =~ /ignore=(["'])Y\1/i) {
+            if ($line =~ /\bignore=(["'])Y\1/i) {
                 add_ignore($nick);
             }
 
-            if ($line =~ /sex=(["'])([MmFfBb])\1/) {
+            if ($line =~ /\bsex=(["'])([MmFfBb])\1/) {
                 $self->{users}->{sex}{$nick} = lc($2);
             }
         } elsif ($line =~ /<link(.*)>/) {
 
-            if ($line =~ /url=(["'])(.+?)\1/) {
+            if ($line =~ /\burl=(["'])(.+?)\1/) {
                 my $url = $2;
                 if ($line =~ /ignore="Y"/i) {
                     add_url_ignore($url);