Mercurial > hg > egg-tcls
changeset 231:d13eba8fa8dc
Merge.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Sun, 07 Dec 2014 01:06:10 +0200 |
parents | fe420576f284 (current diff) 3e3756b113a1 (diff) |
children | 0dc95d66ba8d |
files | |
diffstat | 1 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/urllog.tcl Sun Dec 07 01:05:30 2014 +0200 +++ b/urllog.tcl Sun Dec 07 01:06:10 2014 +0200 @@ -466,10 +466,9 @@ } ### Do we perform additional optional checks? - if {$urllog_check != 0 && (($http_tls_support != 0 && $u_proto == "https") || $u_proto == "http")} { - # Ok - } else { - # No optional checks, just add the URL, if it does not exist already + if {$urllog_check == 0 || !(($http_tls_support != 0 && $u_proto == "https") || $u_proto == "http")} { + # No optional checks, or it's not http/https. + # Just add the URL, if it does not exist already. urllog_addurl $urlStr $urlNick $urlHost $urlChan "" return 1 } @@ -604,7 +603,7 @@ } ### Check the channel - foreach akey [split $urllog_log_channels] { + foreach akey [split $urllog_log_channels ";"] { if {[string match $akey $uchan]} { ### Do the URL checking foreach str [split $utext " "] {