--- a/urllog.tcl	Mon Jan 26 14:04:17 2015 +0200
+++ b/urllog.tcl	Mon Jan 26 14:07:16 2015 +0200
@@ -187,8 +187,8 @@
 proc urllog_exists {urlStr urlNick urlHost urlChan} {
   global urldb urlmsg_alreadyknown urllog_shorturl
 
-  set usql "SELECT id AS uid, utime AS utime, url AS uurl, user AS uuser, host AS uhost, chan AS uchan, title AS utitle FROM urls WHERE url='[urllog_escape $urlStr]'"
-  urldb eval $usql {
+  set usql "SELECT id AS uid, utime AS utime, url AS uurl, user AS uuser, host AS uhost, chan AS uchan, title AS utitle FROM urls WHERE url='[utl_escape $urlStr]'"
+  $usql foreach urow {
     urllog_log "URL said by $urlNick ($urlStr) already known"
     if {$urllog_shorturl != 0} {
       set qstr "[urllog_get_short $uid] "
@@ -215,9 +215,9 @@
   if {$urlTitle == ""} {
     set uins "NULL"
   } else {
-    set uins "'[urllog_escape $urlTitle]'"
+    set uins "'[utl_escape $urlTitle]'"
   }
-  set usql "INSERT INTO urls (utime,url,user,host,chan,title) VALUES ([unixtime], '[urllog_escape $urlStr]', '[urllog_escape $urlNick]', '[urllog_escape $urlHost]', '[urllog_escape $urlChan]', $uins)"
+  set usql "INSERT INTO urls (utime,url,user,host,chan,title) VALUES ([unixtime], '[utl_escape $urlStr]', '[utl_escape $urlNick]', '[utl_escape $urlHost]', '[utl_escape $urlChan]', $uins)"
   if {[catch {urldb eval $usql} uerrmsg]} {
     urllog_log "$uerrmsg on SQL:\n$usql"
     return 0
@@ -561,7 +561,7 @@
   foreach ftoken $ftokens {
     set fprefix [string range $ftoken 0 0]
     set fpattern [string range $ftoken 1 end]
-    set qpattern "'%[urllog_escape $fpattern]%'"
+    set qpattern "'%[utl_escape $fpattern]%'"
 
     if {$fprefix == "-"} {
       lappend fpatlist "(url NOT LIKE $qpattern OR title NOT LIKE $qpattern)"
@@ -572,7 +572,7 @@
     } elseif {$fprefix == "+"} {
       lappend fpatlist "(url LIKE $qpattern OR title LIKE $qpattern)"
     } else {
-      set qpattern "'%[urllog_escape $ftoken]%'"
+      set qpattern "'%[utl_escape $ftoken]%'"
       lappend fpatlist "(url LIKE $qpattern OR title LIKE $qpattern)"
     }
   }