Christoph Berg 21 лет назад
Родитель
Сommit
2610b70b15
3 измененных файлов с 21 добавлено и 13 удалено
  1. 1 1
      docs/CREDITS
  2. 7 9
      docs/Changelog
  3. 13 3
      scripts/addalias/addalias.pl

+ 1 - 1
docs/CREDITS

@@ -111,7 +111,7 @@ Other contributors:
    | pisg(1) manpage
    | pisg(1) manpage
  * Torbjörn Svensson <azoff@se.linux.org>
  * Torbjörn Svensson <azoff@se.linux.org>
    | ShowFoulDecimals and AltColorScheme options, multiple channels with same
    | ShowFoulDecimals and AltColorScheme options, multiple channels with same
-   | name
+   | name, lots of other fixes
  * coaster
  * coaster
    | improved mirc6hack.mrc
    | improved mirc6hack.mrc
  * Vianney Lecroart <acemtp@free.fr>
  * Vianney Lecroart <acemtp@free.fr>

+ 7 - 9
docs/Changelog

@@ -1,18 +1,16 @@
 pisg (0.67) - ??
 pisg (0.67) - ??
    Christoph:
    Christoph:
-   * Features:
      + Recognize ogg and wma suffixes in song stats, complain about invalid
      + Recognize ogg and wma suffixes in song stats, complain about invalid
        ChartsRegexp.
        ChartsRegexp.
+     + Documentation: Local options override global ones, not vice-versa.
+     + Notes on using mIRC.
+   Torbjörn Svensson:
      + Added support for multiple channels in config with the same name.
      + Added support for multiple channels in config with the same name.
        Even multiple channel directives for the very same channel are
        Even multiple channel directives for the very same channel are
-       supported (closes SF tracker #967404, patch by Torbjörn Svensson).
-   * Fixes:
-     + chomp PageHead and PageFoot files (thanks, Torbjörn).
-   * Documentation:
-     + Local options override global ones, not vice-versa.
-   * Formats:
-     + Notes on using mIRC.
-     + support the new Trillian format (thanks, Torbjörn).
+       supported (closes SF tracker #967404).
+     + Support 'bot' in addalias.pl.
+     + Support the new Trillian format.
+     + Chomp PageHead and PageFoot files.
    * Languages:
    * Languages:
      + Dutch: small update to shout1 (thanks, Søren Jensen).
      + Dutch: small update to shout1 (thanks, Søren Jensen).
      + Dutch/Flemish: new strings added (thanks, Jeroen van Nimwegen).
      + Dutch/Flemish: new strings added (thanks, Jeroen van Nimwegen).

+ 13 - 3
scripts/addalias/addalias.pl

@@ -51,6 +51,7 @@ my $txtpic      = "Userpic";
 my $txtsex      = "Sex";
 my $txtsex      = "Sex";
 my $txtmale     = "M";
 my $txtmale     = "M";
 my $txtfemale   = "F";
 my $txtfemale   = "F";
+my $txtbot      = "B";
 my $txtignore   = "Ignore me";
 my $txtignore   = "Ignore me";
 my $btnsubmit   = "Submit";
 my $btnsubmit   = "Submit";
 my $btnupdate   = "Update";
 my $btnupdate   = "Update";
@@ -68,7 +69,7 @@ my $nickhelp    = "Enter the name you want to use in the stats here.";
 my $aliashelp   = "Add all aliases you use here, seperated by spaces, so they will be joined in the stats. A * is allowed as a wildcard. For example: MyNick[Zzz], MyNick-afk and MyNick-work could be entered as 'MyNick[Zzz] MyNick-*' or just as 'MyNick*'";
 my $aliashelp   = "Add all aliases you use here, seperated by spaces, so they will be joined in the stats. A * is allowed as a wildcard. For example: MyNick[Zzz], MyNick-afk and MyNick-work could be entered as 'MyNick[Zzz] MyNick-*' or just as 'MyNick*'";
 my $urlhelp     = "You can enter a webpage or e-mail adress here to be linked to your nick in the stats.";
 my $urlhelp     = "You can enter a webpage or e-mail adress here to be linked to your nick in the stats.";
 my $pichelp     = "If you enter a link to a picture here it will be added to your stats on the page.";
 my $pichelp     = "If you enter a link to a picture here it will be added to your stats on the page.";
-my $sexhelp     = "This setting is used to determine if lines in the stats should read 'his' or 'her' when referring to you.";
+my $sexhelp     = "This setting is used to determine if lines in the stats should read 'his' or 'her' or 'bot' when referring to you.";
 my $ignorehelp  = "If you don't want to be included in the stats, select this option.";
 my $ignorehelp  = "If you don't want to be included in the stats, select this option.";
 
 
 
 
@@ -84,7 +85,7 @@ $path =~ s!^/!!;
 my (%oldnicks, @users, @nick);
 my (%oldnicks, @users, @nick);
 my ($frm_nick, $frm_alias, $frm_link, $frm_pic, $frm_sex, $frm_ignore);
 my ($frm_nick, $frm_alias, $frm_link, $frm_pic, $frm_sex, $frm_ignore);
 my ($old_nick, $old_alias, $old_link, $old_pic, $old_sex, $old_ignore);
 my ($old_nick, $old_alias, $old_link, $old_pic, $old_sex, $old_ignore);
-my ($old_sexm, $old_sexf, $old_ignr);
+my ($old_sexm, $old_sexf, $old_sexb, $old_ignr);
 my ($cfg, $fnd);
 my ($cfg, $fnd);
 my ($submitbtn, $frmaction);
 my ($submitbtn, $frmaction);
 
 
@@ -208,7 +209,7 @@ print <<HTML
     </tr>
     </tr>
     <tr>
     <tr>
      <td><b>$txtsex</b></td>
      <td><b>$txtsex</b></td>
-     <td>$txtmale<input type="radio" name="sex" value="m" $old_sexm>$txtfemale<input type="radio" name="sex" value="f" $old_sexf></td>
+     <td>$txtmale<input type="radio" name="sex" value="m" $old_sexm>$txtfemale<input type="radio" name="sex" value="f" $old_sexf>$txtbot<input type="radio" name="sex" value="b" $old_sexb></td>
     </tr>
     </tr>
     <tr>
     <tr>
      <td><b>$txtignore</B></td>
      <td><b>$txtignore</B></td>
@@ -373,6 +374,9 @@ sub check_if_found
         elsif ($old_sex eq "f" or $old_sex eq "F"){
         elsif ($old_sex eq "f" or $old_sex eq "F"){
             $old_sexf = "checked";
             $old_sexf = "checked";
         }
         }
+        elsif ($old_sex eq "b" or $old_sex eq "B"){
+            $old_sexb = "checked";
+        }
         if ($old_ignore eq "1"){
         if ($old_ignore eq "1"){
             $old_ignr = "checked";
             $old_ignr = "checked";
         }
         }
@@ -420,6 +424,9 @@ sub addinfo
     elsif ($old_sex eq "f" or $old_sex eq "F"){
     elsif ($old_sex eq "f" or $old_sex eq "F"){
         $old_sexf = "checked";
         $old_sexf = "checked";
     }
     }
+    elsif ($old_sex eq "b" or $old_sex eq "B"){
+        $old_sexb = "checked";
+    }
     if ($old_ignore eq "1"){
     if ($old_ignore eq "1"){
         $old_ignr = "checked";
         $old_ignr = "checked";
     }
     }
@@ -478,6 +485,9 @@ sub updateinfo
     elsif ($old_sex eq "f" or $old_sex eq "F"){
     elsif ($old_sex eq "f" or $old_sex eq "F"){
         $old_sexf = "checked";
         $old_sexf = "checked";
     }
     }
+    elsif ($old_sex eq "b" or $old_sex eq "B"){
+        $old_sexb = "checked";
+    }
     if ($old_ignore eq "1"){
     if ($old_ignore eq "1"){
         $old_ignr = "checked";
         $old_ignr = "checked";
     }
     }