projects
/
spider.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
17f0b57
)
fix syntax error
author
minima
<minima>
Thu, 13 Sep 2001 22:05:00 +0000
(22:05 +0000)
committer
minima
<minima>
Thu, 13 Sep 2001 22:05:00 +0000
(22:05 +0000)
perl/DXProt.pm
patch
|
blob
|
history
diff --git
a/perl/DXProt.pm
b/perl/DXProt.pm
index e986055692de4a2a00bca485b42a1d0c32b190bf..84ce989344c2efa35f4ec42879562d6e336b20ef 100644
(file)
--- a/
perl/DXProt.pm
+++ b/
perl/DXProt.pm
@@
-332,7
+332,7
@@
sub normal
# if we are converting announces to talk is it a dup?
if ($ann_to_talk) {
# if we are converting announces to talk is it a dup?
if ($ann_to_talk) {
- if (AnnTalk::is_talk_candidate($
$from, $field[3]) && AnnTalk::dup($
$from, $to, $field[3])) {
+ if (AnnTalk::is_talk_candidate($
from, $field[3]) && AnnTalk::dup(
$from, $to, $field[3])) {
dbg("DXPROT: Dupe talk from announce, dropped") if isdbg('chanerr');
return;
}
dbg("DXPROT: Dupe talk from announce, dropped") if isdbg('chanerr');
return;
}
@@
-343,7
+343,7
@@
sub normal
$dxchan = DXChannel->get($to) unless $dxchan;
if ($dxchan && $dxchan->is_user) {
$field[3] =~ s/\%5E/^/g;
$dxchan = DXChannel->get($to) unless $dxchan;
if ($dxchan && $dxchan->is_user) {
$field[3] =~ s/\%5E/^/g;
- $dxchan->talk($
$
from, $to, $via, $field[3]);
+ $dxchan->talk($from, $to, $via, $field[3]);
return;
}
return;
}
@@
-354,17
+354,17
@@
sub normal
if ($ref = Route::get($to)) {
$vref = Route::Node::get($via) if $via;
$vref = undef unless $vref && grep $to eq $_, $vref->users;
if ($ref = Route::get($to)) {
$vref = Route::Node::get($via) if $via;
$vref = undef unless $vref && grep $to eq $_, $vref->users;
- $ref->dxchan->talk($
$
from, $to, $vref ? $via : undef, $field[3], $field[6]);
+ $ref->dxchan->talk($from, $to, $vref ? $via : undef, $field[3], $field[6]);
return;
}
# not visible here, send a message of condolence
$vref = undef;
return;
}
# not visible here, send a message of condolence
$vref = undef;
- $ref = Route::get($
$
from);
+ $ref = Route::get($from);
$vref = $ref = Route::Node::get($field[6]) unless $ref;
if ($ref) {
$dxchan = $ref->dxchan;
$vref = $ref = Route::Node::get($field[6]) unless $ref;
if ($ref) {
$dxchan = $ref->dxchan;
- $dxchan->talk($main::mycall, $
$
from, $vref ? $vref->call : undef, $dxchan->msg('talknh', $to) );
+ $dxchan->talk($main::mycall, $from, $vref ? $vref->call : undef, $dxchan->msg('talknh', $to) );
}
return;
}
}
return;
}