Changeset 3ce5bdc for perl/modules/jabber.pl
- Timestamp:
- Jan 24, 2007, 4:12:25 PM (18 years ago)
- Branches:
- master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9
- Children:
- 63bbef4
- Parents:
- 99c7549
- git-author:
- Nelson Elhage <nelhage@mit.edu> (01/24/07 16:12:20)
- git-committer:
- Nelson Elhage <nelhage@mit.edu> (01/24/07 16:12:25)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
perl/modules/jabber.pl
r4d17916 r3ce5bdc 400 400 my $jid = new Net::XMPP::JID; 401 401 $jid->SetJID(shift); 402 my $password = undef;402 my $password = ''; 403 403 $password = shift if @_; 404 404 … … 422 422 423 423 $vars{jlogin_jid} = $jidStr; 424 $vars{jlogin_password} = $password;425 424 $vars{jlogin_connhash} = { 426 425 hostname => $server, … … 560 559 my $jwrite_thread = ""; 561 560 my $jwrite_subject = ""; 562 my $to;561 my ($to, $from); 563 562 my $jwrite_type = "chat"; 564 563 … … 570 569 'thread=s' => \$jwrite_thread, 571 570 'subject=s' => \$jwrite_subject, 572 'account=s' => \$ jwrite_from,571 'account=s' => \$from, 573 572 'id=s' => \$jwrite_sid, 574 573 ); … … 584 583 } 585 584 586 ($jwrite_from, $jwrite_to, $jwrite_type) = guess_jwrite($ jwrite_from, $to);585 ($jwrite_from, $jwrite_to, $jwrite_type) = guess_jwrite($from, $to); 587 586 588 587 unless($jwrite_to) { … … 591 590 592 591 unless($jwrite_from) { 593 die("Unable to resolve account"); 592 if(!$from) { 593 die("You must specify an account with -a"); 594 } else { 595 die("Unable to resolve account $from"); 596 } 594 597 } 595 598 … … 1296 1299 sub resolveDestJID { 1297 1300 my ($to, $from) = @_; 1298 return $to if $to =~ /@/;1299 1301 my $jid = Net::Jabber::JID->new($to); 1300 1302 … … 1302 1304 my @jids = $roster->jids('all'); 1303 1305 for my $j (@jids) { 1304 if($roster->query($j, 'name') eq $to) { 1306 if(($roster->query($j, 'name') || "") eq $to) { 1307 return $j->GetJID('full'); 1308 } elsif($j->GetJID('base') eq baseJID($to)) { 1305 1309 return $j->GetJID('full'); 1306 1310 } … … 1313 1317 my $to = shift; 1314 1318 my $from = shift; 1319 return unless $from; 1315 1320 my @mucs = $conn->getConnectionFromJID($from)->MUCs; 1316 1321 if(grep {$_->BaseJID eq $to } @mucs) { … … 1329 1334 die("Unable to resolve account $from") unless $from_jid; 1330 1335 $to_jid = resolveDestJID($to, $from_jid); 1331 } elsif($to =~ /@/) {1332 $to_jid = $to;1333 $from_jid = defaultJID();1334 die("You must specify an account with -a") unless $from_jid;1335 1336 } else { 1336 1337 for my $f ($conn->getJids) { … … 1340 1341 } 1341 1342 } 1343 $to_jid = $to if $to =~ /@/; 1342 1344 die("Unable to resolve JID $to") unless $to_jid; 1343 1345 }
Note: See TracChangeset
for help on using the changeset viewer.