[Tkabber-dev] r1165 - in trunk/tkabber-plugins: . tclchat

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Tue Jul 24 17:43:11 MSD 2007


Author: sergei
Date: 2007-07-24 17:43:10 +0400 (Tue, 24 Jul 2007)
New Revision: 1165

Modified:
   trunk/tkabber-plugins/ChangeLog
   trunk/tkabber-plugins/tclchat/tclchat.tcl
Log:
	* tclchat/tclchat.tcl: Changed loginconf options according to changes
	  in login.tcl.


Modified: trunk/tkabber-plugins/ChangeLog
===================================================================
--- trunk/tkabber-plugins/ChangeLog	2007-07-23 20:07:57 UTC (rev 1164)
+++ trunk/tkabber-plugins/ChangeLog	2007-07-24 13:43:10 UTC (rev 1165)
@@ -1,3 +1,8 @@
+2007-06-24  Sergei Golovan <sgolovan at nes.ru>
+
+	* tclchat/tclchat.tcl: Changed loginconf options according to changes
+	  in login.tcl.
+
 2007-06-12  Sergei Golovan <sgolovan at nes.ru>
 
 	* georoster/georoster.tcl: Fixed typo.

Modified: trunk/tkabber-plugins/tclchat/tclchat.tcl
===================================================================
--- trunk/tkabber-plugins/tclchat/tclchat.tcl	2007-07-23 20:07:57 UTC (rev 1164)
+++ trunk/tkabber-plugins/tclchat/tclchat.tcl	2007-07-24 13:43:10 UTC (rev 1165)
@@ -47,22 +47,22 @@
         RE            {<A HREF="([0-9\-%d]+\.tcl)">.*\s([0-9]+) bytes}
     }
     package require http
-    if {![info exists loginconf(useragent)]} {
-        set loginconf(useragent) [http::config -useragent]
+    if {![info exists loginconf(proxyuseragent)]} {
+        set loginconf(proxyuseragent) [http::config -useragent]
     }
     http::config \
         -proxyfilter [namespace origin proxyfilter] \
-        -useragent $loginconf(useragent)
+        -useragent $loginconf(proxyuseragent)
 
     if {[package provide tls] != {}} {
         http::register https 443 ::tls::socket
     }
         
-    if {$loginconf(useproxy)} {
-        if {[string length $loginconf(httplogin)] > 0} {
+    if {$loginconf(proxy) == "https"} {
+        if {[string length $loginconf(proxyusername)] > 0} {
             set Options(auth) [list Proxy-Authorization \
                 [concat Basic [base64::encode \
-                     "$loginconf(httplogin):$loginconf(httppassword)"]]]
+                     "$loginconf(proxyusername):$loginconf(proxypassword)"]]]
         }
     }
 }
@@ -72,8 +72,8 @@
     if {[string match "localhost*" $host] || [string match "127.*" $host]} {
         return {}
     }
-    if {$loginconf(useproxy)} {
-        return [list $loginconf(httpproxy) $loginconf(httpproxyport)]
+    if {$loginconf(proxy) == "https"} {
+        return [list $loginconf(proxyhost) $loginconf(proxyport)]
     }
     return {}
 }



More information about the Tkabber-dev mailing list