summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAttila Molnar <attilamolnar@hush.com>2012-07-06 16:02:31 -0700
committerAttila Molnar <attilamolnar@hush.com>2012-07-06 16:02:31 -0700
commit557269cdcafef119ea031d7af91d1ac0c25eebd4 (patch)
treec7043413abb83052d1267f7a6899a0c12a22f5f9
parent85b9374a7a866e659d8289556a3d7c1c93f9dc9e (diff)
parentb450b1a34ecf5ab0c7f1236dc86ce347e7cfa039 (diff)
Merge pull request #223 from Shawn-Smith/insp20+needmoreparams
[2.0] Fix to show ERR_NEEDMOREPARAMS for USERHOST and ISON
-rw-r--r--src/commands/cmd_ison.cpp4
-rw-r--r--src/commands/cmd_userhost.cpp14
2 files changed, 9 insertions, 9 deletions
diff --git a/src/commands/cmd_ison.cpp b/src/commands/cmd_ison.cpp
index 784328eb5..1a50239ee 100644
--- a/src/commands/cmd_ison.cpp
+++ b/src/commands/cmd_ison.cpp
@@ -30,7 +30,9 @@ class CommandIson : public Command
public:
/** Constructor for ison.
*/
- CommandIson ( Module* parent) : Command(parent,"ISON",0,0) { syntax = "<nick> {nick}"; }
+ CommandIson ( Module* parent) : Command(parent,"ISON", 1) {
+ syntax = "<nick> {nick}";
+ }
/** Handle command.
* @param parameters The parameters to the comamnd
* @param pcnt The number of parameters passed to teh command
diff --git a/src/commands/cmd_userhost.cpp b/src/commands/cmd_userhost.cpp
index 726c063b3..af7d3ceca 100644
--- a/src/commands/cmd_userhost.cpp
+++ b/src/commands/cmd_userhost.cpp
@@ -30,7 +30,9 @@ class CommandUserhost : public Command
public:
/** Constructor for userhost.
*/
- CommandUserhost ( Module* parent) : Command(parent,"USERHOST",0,1) { syntax = "<nick>{,<nick>}"; }
+ CommandUserhost ( Module* parent) : Command(parent,"USERHOST", 1, 5) {
+ syntax = "<nick> {<nick>}";
+ }
/** Handle command.
* @param parameters The parameters to the comamnd
* @param pcnt The number of parameters passed to teh command
@@ -53,13 +55,9 @@ CmdResult CommandUserhost::Handle (const std::vector<std::string>& parameters, U
retbuf = retbuf + u->nick;
if (IS_OPER(u))
- {
- retbuf = retbuf + "*=";
- }
- else
- {
- retbuf = retbuf + "=";
- }
+ retbuf = retbuf + "*";
+
+ retbuf = retbuf + "=";
if (IS_AWAY(u))
retbuf += "-";