Index: openacs-4/packages/directory/tcl/directory-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/directory/tcl/directory-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/directory/tcl/directory-procs.tcl	12 Sep 2013 20:25:19 -0000	1.4
+++ openacs-4/packages/directory/tcl/directory-procs.tcl	24 Sep 2015 07:38:34 -0000	1.5
@@ -75,7 +75,7 @@
 
     set html_list [list]
     foreach l [dir_all_letters] {
-	if { [lsearch -exact $initial_list $l] == -1 } {
+	if {$l ni $initial_list} {
 	    # This means no user has this initial
 	    lappend html_list "<font color=gray>$l</font>"
 	} elseif { [string compare $l $letter] == 0 } {
Index: openacs-4/packages/lars-blogger/tcl/weblogs-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/weblogs-procs.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/lars-blogger/tcl/weblogs-procs.tcl	27 Feb 2004 19:16:24 -0000	1.10
+++ openacs-4/packages/lars-blogger/tcl/weblogs-procs.tcl	24 Sep 2015 07:38:34 -0000	1.11
@@ -80,8 +80,8 @@
 
     ns_log debug "lars_blogger::instance::send_pings:"
     foreach ping_url $ping_urls {
-        ns_log debug "lars_blogger::instance::send_pings: call is \n[list xmlrpc::remote_call $ping_url weblogUpdates.ping -string [ad_quotehtml $blog_title] -string [ad_quotehtml $blog_url]]"
-        if { [catch {xmlrpc::remote_call $ping_url weblogUpdates.ping -string [ad_quotehtml $blog_title] -string [ad_quotehtml $blog_url] } errmsg ] } {
+        ns_log debug "lars_blogger::instance::send_pings: call is \n[list xmlrpc::remote_call $ping_url weblogUpdates.ping -string [ns_quotehtml $blog_title] -string [ns_quotehtml $blog_url]]"
+        if { [catch {xmlrpc::remote_call $ping_url weblogUpdates.ping -string [ns_quotehtml $blog_title] -string [ns_quotehtml $blog_url] } errmsg ] } {
             ns_log warning "lars_blogger::instance::send_pings error: $errmsg"
             set success_p 0
         } else {
Index: openacs-4/packages/lars-blogger/www/entry-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/entry-chunk.tcl,v
diff -u -r1.25 -r1.26
--- openacs-4/packages/lars-blogger/www/entry-chunk.tcl	28 Jun 2015 12:46:36 -0000	1.25
+++ openacs-4/packages/lars-blogger/www/entry-chunk.tcl	24 Sep 2015 07:38:34 -0000	1.26
@@ -53,7 +53,7 @@
 set admin_p [permission::permission_p -object_id $entry_id -party_id $user_id -privilege admin]
 lars_blogger::entry::htmlify \
     -max_content_length $max_content_length \
-    -more [ad_decode [ad_return_url] $blog(permalink_url) {} " <a href=\"[ad_quotehtml $blog(permalink_url)]\">Continued...</a>"] \
+    -more [ad_decode [ad_return_url] $blog(permalink_url) {} " <a href=\"[ns_quotehtml $blog(permalink_url)]\">Continued...</a>"] \
     -array blog
 
 set blog(edit_url) [export_vars -base "${package_url}entry-edit" { entry_id return_url }]
Index: openacs-4/packages/trackback/tcl/trackback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/trackback/tcl/trackback-procs.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/trackback/tcl/trackback-procs.tcl	25 Mar 2004 21:51:25 -0000	1.5
+++ openacs-4/packages/trackback/tcl/trackback-procs.tcl	24 Sep 2015 07:38:34 -0000	1.6
@@ -167,15 +167,15 @@
     
 
     if {[string equal $method GET]} {
-	set form_vars [export_vars -url {url excerpt title blog_name}]
+	set form_vars [export_vars {url excerpt title blog_name}]
 	ns_log debug "trackback: full url = ${ping_url}&${form_vars}"
 	# old style GET
 	set result [ns_httpget ${ping_url}&${form_vars} 60]
         ns_log debug "trackback: trackback returned: $result"
     } else {
 	#must be POST
 
-	set form_vars [export_vars -url { url }]
+	set form_vars [export_vars { url }]
 	if {![empty_string_p $excerpt]} {
 	    ns_set put $query_set excerpt $excerpt
 	}
Index: openacs-4/packages/xml-rpc/tcl/xml-rpc-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xml-rpc/tcl/xml-rpc-procs.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/xml-rpc/tcl/xml-rpc-procs.tcl	30 Mar 2013 19:07:24 -0000	1.7
+++ openacs-4/packages/xml-rpc/tcl/xml-rpc-procs.tcl	24 Sep 2015 07:38:34 -0000	1.8
@@ -59,7 +59,7 @@
     # be thread/process safe.  Hence spin till success
     set fp ""
     while {$fp eq ""} {
-        set filename "[ns_tmpnam][clock clicks -milliseconds].xmlrpc2"
+        set filename "[ad_tmpnam][clock clicks -milliseconds].xmlrpc2"
         set fp [ns_openexcl $filename]
     }
 
@@ -100,7 +100,7 @@
         </member>
         <member>
           <name>faultString</name>
-          <value><string>[ad_quotehtml $msg]</string></value>
+          <value><string>[ns_quotehtml $msg]</string></value>
         </member>
       </struct>
     </value>
@@ -353,7 +353,7 @@
 
     # if no valid option is specified, treat it as string
     if {[lsearch $options_list [lindex $arglist 0]] == -1} {
-        set value "<string>[ad_quotehtml $arglist]</string>"
+        set value "<string>[ns_quotehtml $arglist]</string>"
         return [xmlrpc::create_context $context $arglist]
     }
 
@@ -367,7 +367,7 @@
         switch -- $option {
             -string -
             -text {
-                set value "<string>[ad_quotehtml $value]</string>"
+                set value "<string>[ns_quotehtml $value]</string>"
                 append result [xmlrpc::create_context $context $value]
             }
 
@@ -428,7 +428,7 @@
             -keyvalue {
                 set data "<struct>" 
                 foreach {name mvalue} $value {
-                    append data "<member><name>[ad_quotehtml $name]</name>"
+                    append data "<member><name>[ns_quotehtml $name]</name>"
                     append data [xmlrpc::construct value $mvalue]
                     append data "</member>"
                 }