# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1308761894 -10800
# Node ID 50b52294e93ed585a0f157c3d90fc72794bc73b7
# Parent  026257a62da47a2d1aeec4544a8120ee3fef54f5
urllog: Strip &rlm; entities from titles; Some work on SSL/https support.

diff -r 026257a62da4 -r 50b52294e93e urllog.tcl
--- a/urllog.tcl	Wed Jun 22 19:57:02 2011 +0300
+++ b/urllog.tcl	Wed Jun 22 19:58:14 2011 +0300
@@ -1,6 +1,6 @@
 ##########################################################################
 #
-# URLLog v1.99.12 by ccr/TNSP <ccr@tnsp.org>
+# URLLog v1.99.13 by ccr/TNSP <ccr@tnsp.org>
 # (C) Copyright 2000-2011 Tecnic Software productions (TNSP)
 #
 ##########################################################################
@@ -23,6 +23,7 @@
 set http_proxy_host ""
 set http_proxy_port 8080
 
+set http_tls_support 0
 
 ###
 ### General options
@@ -121,21 +122,27 @@
 ##########################################################################
 #-------------------------------------------------------------------------
 set urllog_name "URLLog"
-set urllog_version "1.99.12"
+set urllog_version "1.99.13"
 
 set urllog_tlds [split $urllog_tlds ","]
 set urllog_httprep [split "\@|%40|{|%7B|}|%7D|\[|%5B|\]|%5D" "|"] 
 
-set urllog_html_ent [split "&#x202a;||&#x202c;||&lrm;||&aring;|å|&Aring;|Å|&eacute;|é|&#58;|:|&#xe4;|ä|&#xf6;|ö|&#228;|ä|&#246;|ö|&nbsp;| |&#45;|-|&#8221;|\"|&#8220;|\"|&raquo;|>>|&quot;|\"|&auml;|ä|&ouml;|ö|&Auml;|Ä|&Ouml;|Ö|&amp;|&|&lt;|<|&gt;|>|ä|ä|ö|ö|Ä|Ä" "|"]
+set urllog_html_ent [split "&rlm;||&#8212;|-|&#x202a;||&#x202c;||&lrm;||&aring;|å|&Aring;|Å|&eacute;|é|&#58;|:|&#xe4;|ä|&#xf6;|ö|&#228;|ä|&#246;|ö|&nbsp;| |&#45;|-|&#8221;|\"|&#8220;|\"|&raquo;|>>|&quot;|\"|&auml;|ä|&ouml;|ö|&Auml;|Ä|&Ouml;|Ö|&amp;|&|&lt;|<|&gt;|>|ä|ä|ö|ö|Ä|Ä" "|"]
 
 
 ### HTTP module initialization
 package require http
+
+
 ::http::config -useragent "$urllog_name/$urllog_version"
 if {$http_proxy != 0} {
 	::http::config -proxyhost $http_proxy_host -proxyport $http_proxy_port
 }
 
+if {$http_tls_support != 0} {
+	package require tls
+	::http::register https 443 [list ::tls::socket -request 1 -require 1 -cadir "/etc/certs/"]
+}
 
 ### Binding initializations
 if {$urllog_search != 0} {
@@ -411,12 +418,12 @@
 
 
 	### Do we perform additional optional checks?
-	if {$urllog_check == 0 || [string range $urlStr 0 6] != "http://"} {
+	if {$urllog_check == 0 || [string range $urlStr 0 4] != "http:"} {
 		# No optional checks, just add the URL
 		urllog_addurl $urlStr $urlNick $urlHost $urlChan ""
 		return 1
 	}
-	
+
 	### Does the document pointed by the URL exist?
 	if {[catch {set utoken [::http::geturl $urlStr -progress urllog_http_handler -blocksize 1024 -timeout 3000]} uerrmsg]} {
 		urllog_verb_msg $urlNick $urlChan "$urlmsg_ioerror ($uerrmsg)"
@@ -505,9 +512,7 @@
 
 	### Do the URL checking
 	foreach istr [split $text " "] {
-		if {[string match "*http://*" $istr] || [string match "*ftp://*" $istr] ||
-			[string match "*www.*" $istr] || [string match "*ftp.*" $istr] ||
-			[regexp "(ftp|http|https)://\[0-9\]\{1,3\}\\.\[0-9\]\{1,3\}\\.\[0-9\]\{1,3\}\\.\[0-9\]\{1,3\}" $istr imatch]} {
+		if {[regexp "(ftp|http|https)://|www\..+|ftp\..*" $istr]} {
 			urllog_checkurl $istr $nick $uhost $chan
 		}
 	}