urlchannel

git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk@1898 c11ca15a-4712-0410-83d8-924469b57eb5

diff --git a/files/infobot.help b/files/infobot.help
index 14b16974196527e6b121906c42762e8d9b36006f..cace7d15f3d3437dd0f86f9380ee1cb6e5c8f337 100644 (file)
--- a/files/infobot.help
+++ b/files/infobot.help
@@ -156,6 +156,7 @@ dollar variables: $randnick    - random nick
 dollar variables: $startTime   - start time
 dollar variables: $time        - current time (GMT)
 dollar variables: $uptime      - ...
 dollar variables: $startTime   - start time
 dollar variables: $time        - current time (GMT)
 dollar variables: $uptime      - ...

+dollar variables: $urlchannel  - html encoded channel from which the factoid was requested

 dollar variables: $user        - username of factoid requester
 dollar variables: $who         - nick of factoid requester
 
 dollar variables: $user        - username of factoid requester
 dollar variables: $who         - nick of factoid requester
 

diff --git a/src/Factoids/Reply.pl b/src/Factoids/Reply.pl
index 89faac20de8f0600bf0eba97af5d636d3e2af0fa..b892a5ee0bb0b37632a238e1a4003a9041c4b0c2 100644 (file)
--- a/src/Factoids/Reply.pl
+++ b/src/Factoids/Reply.pl
@@ -314,6 +314,11 @@ sub substVars {
         $reply =~ s/\$host(name)?/$hostname/g;
     }
     $reply =~ s/\$chan(nel)?/$talkchannel/g;
         $reply =~ s/\$host(name)?/$hostname/g;
     }
     $reply =~ s/\$chan(nel)?/$talkchannel/g;

+    if ( $reply =~ /\$urlchannel/ ) {
+       my $urlchannel = $talkchannel;
+        $urlchannel =~ s/([^\w])/sprintf("%%%02x",ord($1))/gie;
+       $reply =~ s/\$urlchannel?/$urlchannel/g;
+    }

     if ( $msgType =~ /public/ ) {
         $reply =~ s/\$lastspeaker/$lastWho{$talkchannel}/g;
     }
     if ( $msgType =~ /public/ ) {
         $reply =~ s/\$lastspeaker/$lastWho{$talkchannel}/g;
     }