Bug 276764 - Strict JS warning fix, variable relocation, and a copy-paste error fixed.

ChatZilla only.
r=samuel@sieb.net
p=gautheri@noos.fr (Serge GAUTHERIE)

extensions/irc/xul/content/commands.js

@@ -658,7 +658,7 @@ function dispatchCommand (command, e, flags)
             return null;
         commandList = commandList.split(";");
 
-        var i = 0;
+        i = 0;
         while (i < commandList.length) {
             if (commandList[i].match(/(?:^|[^\\])(?:\\\\)*$/) || 
                 (i == commandList.length - 1)) 
@@ -848,6 +848,7 @@ function cmdChanUserMode(e)
     }
 
     var nicks;
+    var user;
     // Prefer pre-canonicalised list, then a normal list, then finally a
     // sigular item (canon. or otherwise).
     if (e.canonNickList)
@@ -859,7 +860,7 @@ function cmdChanUserMode(e)
         var nickList = new Array();
         for (i = 0; i < e.nicknameList.length; i++)
         {
-            var user = e.channel.getUser(e.nicknameList[i]);
+            user = e.channel.getUser(e.nicknameList[i]);
             if (!user)
             {
                 display(getMsg(MSG_ERR_UNKNOWN_USER, e.nicknameList[i]), MT_ERROR);
@@ -874,7 +875,7 @@ function cmdChanUserMode(e)
         user = e.channel.getUser(e.nickname);
         if (!user)
         {
-            display(getMsg(MSG_ERR_UNKNOWN_USER, e.nicknameList[i]), MT_ERROR);
+            display(getMsg(MSG_ERR_UNKNOWN_USER, e.nickname), MT_ERROR);
             return;
         }
         var str = new String(user.encodedName);

extensions/irc/xul/content/prefs.js

@@ -258,17 +258,21 @@ function makeLogName(obj, type)
             // Remember to encode these, don't want some dodgy # breaking stuff.
             if (longName in longCodes)
                 return encode(longCodes[longName]);
+
             dd("Unknown long code: " + longName);
-            return match;
         }
         else if (typeof shortName != "undefined" && shortName)
         {
             if (shortName in shortCodes)
                 return encode(shortCodes[shortName]);
+
             dd("Unknown short code: " + shortName);
-            return match;
         }
-        dd("Unknown match: " + match);
+        else
+        {
+            dd("Unknown match: " + match);
+        }
+
         return match;
     };