Changeset bedad20

Timestamp:

2010-11-24T22:32:12Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

b11b781

Parents:

9564e55

Message:

Some polishing/documentation for the "account add" without password hack.

Files:

• doc/user-guide/commands.xml (modified) (6 diffs)
• irc_commands.c (modified) (2 diffs)
• root_commands.c (modified) (1 diff)

doc/user-guide/commands.xml

@@ -17 +17 @@
 
                 <bitlbee-command name="add">
-                        <syntax>account add &lt;protocol&gt; &lt;username&gt; &lt;password&gt;</syntax>
+                        <syntax>account add &lt;protocol&gt; &lt;username&gt; [&lt;password&gt;]</syntax>
 
                         <description>
@@ -23 +23 @@
                                         Adds an account on the given server with the specified protocol, username and password to the account list. Supported protocols right now are: Jabber, MSN, OSCAR (AIM/ICQ), Yahoo and Twitter. For more information about adding an account, see <emphasis>help account add &lt;protocol&gt;</emphasis>.
                                 </para>
+
+                                <para>
+                                        If you omit the password, you should use the IRC /OPER command to enter it separately. The advantage of this approach is that most IRC clients will not show OPER passwords on screen/save them in logs.
+                                </para>
                         </description>
                         
                         <bitlbee-command name="jabber">
-                                <syntax>account add jabber &lt;handle@server.tld&gt; &lt;password&gt;</syntax>
+                                <syntax>account add jabber &lt;handle@server.tld&gt; [&lt;password&gt;]</syntax>
 
                                 <description>
@@ -40 +44 @@
 
                         <bitlbee-command name="msn">
-                                <syntax>account add msn &lt;handle@server.tld&gt; &lt;password&gt;</syntax>
+                                <syntax>account add msn &lt;handle@server.tld&gt; [&lt;password&gt;]</syntax>
 
                                 <description>
@@ -50 +54 @@
                         
                         <bitlbee-command name="oscar">
-                                <syntax>account add oscar &lt;handle&gt; &lt;password&gt;</syntax>
+                                <syntax>account add oscar &lt;handle&gt; [&lt;password&gt;]</syntax>
 
                                 <description>
@@ -65 +69 @@
                         
                         <bitlbee-command name="twitter">
-                                <syntax>account add twitter &lt;handle&gt; &lt;password&gt;</syntax>
+                                <syntax>account add twitter &lt;handle&gt; [&lt;password&gt;]</syntax>
 
                                 <description>
@@ -87 +91 @@
 
                         <bitlbee-command name="yahoo">
-                                <syntax>account add yahoo &lt;handle&gt; &lt;password&gt;</syntax>
+                                <syntax>account add yahoo &lt;handle&gt; [&lt;password&gt;]</syntax>
 
                                 <description>

irc_commands.c

@@ -409 +409 @@
                 {
                         set_setstr( &a->set, "password", cmd[2] );
+                        irc_usermsg( irc, "Password added to IM account "
+                                     "%s(%s)", a->prpl->name, a->user );
+                        /* The IRC client may expect this. Report failure since
+                           we didn't hand out a +o. */
+                        irc_send_num( irc, 491, ":Password added to IM account "
+                                      "%s(%s)", a->prpl->name, a->user );
                         return;
                 }
@@ -422 +428 @@
         else
         {
-                irc_send_num( irc, 432, ":Incorrect password" );
+                irc_send_num( irc, 491, ":Incorrect password" );
         }
 }

root_commands.c

@@ -427 +427 @@
                 }
                 
-                irc_usermsg( irc, "Account successfully added" );
-                
-                if( cmd[4] == NULL )
-                        irc_usermsg( irc, "Now, use /OPER to enter your password for this account" );
+                irc_usermsg( irc, "Account successfully added%s", cmd[4] ? "" :
+                             ", now use /OPER to enter the password" );
                 
                 return;