[367] in BarnOwl Developers
[D-O-H] r509 - in trunk: . owl/perl/modules
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:05:24 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
To: dirty-owl-hackers@mit.edu
From: nelhage@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Tue, 9 Jan 2007 23:33:20 -0500 (EST)
Author: nelhage
Date: 2007-01-09 23:33:20 -0500 (Tue, 09 Jan 2007)
New Revision: 509
Modified:
trunk/
trunk/owl/perl/modules/jabber.pl
Log:
r17898@phanatique: nelhage | 2007-01-09 15:27:07 -0500
Reformatting help somewhat
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:17896
+ bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:17898
Modified: trunk/owl/perl/modules/jabber.pl
===================================================================
--- trunk/owl/perl/modules/jabber.pl 2007-01-09 20:46:33 UTC (rev 508)
+++ trunk/owl/perl/modules/jabber.pl 2007-01-10 04:33:20 UTC (rev 509)
@@ -226,7 +226,8 @@
sub register_owl_commands() {
owl::new_command(
jabberlogin => \&cmd_login,
- { summary => "Log into jabber", }
+ { summary => "Log into jabber", },
+ { usage => "jabberlogin JID" }
);
owl::new_command(
jabberlogout => \&cmd_logout,
@@ -252,24 +253,25 @@
summary => "Jabber MUC related commands.",
description => "jmuc sends jabber commands related to muc.\n\n"
. "The following commands are available\n\n"
- . "join {muc} Join a muc.\n\n"
- . "part [muc] Part a muc.\n"
+ . "join MUC Join a muc.\n\n"
+ . "part MUC Part a muc.\n"
. " The muc is taken from the current message if not supplied.\n\n"
- . "invite {jid} [muc]\n"
+ . "invite JID MUC\n"
. " Invite {jid} to [muc].\n"
. " The muc is taken from the current message if not supplied.\n\n"
- . "configure [muc]\n"
+ . "configure MUC\n"
. " Configure [muc].\n"
- . " Necessary to initalize a new MUC",
- usage => "jmuc {command} {args}"
+ . " Necessary to initalize a new MUC\n"
+ . " At present, only the default configuration is supported.",
+ usage => "jmuc COMMAND ARGS"
}
);
owl::new_command(
jroster => \&cmd_jroster,
{
summary => "Jabber Roster related commands.",
- description => "jroster sends jabber commands related to rosters.\n\n",
- usage => "jroster {command} {args}"
+ description => "jroster sends jabber commands related to rosters.\n\n",
+ usage => "jroster COMMAND ARGS"
}
);
}
@@ -349,8 +351,8 @@
} else {
my @result = $client->AuthSend( %{ $vars{jlogin_authhash} } );
- if ( $#result == -1 || $result[0] ne 'ok' ) {
- if ( !$vars{jlogin_havepass} && ( $#result == -1 || $result[0] eq '401' ) ) {
+ if ( ($result[0] || "") ne 'ok' ) {
+ if ( !$vars{jlogin_havepass} && $result[0] eq '401' ) {
$vars{jlogin_havepass} = 1;
$conn->removeConnection($jidStr);
owl::start_password( "Password for $jidStr: ", \&do_login );
