Index: openacs-4/packages/chat/tcl/chat-ajax-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/tcl/chat-ajax-procs.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/chat/tcl/chat-ajax-procs.tcl	18 Mar 2010 09:47:15 -0000	1.12
+++ openacs-4/packages/chat/tcl/chat-ajax-procs.tcl	17 Jun 2016 17:36:11 -0000	1.13
@@ -45,10 +45,10 @@
       set file [open [acs_root_dir]/$jspath]; set js [read $file]; close $file
 
       set path      [lindex [site_node::get_url_from_object_id -object_id $package_id] 0]
-      set login_url [ad_quotehtml "${path}ajax/chat?m=login&$context"]
-      set send_url  [ad_quotehtml "${path}ajax/chat?m=add_msg&$context&msg="]
-      set users_url [ad_quotehtml "${path}ajax/chat?m=get_users&$context"]
-      set html_url [ad_quotehtml [ad_conn url]?[ad_conn query]]
+      set login_url [ns_quotehtml "${path}ajax/chat?m=login&$context"]
+      set send_url  [ns_quotehtml "${path}ajax/chat?m=add_msg&$context&msg="]
+      set users_url [ns_quotehtml "${path}ajax/chat?m=get_users&$context"]
+      set html_url [ns_quotehtml [ad_conn url]?[ad_conn query]]
       regsub {client=ajax} $html_url {client=html} html_url
       
       return "\
Index: openacs-4/packages/chat/tcl/chat-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/tcl/chat-procs.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/chat/tcl/chat-procs.tcl	17 Jun 2016 17:27:51 -0000	1.12
+++ openacs-4/packages/chat/tcl/chat-procs.tcl	17 Jun 2016 17:36:11 -0000	1.13
@@ -13,7 +13,7 @@
         return
     }
     ns_log notice "chat_start_server: Starting chat server"
-    set port [ad_parameter ServerPort]
+    set port [parameter::get -parameter ServerPort]
     set path "ns/server/[ns_info server]/module/nssock"
     set host_location "[ns_config $path Address]"
 
Index: openacs-4/packages/chat/www/chat-room-grant.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/chat-room-grant.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/chat/www/chat-room-grant.tcl	4 Sep 2002 08:12:50 -0000	1.2
+++ openacs-4/packages/chat/www/chat-room-grant.tcl	17 Jun 2016 17:36:11 -0000	1.3
@@ -10,7 +10,7 @@
     assign_privilege:trim,notnull
 }
 
-ad_require_permission $room_id $require_privilege
+permission::require_permission -object_id $room_id -privilege $require_privilege
 
 doc_body_append "[ad_header "Grant permission on $pretty_name"]
 
@@ -21,7 +21,7 @@
 <hr>
 
 <form method=post action=chat-room-grant-2>
-[export_form_vars room_id require_privilege assign_privilege]
+[export_vars -form {room_id require_privilege assign_privilege}]
 <select name=party_id>
 "
 
Index: openacs-4/packages/chat/www/chat.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/chat.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/chat/www/chat.tcl	17 Jun 2016 17:27:51 -0000	1.14
+++ openacs-4/packages/chat/www/chat.tcl	17 Jun 2016 17:36:11 -0000	1.15
@@ -80,11 +80,11 @@
 		set template_use "java-chat"
 
 		# Get config paramater for applet.
-		set width [ad_parameter AppletWidth "" 500]
-		set height [ad_parameter AppletHeight "" 400]   
+		set width [parameter::get -parameter AppletWidth -default 500]
+		set height [parameter::get -parameter AppletHeight -default 400]   
     
 		set host [ad_parameter ServerHost "" [ns_config "ns/server/[ns_info server]/module/nssock" Hostname]]
-		set port [ad_parameter ServerPort "" 8200]
+		set port [parameter::get -parameter ServerPort -default 8200]
 	}
 }
 
Index: openacs-4/packages/chat/www/html-chat.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/html-chat.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/chat/www/html-chat.tcl	17 Jun 2016 17:27:51 -0000	1.5
+++ openacs-4/packages/chat/www/html-chat.tcl	17 Jun 2016 17:36:11 -0000	1.6
@@ -7,9 +7,9 @@
 }
    
 set user_id [ad_conn user_id]
-set read_p  [ad_permission_p $room_id "chat_read"]
-set write_p [ad_permission_p $room_id "chat_write"]
-set ban_p   [ad_permission_p $room_id "chat_ban"]
+set read_p  [permission::permission_p -object_id $room_id -privilege "chat_read"]
+set write_p [permission::permission_p -object_id $room_id -privilege "chat_write"]
+set ban_p   [permission::permission_p -object_id $room_id -privilege "chat_ban"]
 set active  [room_active_status $room_id]
 
 # get the "rich" client settings
Index: openacs-4/packages/chat/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/index.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/chat/www/index.tcl	13 Jul 2009 16:35:29 -0000	1.11
+++ openacs-4/packages/chat/www/index.tcl	17 Jun 2016 17:36:11 -0000	1.12
@@ -36,9 +36,9 @@
 
     if { $active_p } {
         set room_url [export_vars -base "room-enter" {room_id {client $default_client}}]
-        set room_url [ad_quotehtml $room_url]
+        set room_url [ns_quotehtml $room_url]
         set room_html_url [export_vars -base "room-enter" {room_id {client html}}]
-        set room_html_url [ad_quotehtml $room_html_url]
+        set room_html_url [ns_quotehtml $room_html_url]
     }
 }
 
Index: openacs-4/packages/chat/www/message-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/message-delete.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/chat/www/message-delete.tcl	19 Nov 2007 01:14:16 -0000	1.5
+++ openacs-4/packages/chat/www/message-delete.tcl	17 Jun 2016 17:36:11 -0000	1.6
@@ -14,7 +14,7 @@
     context_bar:onevalue
 }
 
-ad_require_permission $room_id chat_room_delete
+permission::require_permission -object_id $room_id -privilege chat_room_delete
 
 set context_bar [list [list "room?room_id=$room_id" "[_ chat.Room_Information]"] "[_ chat.Delete_messages]"]
 
Index: openacs-4/packages/chat/www/moderator-grant-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/moderator-grant-2.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/chat/www/moderator-grant-2.tcl	20 Apr 2001 20:51:08 -0000	1.1
+++ openacs-4/packages/chat/www/moderator-grant-2.tcl	17 Jun 2016 17:36:11 -0000	1.2
@@ -11,7 +11,7 @@
     party_id:integer,notnull
 }
 
-ad_require_permission $room_id chat_moderator_grant
+permission::require_permission -object_id $room_id -privilege chat_moderator_grant
 
 chat_moderator_grant $room_id $party_id
 
Index: openacs-4/packages/chat/www/moderator-grant.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/moderator-grant.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/chat/www/moderator-grant.tcl	14 Mar 2006 12:16:09 -0000	1.3
+++ openacs-4/packages/chat/www/moderator-grant.tcl	17 Jun 2016 17:36:11 -0000	1.4
@@ -17,7 +17,7 @@
     parties:multirow
 }
 
-ad_require_permission $room_id chat_moderator_grant
+permission::require_permission -object_id $room_id -privilege chat_moderator_grant
 
 set context_bar [list "[_ chat.Grant_moderator]"]
 set submit_label "[_ chat.Grant]"
Index: openacs-4/packages/chat/www/moderator-revoke-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/moderator-revoke-2.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/chat/www/moderator-revoke-2.tcl	20 Apr 2001 20:51:08 -0000	1.1
+++ openacs-4/packages/chat/www/moderator-revoke-2.tcl	17 Jun 2016 17:36:11 -0000	1.2
@@ -11,7 +11,7 @@
     party_id:integer,notnull
 }
 
-ad_require_permission $room_id chat_moderator_revoke
+permission::require_permission -object_id $room_id -privilege chat_moderator_revoke
 
 chat_moderator_revoke $room_id $party_id
 
Index: openacs-4/packages/chat/www/moderator-revoke.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/moderator-revoke.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/chat/www/moderator-revoke.tcl	14 Mar 2006 12:16:09 -0000	1.3
+++ openacs-4/packages/chat/www/moderator-revoke.tcl	17 Jun 2016 17:36:11 -0000	1.4
@@ -11,7 +11,7 @@
     party_id:integer,notnull
 }
 
-ad_require_permission $room_id chat_moderator_revoke
+permission::require_permission -object_id $room_id -privilege chat_moderator_revoke
 
 set context_bar [list [list "room?room_id=$room_id" "[_ chat.Room_Information]"] "[_ chat.Revoke_moderator]"]
 
Index: openacs-4/packages/chat/www/room-delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room-delete-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/chat/www/room-delete-2.tcl	19 Nov 2007 01:14:16 -0000	1.5
+++ openacs-4/packages/chat/www/room-delete-2.tcl	17 Jun 2016 17:36:11 -0000	1.6
@@ -9,7 +9,7 @@
     room_id:integer,notnull
 }
 
-ad_require_permission $room_id chat_room_delete
+permission::require_permission -object_id $room_id -privilege chat_room_delete
 
 if { [catch {chat_room_delete $room_id} errmsg] } {
     ad_return_complaint 1 "[_ chat.Delete_room_failed]: $errmsg"
Index: openacs-4/packages/chat/www/room-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room-delete.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/chat/www/room-delete.tcl	19 Nov 2007 01:14:16 -0000	1.5
+++ openacs-4/packages/chat/www/room-delete.tcl	17 Jun 2016 17:36:11 -0000	1.6
@@ -13,7 +13,7 @@
     context_bar:onevalue
 }
 
-ad_require_permission $room_id chat_room_delete
+permission::require_permission -object_id $room_id -privilege chat_room_delete
 
 set context_bar [list [list "room?room_id=$room_id" "[_ chat.Room_Information]"] "[_ chat.Delete_room]"]
 
Index: openacs-4/packages/chat/www/search-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/search-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/chat/www/search-2.tcl	17 Jun 2016 17:27:51 -0000	1.5
+++ openacs-4/packages/chat/www/search-2.tcl	17 Jun 2016 17:36:11 -0000	1.6
@@ -120,13 +120,13 @@
     set user_search:[set rowcount](first_names) $first_names
     set user_search:[set rowcount](last_name) $last_name
     set user_search:[set rowcount](email) $email
-    set user_search:[set rowcount](export_vars) [export_url_vars user_id_from_search first_names_from_search last_name_from_search email_from_search]
+    set user_search:[set rowcount](export_vars) [export_vars {user_id_from_search first_names_from_search last_name_from_search email_from_search}]
     set user_search:[set rowcount](member_state) $member_state
     set user_search:[set rowcount](url) [export_vars -base "search-3" {room_id type {party_id $user_id}}]
 
     
     if { $member_state ne "approved" } {
-        set user_search:[set rowcount](user_finite_state_links) [join [ad_registration_finite_state_machine_admin_links $member_state $email_verified_p $user_id_from_search "search?[export_url_vars email last_name keyword target passthrough limit_users_in_group_id only_authorized_p]"] " | "]
+        set user_search:[set rowcount](user_finite_state_links) [join [ad_registration_finite_state_machine_admin_links $member_state $email_verified_p $user_id_from_search [export_vars -base search {email last_name keyword target passthrough limit_users_in_group_id only_authorized_p}]] " | "]
     } else {
         set user_search:[set rowcount](user_finite_state_links) ""
     }
Index: openacs-4/packages/chat/www/search-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/search-3.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/chat/www/search-3.tcl	19 Nov 2007 01:14:16 -0000	1.4
+++ openacs-4/packages/chat/www/search-3.tcl	17 Jun 2016 17:36:11 -0000	1.5
@@ -7,10 +7,10 @@
 }
 
 if {$type eq "user"} {
-  ad_require_permission $room_id chat_user_grant
+  permission::require_permission -object_id $room_id -privilege chat_user_grant
   chat_user_grant $room_id $party_id
 } else {
-  ad_require_permission $room_id chat_user_ban
+  permission::require_permission -object_id $room_id -privilege chat_user_ban
   chat_user_ban $room_id $party_id
 }
 ad_returnredirect "room?room_id=$room_id"
Index: openacs-4/packages/chat/www/transcript-delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/transcript-delete-2.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/chat/www/transcript-delete-2.tcl	14 Mar 2006 12:16:09 -0000	1.3
+++ openacs-4/packages/chat/www/transcript-delete-2.tcl	17 Jun 2016 17:36:11 -0000	1.4
@@ -7,7 +7,7 @@
     
 }
 
-ad_require_permission $transcript_id chat_transcript_delete
+permission::require_permission -object_id $transcript_id -privilege chat_transcript_delete
 
 
 
Index: openacs-4/packages/chat/www/transcript-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/transcript-view.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/chat/www/transcript-view.tcl	14 Mar 2006 12:16:09 -0000	1.3
+++ openacs-4/packages/chat/www/transcript-view.tcl	17 Jun 2016 17:36:11 -0000	1.4
@@ -16,7 +16,7 @@
     contents:onevalue
 }
 
-ad_require_permission $transcript_id chat_transcript_view
+permission::require_permission -object_id $transcript_id -privilege chat_transcript_view
 
 set context_bar [list "[_ chat.View_transcript]"]
 db_1row get_transcript {
Index: openacs-4/packages/chat/www/user-ban.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/user-ban.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/chat/www/user-ban.tcl	14 Mar 2006 12:16:09 -0000	1.3
+++ openacs-4/packages/chat/www/user-ban.tcl	17 Jun 2016 17:36:11 -0000	1.4
@@ -18,7 +18,7 @@
     parties:multirow
 }
 
-ad_require_permission $room_id chat_user_ban
+permission::require_permission -object_id $room_id -privilege chat_user_ban
 
 set context_bar [list "[_ chat.Ban_user]"]
 set submit_label "[_ chat.Ban]"
Index: openacs-4/packages/chat/www/user-unban-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/user-unban-2.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/chat/www/user-unban-2.tcl	20 Apr 2001 20:51:08 -0000	1.1
+++ openacs-4/packages/chat/www/user-unban-2.tcl	17 Jun 2016 17:36:11 -0000	1.2
@@ -11,7 +11,7 @@
     party_id:integer,notnull
 }
 
-ad_require_permission $room_id chat_user_unban
+permission::require_permission -object_id $room_id -privilege chat_user_unban
 
 chat_user_unban $room_id $party_id
 
Index: openacs-4/packages/chat/www/user-unban.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/user-unban.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/chat/www/user-unban.tcl	14 Mar 2006 12:16:09 -0000	1.3
+++ openacs-4/packages/chat/www/user-unban.tcl	17 Jun 2016 17:36:11 -0000	1.4
@@ -11,7 +11,7 @@
     party_id:integer,notnull
 }
 
-ad_require_permission $room_id chat_user_unban
+permission::require_permission -object_id $room_id -privilege chat_user_unban
 
 set context_bar [list [list "room?room_id=$room_id" "[_ chat.Room_Information]"] "[_ chat.Unban_user]"]