summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
3ab6148)
git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@347
c11ca15a-4712-0410-83d8-
924469b57eb5
$2 =~ /^($mask{chan})(,(\S+))?/;
my($thischan, $key) = (lc $1, $3);
$2 =~ /^($mask{chan})(,(\S+))?/;
my($thischan, $key) = (lc $1, $3);
- my $chankey = $thischan;
+ my $chankey = lc $thischan;
$chankey .= " $key" if (defined $key);
if ($thischan eq "") {
$chankey .= " $key" if (defined $key);
if ($thischan eq "") {
- # Thanks to Eden Li (tile) for the channel key patch
- my @chans = split(/[\s\t]+/, $param{'join_channels'});
- if (!grep /^$thischan$/i, @chans) {
- if (&IsFlag("o") ne "o") {
+ if (&IsFlag("o") ne "o") {
+ if (!exists $chanconf{$thischan}) {
&msg($who, "I am not allowed to join $thischan.");
return;
}
&msg($who, "I am not allowed to join $thischan.");
return;
}
- if (&validChan($thischan) and &IsFlag("o") ne "o") {
- &msg($who,"I'm already on $thischan...");
- return;
+ if (&validChan($thischan)) {
+ &msg($who,"I'm already on $thischan...");
+ return;
+ }
}
$joinverb{$thischan} = $who; # used for on_join self.
}
$joinverb{$thischan} = $who; # used for on_join self.