[Tkabber-dev] r1706 - in trunk/tkabber: . plugins/si

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Mon Mar 9 20:22:47 MSK 2009


Author: sergei
Date: 2009-03-09 20:22:46 +0300 (Mon, 09 Mar 2009)
New Revision: 1706

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/muc.tcl
   trunk/tkabber/plugins/si/socks5.tcl
Log:
	* plugins/si/socks5.tcl: Removed proxy.netlabs.cz from proxies list
	  to prevent its abuse.

	* muc.tcl: Enclose JIDs/nicks in quotes when showing error messages on
	  failed MUC actions (kick, ban, etc.). It helps to detect extra or
	  missing spaces (thanks to Serge Yudin).


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2009-03-09 10:48:00 UTC (rev 1705)
+++ trunk/tkabber/ChangeLog	2009-03-09 17:22:46 UTC (rev 1706)
@@ -1,3 +1,12 @@
+2009-03-09  Sergei Golovan  <sgolovan at nes.ru>
+
+	* plugins/si/socks5.tcl: Removed proxy.netlabs.cz from proxies list
+	  to prevent its abuse.
+
+	* muc.tcl: Enclose JIDs/nicks in quotes when showing error messages on
+	  failed MUC actions (kick, ban, etc.). It helps to detect extra or
+	  missing spaces (thanks to Serge Yudin).
+
 2009-03-05  Sergei Golovan  <sgolovan at nes.ru>
 
 	* hooks.tcl: Added a procedure which checks if a hook is empty.

Modified: trunk/tkabber/muc.tcl
===================================================================
--- trunk/tkabber/muc.tcl	2009-03-09 10:48:00 UTC (rev 1705)
+++ trunk/tkabber/muc.tcl	2009-03-09 17:22:46 UTC (rev 1706)
@@ -333,10 +333,10 @@
 
     if {$real_jid != ""} {
 	chat::add_message $chatid $group info \
-	    [::msgcat::mc "whois %s: %s" $nick $real_jid] {}
+	    [::msgcat::mc "whois '%s': %s" $nick $real_jid] {}
     } else {
 	chat::add_message $chatid $group error \
-	    [::msgcat::mc "whois %s: no info" $nick] {}
+	    [::msgcat::mc "whois '%s': no info" $nick] {}
     }
 }
 
@@ -372,7 +372,7 @@
 	    affiliation/up {
 		if {[compare_affs $aff $val] >= 0} {
 		    chat::add_message $chatid $group error \
-			"affiliation $val $nick:\
+			"affiliation $val '$nick':\
 			 [::msgcat::mc {User already %s} $aff]" {}
 		    return
 		}
@@ -380,7 +380,7 @@
 	    affiliation/down {
 		if {[compare_affs $aff $val] <= 0} {
 		    chat::add_message $chatid $group error \
-			"affiliation $val $nick:\
+			"affiliation $val '$nick':\
 			 [::msgcat::mc {User already %s} $aff]" {}
 		    return
 		}
@@ -388,7 +388,7 @@
 	    role/up {
 		if {[compare_roles $role $val] >= 0} {
 		    chat::add_message $chatid $group error \
-			"role $val $nick:\
+			"role $val '$nick':\
 			 [::msgcat::mc {User already %s} $role]" {}
 		    return
 		}
@@ -396,7 +396,7 @@
 	    role/down {
 		if {[compare_roles $role $val] <= 0} {
 		    chat::add_message $chatid $group error \
-			"role $val $nick:\
+			"role $val '$nick':\
 			 [::msgcat::mc {User already %s} $role]" {}
 		    return
 		}
@@ -430,7 +430,7 @@
 			-xmlns $::NS(muc#admin) \
 			-subelement $item] \
 	-to $group \
-	-command [list muc::test_error_res "$params $nick" $xlib $group]
+	-command [list muc::test_error_res "$params '$nick'" $xlib $group]
 }
 
 ###############################################################################
@@ -448,7 +448,7 @@
 proc muc::unban_continue {xlib group jid res child} {
     if {$res != "ok"} {
 	chat::add_message [chat::chatid $xlib $group] $group error \
-	    "affiliation none $jid: [error_to_string $child]" {}
+	    "affiliation none '$jid': [error_to_string $child]" {}
 	return
     }
 
@@ -471,7 +471,7 @@
 
     if {!$found} {
 	chat::add_message [chat::chatid $xlib $group] $group error \
-	    "affiliation none $jid: User is not banned" {}
+	    "affiliation none '$jid': User is not banned" {}
 	return
     }
 
@@ -489,7 +489,7 @@
 proc muc::test_unban_res {xlib group jid res child} {
     if {$res != "ok"} {
 	chat::add_message [chat::chatid $xlib $group] $group error \
-	    "affiliation none $jid: [error_to_string $child]" {}
+	    "affiliation none '$jid': [error_to_string $child]" {}
 	return
     }
 

Modified: trunk/tkabber/plugins/si/socks5.tcl
===================================================================
--- trunk/tkabber/plugins/si/socks5.tcl	2009-03-09 10:48:00 UTC (rev 1705)
+++ trunk/tkabber/plugins/si/socks5.tcl	2009-03-09 17:22:46 UTC (rev 1706)
@@ -13,7 +13,7 @@
 	[::msgcat::mc "Use mediated SOCKS5 connection if proxy is available."] \
 	-group {Stream Initiation} -type boolean
 
-    custom::defvar options(proxy_servers) "proxy.netlab.cz" \
+    custom::defvar options(proxy_servers) "" \
 	[::msgcat::mc "List of proxy servers for SOCKS5 bytestreams (all\
 		       available servers will be tried for mediated connection)."] \
 	-group {Stream Initiation} -type string



More information about the Tkabber-dev mailing list