[Phpfreechat-svn] SF.net SVN: phpfreechat: [1062] trunk

[<ke...@us...>]

Revision: 1062
          http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1062&view=rev
Author:   kerphi
Date:     2007-07-30 06:16:33 -0700 (Mon, 30 Jul 2007)

Log Message:
-----------
Bug fix: privmsg command errors were not complete (thanks to sappheiros, sd bug 1762828)

Modified Paths:
--------------
    trunk/data/public/js/pfcclient.js
    trunk/src/commands/privmsg.class.php
    trunk/src/commands/privmsg2.class.php
    trunk/src/phpfreechat.class.php

Modified: trunk/data/public/js/pfcclient.js
===================================================================
--- trunk/data/public/js/pfcclient.js	2007-07-30 13:12:30 UTC (rev 1061)
+++ trunk/data/public/js/pfcclient.js	2007-07-30 13:16:33 UTC (rev 1062)
@@ -282,6 +282,7 @@
       else if (resp == "unknown")
       {
         // speak to unknown user
+        this.displayMsg( cmd, this.res.getLabel('You are trying to speak to a unknown (or not connected) user') );
       }
       else if (resp == "speak_to_myself")
       {

Modified: trunk/src/commands/privmsg.class.php
===================================================================
--- trunk/src/commands/privmsg.class.php	2007-07-30 13:12:30 UTC (rev 1061)
+++ trunk/src/commands/privmsg.class.php	2007-07-30 13:16:33 UTC (rev 1062)
@@ -4,10 +4,12 @@
 
 class pfcCommand_privmsg extends pfcCommand
 {
+  var $usage = "/privmsg {nickname}";
+
   function run(&$xml_reponse, $p)
   {
     $clientid    = $p["clientid"];
-    $param       = $p["param"];
+    $params      = $p["params"];
     $sender      = $p["sender"];
     $recipient   = $p["recipient"];
     $recipientid = $p["recipientid"];
@@ -16,17 +18,28 @@
     $u =& pfcUserConfig::Instance();
     $ct =& pfcContainer::Instance();
     
+    if (count($params) == 0)
+    {
+      // error
+      $cmdp = $p;
+      $cmdp["param"] = _pfc("Missing parameter");
+      $cmdp["param"] .= " (".$this->usage.")";
+      $cmd =& pfcCommand::Factory("error");
+      $cmd->run($xml_reponse, $cmdp);
+      return false;
+    }
+
     // check the pvname exists on the server
     $pvname = '';
     $pvnickid = '';
     if ($this->name == 'privmsg2')
     {
-      $pvnickid = $param;
+      $pvnickid = $params[0];
       $pvname   = $ct->getNickname($pvnickid);
     }
     else
     {
-      $pvname   = $param;
+      $pvname   = $params[0];
       $pvnickid = $ct->getNickId($pvname);
     }
     $nickid   = $u->nickid;
@@ -103,4 +116,4 @@
   }
 }
 
-?>
\ No newline at end of file
+?>

Modified: trunk/src/commands/privmsg2.class.php
===================================================================
--- trunk/src/commands/privmsg2.class.php	2007-07-30 13:12:30 UTC (rev 1061)
+++ trunk/src/commands/privmsg2.class.php	2007-07-30 13:16:33 UTC (rev 1062)
@@ -29,6 +29,7 @@
  */
 class pfcCommand_privmsg2 extends pfcCommand_privmsg
 {
+  var $usage = "/privmsg2 {nicknameid}";
 }
 
-?>
\ No newline at end of file
+?>

Modified: trunk/src/phpfreechat.class.php
===================================================================
--- trunk/src/phpfreechat.class.php	2007-07-30 13:12:30 UTC (rev 1061)
+++ trunk/src/phpfreechat.class.php	2007-07-30 13:16:33 UTC (rev 1062)
@@ -457,6 +457,7 @@
              "Input Required", // _pfc
              "OK", // _pfc
              "Cancel", // _pfc
+             "You are trying to speak to a unknown (or not connected) user", // _pfc
              );
     foreach($labels_to_load as $l)
     {
@@ -566,4 +567,4 @@
   
 }
 
-?>
\ No newline at end of file
+?>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.