Index: openacs-4/packages/dotlrn/lib/member-email-confirm.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/lib/member-email-confirm.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/dotlrn/lib/member-email-confirm.tcl 7 Oct 2007 22:36:56 -0000 1.3 +++ openacs-4/packages/dotlrn/lib/member-email-confirm.tcl 29 Sep 2013 13:49:45 -0000 1.4 @@ -37,7 +37,7 @@ set subject [lindex $default_email 1] set email [lindex $default_email 2] } - set package [ad_parameter -package_id [ad_acs_kernel_id] SystemURL] + set package [parameter::get -package_id [ad_acs_kernel_id] -parameter SystemURL] if {$subject eq ""} { set subject [_ dotlrn.added_community_subject] } Index: openacs-4/packages/dotlrn/tcl/community-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.tcl,v diff -u -N -r1.205 -r1.206 --- openacs-4/packages/dotlrn/tcl/community-procs.tcl 21 Feb 2011 14:27:27 -0000 1.205 +++ openacs-4/packages/dotlrn/tcl/community-procs.tcl 29 Sep 2013 13:49:45 -0000 1.206 @@ -1229,7 +1229,7 @@ set chunk "" if {[empty_string_p $user_id]} { - set user_id [ad_get_user_id] + set user_id [ad_conn user_id] } set show_drop_link_p [parameter::get_from_package_key \ Index: openacs-4/packages/dotlrn/www/applets.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/applets.tcl,v diff -u -N -r1.17 -r1.18 --- openacs-4/packages/dotlrn/www/applets.tcl 14 Mar 2008 14:59:54 -0000 1.17 +++ openacs-4/packages/dotlrn/www/applets.tcl 29 Sep 2013 13:49:45 -0000 1.18 @@ -28,7 +28,7 @@ dotlrn_portlet::is_allowed -parameter manageapplets set community_id [dotlrn_community::get_community_id] -set user_id [ad_get_user_id] +set user_id [ad_conn user_id] set portal_id [dotlrn_community::get_portal_id -community_id $community_id] set context [list [list "one-community-admin" [_ dotlrn.Admin]] [_ dotlrn.Manage_Applets]] Index: openacs-4/packages/dotlrn/www/clone.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/clone.tcl,v diff -u -N -r1.9 -r1.10 --- openacs-4/packages/dotlrn/www/clone.tcl 7 Oct 2007 22:36:56 -0000 1.9 +++ openacs-4/packages/dotlrn/www/clone.tcl 29 Sep 2013 13:49:45 -0000 1.10 @@ -25,7 +25,7 @@ title:onevalue } -set user_id [ad_get_user_id] +set user_id [ad_conn user_id] set community_id [dotlrn_community::get_community_id] # this page must be restricted to admins of the community only Index: openacs-4/packages/dotlrn/www/communities.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/communities.tcl,v diff -u -N -r1.10 -r1.11 --- openacs-4/packages/dotlrn/www/communities.tcl 12 Mar 2008 22:11:31 -0000 1.10 +++ openacs-4/packages/dotlrn/www/communities.tcl 29 Sep 2013 13:49:45 -0000 1.11 @@ -31,7 +31,7 @@ referer:onevalue } -set portal_id [dotlrn::get_portal_id -user_id [ad_get_user_id]] +set portal_id [dotlrn::get_portal_id -user_id [ad_conn user_id]] set dotlrn_url [dotlrn::get_url] # Make sure user is logged in set user_id [ad_maybe_redirect_for_registration] Index: openacs-4/packages/dotlrn/www/community-edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-edit-2.tcl,v diff -u -N -r1.18 -r1.19 --- openacs-4/packages/dotlrn/www/community-edit-2.tcl 3 Apr 2009 15:07:13 -0000 1.18 +++ openacs-4/packages/dotlrn/www/community-edit-2.tcl 29 Sep 2013 13:49:45 -0000 1.19 @@ -72,12 +72,12 @@ # in the CR root folder (-100). set logo_name "community_logo_$community_id" -if { ![empty_string_p [ad_parameter MaximumFileSize]] +if { ![empty_string_p [parameter::get -parameter MaximumFileSize]] && $tmp_size > 0 - && $tmp_size > [ad_parameter MaximumFileSize] } { + && $tmp_size > [parameter::get -parameter MaximumFileSize] } { set msg_subst_list [list system_name [ad_system_name] \ - max_attachments_bytes [util_commify_number [ad_parameter MaximumFileSize]]] + max_attachments_bytes [util_commify_number [parameter::get -parameter MaximumFileSize]]] ad_return_complaint 1 "
  • [_ dotlrn.your_icon_is_too_large $msg_subst_list]" ad_script_abort } Index: openacs-4/packages/dotlrn/www/courses.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/courses.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/dotlrn/www/courses.tcl 12 Mar 2008 22:11:31 -0000 1.4 +++ openacs-4/packages/dotlrn/www/courses.tcl 29 Sep 2013 13:49:45 -0000 1.5 @@ -31,7 +31,7 @@ referer:onevalue } -set portal_id [dotlrn::get_portal_id -user_id [ad_get_user_id]] +set portal_id [dotlrn::get_portal_id -user_id [ad_conn user_id]] set dotlrn_url [dotlrn::get_url] # Make sure user is logged in set user_id [ad_maybe_redirect_for_registration] Index: openacs-4/packages/dotlrn/www/dotlrn-master-custom.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master-custom.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/dotlrn/www/dotlrn-master-custom.tcl 9 Nov 2008 23:29:23 -0000 1.3 +++ openacs-4/packages/dotlrn/www/dotlrn-master-custom.tcl 29 Sep 2013 13:49:45 -0000 1.4 @@ -1,4 +1,4 @@ -set user_id [ad_get_user_id] +set user_id [ad_conn user_id] set community_id [dotlrn_community::get_community_id] set dotlrn_package_id [dotlrn::get_package_id] Index: openacs-4/packages/dotlrn/www/dotlrn-master-kelp.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master-kelp.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/dotlrn/www/dotlrn-master-kelp.tcl 3 Apr 2009 15:07:13 -0000 1.5 +++ openacs-4/packages/dotlrn/www/dotlrn-master-kelp.tcl 29 Sep 2013 13:49:45 -0000 1.6 @@ -42,7 +42,7 @@ # # $Id$ -set user_id [ad_get_user_id] +set user_id [ad_conn user_id] set community_id [dotlrn_community::get_community_id] set dotlrn_url [dotlrn::get_url] @@ -150,7 +150,7 @@ } # Set up some basic stuff -set user_id [ad_get_user_id] +set user_id [ad_conn user_id] if { [ad_conn untrusted_user_id] == 0 } { set user_name {} } else { Index: openacs-4/packages/dotlrn/www/dotlrn-master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master.tcl,v diff -u -N -r1.40 -r1.41 --- openacs-4/packages/dotlrn/www/dotlrn-master.tcl 3 Apr 2009 15:07:13 -0000 1.40 +++ openacs-4/packages/dotlrn/www/dotlrn-master.tcl 29 Sep 2013 13:49:45 -0000 1.41 @@ -43,7 +43,7 @@ # # $Id$ -set user_id [ad_get_user_id] +set user_id [ad_conn user_id] set community_id [dotlrn_community::get_community_id] set dotlrn_url [dotlrn::get_url] @@ -161,7 +161,7 @@ } # Set up some basic stuff -set user_id [ad_get_user_id] +set user_id [ad_conn user_id] if { [ad_conn untrusted_user_id] == 0 } { set user_name {} } else { Index: openacs-4/packages/dotlrn/www/members-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members-chunk.tcl,v diff -u -N -r1.20 -r1.21 --- openacs-4/packages/dotlrn/www/members-chunk.tcl 21 Dec 2006 15:57:53 -0000 1.20 +++ openacs-4/packages/dotlrn/www/members-chunk.tcl 29 Sep 2013 13:49:45 -0000 1.21 @@ -32,7 +32,7 @@ set referer [ns_conn url] -set site_wide_admin_p [ad_permission_p -user_id $user_id [acs_magic_object "security_context_root"] "admin"] +set site_wide_admin_p [permission::permission_p -party_id $user_id -object_id [acs_magic_object "security_context_root"] -privilege "admin"] if {!$site_wide_admin_p} { set admin_p [dotlrn::user_can_admin_community_p -user_id $user_id -community_id $community_id] set read_private_data_p [dotlrn::user_can_read_private_data_p -user_id $user_id -object_id $community_id] Index: openacs-4/packages/dotlrn/www/members.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members.tcl,v diff -u -N -r1.30 -r1.31 --- openacs-4/packages/dotlrn/www/members.tcl 14 Jul 2009 10:17:38 -0000 1.30 +++ openacs-4/packages/dotlrn/www/members.tcl 29 Sep 2013 13:49:45 -0000 1.31 @@ -30,7 +30,7 @@ set my_user_id [ad_conn user_id] set context [list [list "one-community-admin" [_ dotlrn.Admin]] [_ dotlrn.Manage_Members]] set community_id [dotlrn_community::get_community_id] -set spam_p [dotlrn::user_can_spam_community_p -user_id [ad_get_user_id] -community_id $community_id] +set spam_p [dotlrn::user_can_spam_community_p -user_id [ad_conn user_id] -community_id $community_id] set approval_policy_p [string eq [group::join_policy -group_id $community_id] "needs approval"] set subcomm_p [dotlrn_community::subcommunity_p -community_id $community_id] Index: openacs-4/packages/dotlrn/www/one-community-admin.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-admin.tcl,v diff -u -N -r1.29 -r1.30 --- openacs-4/packages/dotlrn/www/one-community-admin.tcl 12 Mar 2008 22:11:31 -0000 1.29 +++ openacs-4/packages/dotlrn/www/one-community-admin.tcl 29 Sep 2013 13:49:45 -0000 1.30 @@ -37,7 +37,7 @@ ad_set_client_property dotlrn page_num "-1" set community_id [dotlrn_community::get_community_id] -set user_id [ad_get_user_id] +set user_id [ad_conn user_id] # Permissions dotlrn::require_user_admin_community -user_id $user_id -community_id $community_id Index: openacs-4/packages/dotlrn/www/register.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/register.tcl,v diff -u -N -r1.15 -r1.16 --- openacs-4/packages/dotlrn/www/register.tcl 5 Feb 2008 13:53:08 -0000 1.15 +++ openacs-4/packages/dotlrn/www/register.tcl 29 Sep 2013 13:49:45 -0000 1.16 @@ -83,7 +83,7 @@ set segment_id [db_string select_admin_rel_segment_id {}] set community_name [dotlrn_community::get_community_name $community_id] - set community_url "[ad_parameter -package_id [ad_acs_kernel_id] SystemURL][dotlrn_community::get_community_url $community_id]" + set community_url "[parameter::get -package_id [ad_acs_kernel_id] -parameter SystemURL][dotlrn_community::get_community_url $community_id]" set query [db_map bulk_mail_query] Index: openacs-4/packages/dotlrn/www/spam.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam.tcl,v diff -u -N -r1.29 -r1.30 --- openacs-4/packages/dotlrn/www/spam.tcl 15 May 2009 22:38:13 -0000 1.29 +++ openacs-4/packages/dotlrn/www/spam.tcl 29 Sep 2013 13:49:45 -0000 1.30 @@ -173,7 +173,7 @@ set who_will_receive_this_clause "" set community_name [dotlrn_community::get_community_name $community_id] - set community_url "[ad_parameter -package_id [ad_acs_kernel_id] SystemURL][dotlrn_community::get_community_url $community_id]" + set community_url "[parameter::get -package_id [ad_acs_kernel_id] -parameter SystemURL][dotlrn_community::get_community_url $community_id]" if { ![empty_string_p $recipients_str] } { set recipients_str [join [split $recipients_str] ,] Index: openacs-4/packages/dotlrn/www/subcommunity-archive.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/subcommunity-archive.tcl,v diff -u -N -r1.9 -r1.10 --- openacs-4/packages/dotlrn/www/subcommunity-archive.tcl 8 Aug 2006 21:26:24 -0000 1.9 +++ openacs-4/packages/dotlrn/www/subcommunity-archive.tcl 29 Sep 2013 13:49:45 -0000 1.10 @@ -31,7 +31,7 @@ } -set user_id [ad_get_user_id] +set user_id [ad_conn user_id] dotlrn::require_user_admin_community -community_id $community_id set pretty_name [dotlrn_community::get_community_name $community_id] set title [_ dotlrn.arhive_group_name [list group_name $pretty_name]] Index: openacs-4/packages/dotlrn/www/subcommunity-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/subcommunity-new.tcl,v diff -u -N -r1.24 -r1.25 --- openacs-4/packages/dotlrn/www/subcommunity-new.tcl 8 Aug 2006 21:26:24 -0000 1.24 +++ openacs-4/packages/dotlrn/www/subcommunity-new.tcl 29 Sep 2013 13:49:45 -0000 1.25 @@ -26,7 +26,7 @@ title:onevalue } -set user_id [ad_get_user_id] +set user_id [ad_conn user_id] set parent_community_id [dotlrn_community::get_community_id] dotlrn::require_user_admin_community -user_id $user_id -community_id $parent_community_id set title "[_ dotlrn.New] [parameter::get -localize -parameter subcommunities_pretty_name]" Index: openacs-4/packages/dotlrn/www/user-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/user-add-2.tcl,v diff -u -N -r1.13 -r1.14 --- openacs-4/packages/dotlrn/www/user-add-2.tcl 8 Aug 2006 21:26:24 -0000 1.13 +++ openacs-4/packages/dotlrn/www/user-add-2.tcl 29 Sep 2013 13:49:45 -0000 1.14 @@ -87,7 +87,7 @@ set context_bar [list [list "one-community-admin" [_ dotlrn.Admin]] [_ dotlrn.Add_User]] -set admin_user_id [ad_verify_and_get_user_id] +set admin_user_id [ad_conn user_id] set administration_name [db_string select_admin_name { select first_names || ' ' || last_name from persons @@ -96,4 +96,4 @@ set system_name [ad_system_name] set export_vars [export_vars -form {email referer type can_browse_p read_private_data_p dotlrn_interactive_p add_membership_p}] -set system_url [ad_parameter -package_id [ad_acs_kernel_id] SystemURL ""] +set system_url [parameter::get -package_id [ad_acs_kernel_id] -parameter SystemURL -default ""] Index: openacs-4/packages/dotlrn/www/user-add-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/user-add-3.tcl,v diff -u -N -r1.11 -r1.12 --- openacs-4/packages/dotlrn/www/user-add-3.tcl 15 May 2009 22:38:13 -0000 1.11 +++ openacs-4/packages/dotlrn/www/user-add-3.tcl 29 Sep 2013 13:49:45 -0000 1.12 @@ -31,14 +31,14 @@ dotlrn_portlet::is_allowed -parameter guestuser dotlrn_portlet::is_allowed -parameter limiteduser -set admin_user_id [ad_verify_and_get_user_id] +set admin_user_id [ad_conn user_id] set admin_email [db_string select_admin_email { select email from parties where party_id = :admin_user_id }] -set msg_subst_values [list system_name [ad_system_name] system_url [ad_parameter SystemUrl]] +set msg_subst_values [list system_name [ad_system_name] system_url [parameter::get -parameter SystemUrl]] set email_subject [_ dotlrn.user_add_confirm_email_subject $msg_subst_values] if [catch {acs_mail_lite::send -send_immediately -to_addr $email -from_addr $admin_email -subject $email_subject -body $message} errmsg] { ad_return_error "[_ dotlrn.Mail_Failed]" "[_ dotlrn.lt_The_system_was_unable] Index: openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl,v diff -u -N -r1.31 -r1.32 --- openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl 7 Oct 2007 22:36:56 -0000 1.31 +++ openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl 29 Sep 2013 13:49:45 -0000 1.32 @@ -114,12 +114,12 @@ db_dml update_community_info {} if {[empty_string_p $referer]} { - set referer "[dotlrn::get_admin_url]/class?[export_url_vars class_key]" + set referer "[dotlrn::get_admin_url]/class?[export_vars -url {class_key}]" } if {${add_instructor}} { set community_id $class_instance_id - ad_returnredirect "add-instructor?[export_url_vars community_id referer]" + ad_returnredirect "add-instructor?[export_vars -url {community_id referer}]" ad_script_abort } Index: openacs-4/packages/dotlrn/www/admin/dotlrn-admins.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/dotlrn-admins.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/dotlrn/www/admin/dotlrn-admins.tcl 15 May 2007 20:14:25 -0000 1.7 +++ openacs-4/packages/dotlrn/www/admin/dotlrn-admins.tcl 29 Sep 2013 13:49:46 -0000 1.8 @@ -31,7 +31,7 @@ set dotlrn_admins_group [db_string group_id_from_name " select group_id from groups where group_name='dotlrn-admin'" -default ""] -set admin_id [ad_verify_and_get_user_id] +set admin_id [ad_conn user_id] set elements [list user \ [list label "[_ dotlrn.User]"\ Index: openacs-4/packages/dotlrn/www/admin/user-new-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-new-2.tcl,v diff -u -N -r1.34 -r1.35 --- openacs-4/packages/dotlrn/www/admin/user-new-2.tcl 15 May 2009 22:38:13 -0000 1.34 +++ openacs-4/packages/dotlrn/www/admin/user-new-2.tcl 29 Sep 2013 13:49:46 -0000 1.35 @@ -87,7 +87,7 @@ set subject "Your [ad_system_name] membership has been approved" set message "Your [ad_system_name] membership has been approved. Please return to [ad_url] to log into [ad_system_name]." - set email_from [ad_parameter -package_id [ad_acs_kernel_id] SystemOwner] + set email_from [parameter::get -package_id [ad_acs_kernel_id] -parameter SystemOwner] db_transaction { Index: openacs-4/packages/dotlrn/www/admin/user.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user.tcl,v diff -u -N -r1.26 -r1.27 --- openacs-4/packages/dotlrn/www/admin/user.tcl 15 May 2009 22:38:13 -0000 1.26 +++ openacs-4/packages/dotlrn/www/admin/user.tcl 29 Sep 2013 13:49:46 -0000 1.27 @@ -44,7 +44,7 @@ #Pages in this directory are only runnable by dotlrn-wide admins. dotlrn::require_admin -set return_url "[ad_parameter -package_id [ad_acs_kernel_id] CommunityMemberAdminURL]?user_id=$user_id" +set return_url "[parameter::get -package_id [ad_acs_kernel_id] -parameter CommunityMemberAdminURL]?user_id=$user_id" set export_edit_vars [export_vars {user_id return_url}] set dotlrn_url [dotlrn::get_url] Index: openacs-4/packages/dotlrn/www/admin/users-bulk-approve.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-bulk-approve.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/dotlrn/www/admin/users-bulk-approve.tcl 15 May 2009 22:38:13 -0000 1.3 +++ openacs-4/packages/dotlrn/www/admin/users-bulk-approve.tcl 29 Sep 2013 13:49:46 -0000 1.4 @@ -48,7 +48,7 @@ set subject "Your [ad_system_name] membership has been approved" set message "Your [ad_system_name] membership has been approved. Please return to [ad_url] to log into [ad_system_name]." - set email_from [ad_parameter -package_id [ad_acs_kernel_id] SystemOwner] + set email_from [parameter::get -package_id [ad_acs_kernel_id] -parameter SystemOwner] set pending_users [db_list get_all_pending_users {}] Index: openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl,v diff -u -N -r1.22 -r1.23 --- openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl 15 May 2009 22:38:13 -0000 1.22 +++ openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl 29 Sep 2013 13:49:46 -0000 1.23 @@ -31,7 +31,7 @@ # Prepare stuff set headers {first_names last_name email username} -set admin_user_id [ad_verify_and_get_user_id] +set admin_user_id [ad_conn user_id] set admin_email [db_string select_admin_email { select email from parties @@ -128,7 +128,7 @@ doc_body_append [_ dotlrn.user_email_created [list user_email $row(email)]] set msg_subst_list [list system_name [ad_system_name] \ - system_url [ad_parameter -package_id [ad_acs_kernel_id] SystemURL] \ + system_url [parameter::get -package_id [ad_acs_kernel_id] -parameter SystemURL] \ user_email $row(email) \ user_password $password] set message [_ dotlrn.user_add_confirm_email_body $msg_subst_list]