Index: openacs-4/packages/dotlrn/www/admin/site-wide-admin-toggle.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/site-wide-admin-toggle.tcl,v diff -u -N -r1.16 -r1.17 --- openacs-4/packages/dotlrn/www/admin/site-wide-admin-toggle.tcl 19 Jan 2018 14:38:45 -0000 1.16 +++ openacs-4/packages/dotlrn/www/admin/site-wide-admin-toggle.tcl 21 Jan 2018 01:04:52 -0000 1.17 @@ -30,13 +30,11 @@ dotlrn::require_admin if { ![acs_user::site_wide_admin_p] } { - ns_log notice "user has tried to site-wide-admin-toggle without permission" + ns_log notice "user has tried to site-wide-admin-toggle without permission" ad_return_forbidden \ "Permission Denied" \ - "

- [_ acs-admin.lt_You_dont_have_permiss] -

" - return + "

[_ acs-admin.lt_You_dont_have_permiss]

" + ad_script_abort } set object_id [acs_magic_object "security_context_root"] Index: openacs-4/packages/dotlrn-admin/www/admin/site-wide-admin-toggle.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/site-wide-admin-toggle.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/dotlrn-admin/www/admin/site-wide-admin-toggle.tcl 21 Jan 2018 00:48:30 -0000 1.3 +++ openacs-4/packages/dotlrn-admin/www/admin/site-wide-admin-toggle.tcl 21 Jan 2018 01:04:52 -0000 1.4 @@ -25,12 +25,11 @@ } if { ![acs_user::site_wide_admin_p] } { - ns_log notice "user has tried to site-wide-admin-toggle without permission" - ad_return_forbidden \ - "Permission Denied" \ - "
- You don't have permission to see this page. -
" + ns_log notice "user has tried to site-wide-admin-toggle without permission" + ad_return_forbidden \ + "Permission Denied" \ + "
You don't have permission to see this page.
" + ad_script_abort } if {$value eq "grant"} { Index: openacs-4/packages/dotlrn-portlet/tcl/dotlrn-portlet-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/tcl/dotlrn-portlet-procs.tcl,v diff -u -N -r1.38 -r1.39 --- openacs-4/packages/dotlrn-portlet/tcl/dotlrn-portlet-procs.tcl 7 Aug 2017 23:48:10 -0000 1.38 +++ openacs-4/packages/dotlrn-portlet/tcl/dotlrn-portlet-procs.tcl 21 Jan 2018 01:04:52 -0000 1.39 @@ -64,7 +64,7 @@ set force_region [parameter::get_from_package_key \ -package_key [my_package_key] \ -parameter "dotlrn_portlet_force_region" - ] + ] set element_id [portal::add_element_parameters \ -portal_id $portal_id \ @@ -73,7 +73,7 @@ -force_region $force_region \ -key "community_id" \ -value $community_id - ] + ] return $element_id } @@ -90,7 +90,7 @@ } ad_proc -public show { - cf + cf } { } { portal::show_proc_helper \ @@ -105,7 +105,7 @@ that need to verify a dotlrn-portlet parameter. This prevents bad users to access protected pages. - + @author Hector Amado (hr_amado@galileo.edu) @creation-date 2004-06-22 @@ -115,75 +115,69 @@ "cenrollment" { if { ![parameter::get_from_package_key -package_key dotlrn-portlet -parameter AllowChangeEnrollmentPolicy] } { if { ![dotlrn::admin_p] } { - ns_log notice "user has tried to see without permission" - ad_return_forbidden \ - "Permission Denied"\ - "

- You don't have permission to see this page. -

" + ns_log notice "user has tried to see without permission" + ad_return_forbidden \ + "Permission Denied"\ + "

You don't have permission to see this page.

" + ad_script_abort } } } "managemembership" { if { ![parameter::get_from_package_key -package_key dotlrn-portlet -parameter AllowManageMembership] } { - if { ![dotlrn::admin_p] } { - ns_log notice "user has tried to see /dotlrn/www/members without permission" - ad_return_forbidden \ - "Permission Denied"\ - "

- You don't have permission to see this page. -

" - } - } + if { ![dotlrn::admin_p] } { + ns_log notice "user has tried to see /dotlrn/www/members without permission" + ad_return_forbidden \ + "Permission Denied"\ + "

You don't have permission to see this page.

" + ad_script_abort + } + } } "cplayout" { if { ![parameter::get_from_package_key -package_key dotlrn-portlet -parameter AllowCustomizePortalLayout] } { - if { ![dotlrn::admin_p] } { - ns_log notice "user has tried to see /dotlrn/www/one-community-portal-configure without permission" - ad_return_forbidden \ - "Permission Denied"\ - "

- You don't have permission to see this page. -

" - } - } + if { ![dotlrn::admin_p] } { + ns_log notice "user has tried to see /dotlrn/www/one-community-portal-configure without permission" + ad_return_forbidden \ + "Permission Denied"\ + "

You don't have permission to see this page.

" + ad_script_abort + } + } } "guestuser" { if { ![parameter::get_from_package_key -package_key dotlrn-portlet -parameter AllowCreateGuestUsersInCommunity] } { - if { ![dotlrn::admin_p] } { - ns_log notice "user has tried to see /dotlrn/www/user-add without permission" - ad_return_forbidden \ - "Permission Denied"\ - "

- You don't have permission to see this page. -

" - } - } + if { ![dotlrn::admin_p] } { + ns_log notice "user has tried to see /dotlrn/www/user-add without permission" + ad_return_forbidden \ + "Permission Denied"\ + "

You don't have permission to see this page.

" + ad_script_abort + } + } } "limiteduser" { if { ![parameter::get_from_package_key -package_key dotlrn-portlet -parameter AllowCreateLimitedUsersInCommunity] } { - if { ![dotlrn::admin_p] } { - ns_log notice "user has tried to see /dotlrn/www/user-add without permission" - ad_return_forbidden \ - "Permission Denied"\ - "

- You don't have permission to see this page. -

" - } - } - } + if { ![dotlrn::admin_p] } { + ns_log notice "user has tried to see /dotlrn/www/user-add without permission" + ad_return_forbidden \ + "Permission Denied"\ + "

You don't have permission to see this page.

" + ad_script_abort + } + } + } "manageapplets" { - if { ![parameter::get_from_package_key -package_key dotlrn-portlet -parameter AllowManageApplets] } { - if { ![dotlrn::admin_p] } { - ns_log notice "user has tried to see /dotlrn/www/applets without permission" - ad_return_forbidden \ - "Permission Denied"\ - "

- You don't have permission to see this page. -

" - } - } - } + if { ![parameter::get_from_package_key -package_key dotlrn-portlet -parameter AllowManageApplets] } { + if { ![dotlrn::admin_p] } { + ns_log notice "user has tried to see /dotlrn/www/applets without permission" + ad_return_forbidden \ + "Permission Denied"\ + "

You don't have permission to see this page.

" + ad_script_abort + } + } + } } } }