Index: openacs-4/packages/poll/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/poll/www/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/poll/www/index.tcl	3 Sep 2004 10:56:50 -0000	1.1
+++ openacs-4/packages/poll/www/index.tcl	7 Apr 2018 11:17:50 -0000	1.2
@@ -13,7 +13,7 @@
 set user_id    [ad_conn user_id]
 
 # Check if the user has the proper rights.
-set create_p [ad_permission_p $package_id create]
+set create_p [permission::permission_p -object_id $package_id -privilege create]
 
 #
 # List all the polls.
Index: openacs-4/packages/poll/www/poll-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/poll/www/poll-ae.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/poll/www/poll-ae.tcl	2 Aug 2005 21:38:19 -0000	1.2
+++ openacs-4/packages/poll/www/poll-ae.tcl	7 Apr 2018 11:17:50 -0000	1.3
@@ -75,14 +75,14 @@
     if { ![info exists poll_id] } {
 	# This is an insert.  Get the next sequence value
 	# for double-click protection.
-	ad_require_permission $package_id create
+	permission::require_permission -object_id $package_id -privilege create
 
 	set poll_id [db_nextval acs_object_id_seq]
 	set insert_p 1
 
 	template::element set_value poll enabled_p "t"
     } else {
-	ad_require_permission $poll_id write
+	permission::require_permission -object_id $poll_id -privilege write
 
 	# This is an update...
 	db_1row fetch_info "
@@ -138,7 +138,7 @@
     set db_error 0
 
     if { $insert_p } {
-	ad_require_permission $package_id create
+	permission::require_permission -object_id $package_id -privilege create
 
 	if { ![db_string check_exists "select 1 from polls where poll_id = :poll_id" -default "0"] } {
 	    
@@ -149,7 +149,7 @@
 	    }
 	}
     } else {
-	ad_require_permission $poll_id write
+	permission::require_permission -object_id $poll_id -privilege write
 
 	set sql "update polls set $field_update_list where poll_id = :poll_id"
   	if { [catch {db_dml edit_poll $sql}] } {
@@ -171,7 +171,7 @@
 if { ![set insert_p [template::element get_value poll insert_p]] } {
     set context Edit
 
-    set write_p [ad_permission_p $poll_id write]
+    set write_p [permission::permission_p -object_id $poll_id -privilege write]
 
     db_multirow -extend label_js poll_choices list_poll_choices {
 	select
Index: openacs-4/packages/poll/www/poll-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/poll/www/poll-delete.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/poll/www/poll-delete.tcl	3 Sep 2004 10:56:50 -0000	1.1
+++ openacs-4/packages/poll/www/poll-delete.tcl	7 Apr 2018 11:17:50 -0000	1.2
@@ -9,7 +9,7 @@
 }
 
 
-ad_require_permission $poll_id delete
+permission::require_permission -object_id $poll_id -privilege delete
 
 db_exec_plsql del_poll " "
 
Index: openacs-4/packages/poll/www/poll_choice-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/poll/www/poll_choice-ae.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/poll/www/poll_choice-ae.tcl	3 Sep 2004 10:56:50 -0000	1.1
+++ openacs-4/packages/poll/www/poll_choice-ae.tcl	7 Apr 2018 11:17:50 -0000	1.2
@@ -10,7 +10,7 @@
     after:naturalnum,optional
 }
 
-ad_require_permission $poll_id write
+permission::require_permission -object_id $poll_id -privilege write
 
 #
 # 1) Set up the form.
Index: openacs-4/packages/poll/www/poll_choice-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/poll/www/poll_choice-delete.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/poll/www/poll_choice-delete.tcl	3 Sep 2004 10:56:50 -0000	1.1
+++ openacs-4/packages/poll/www/poll_choice-delete.tcl	7 Apr 2018 11:17:50 -0000	1.2
@@ -9,7 +9,7 @@
     choice_id:naturalnum
 }
 
-ad_require_permission $poll_id write
+permission::require_permission -object_id $poll_id -privilege write
 
 db_transaction {
     db_dml dec_sort "update poll_choices set sort_order = sort_order - 1
Index: openacs-4/packages/poll/www/poll_choice-swap.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/poll/www/poll_choice-swap.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/poll/www/poll_choice-swap.tcl	3 Sep 2004 10:56:50 -0000	1.1
+++ openacs-4/packages/poll/www/poll_choice-swap.tcl	7 Apr 2018 11:17:50 -0000	1.2
@@ -9,7 +9,7 @@
     choice_id:naturalnum
 }
 
-ad_require_permission $poll_id write
+permission::require_permission -object_id $poll_id -privilege write
 
 db_transaction {
     db_dml incr_prev "update poll_choices set sort_order = sort_order + 1
Index: openacs-4/packages/poll/www/results.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/poll/www/results.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/poll/www/results.tcl	3 Sep 2004 10:56:50 -0000	1.1
+++ openacs-4/packages/poll/www/results.tcl	7 Apr 2018 11:17:50 -0000	1.2
@@ -9,7 +9,7 @@
     {voted:naturalnum 0}
 }
 
-ad_require_permission $poll_id read
+permission::require_permission -object_id $poll_id -privilege read
 
 #
 # Show the results.
Index: openacs-4/packages/poll/www/vote-form.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/poll/www/vote-form.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/poll/www/vote-form.tcl	1 Mar 2005 00:01:40 -0000	1.2
+++ openacs-4/packages/poll/www/vote-form.tcl	7 Apr 2018 11:17:50 -0000	1.3
@@ -1,4 +1,4 @@
-ad_require_permission $poll_id read
+permission::require_permission -object_id $poll_id -privilege read
 
 #
 # 1) Generate the form for voting.