Index: openacs-4/packages/acs-admin/lib/service-parameters-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/lib/Attic/service-parameters-oracle.xql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-admin/lib/service-parameters-oracle.xql 19 Sep 2003 15:18:01 -0000 1.4 +++ openacs-4/packages/acs-admin/lib/service-parameters-oracle.xql 23 Jan 2004 14:29:25 -0000 1.5 @@ -13,10 +13,6 @@ apm_package_types where ap.package_key = apm_package_types.package_key and package_type = 'apm_service' - and ( - acs_permission.permission_p(package_id, :user_id, 'read') = 't' - or acs_permission.permission_p(package_id, acs.magic_object_id('the_public'), 'read') = 't' - ) and (ap.package_key != 'acs-subsite' or (select parent_id from site_nodes where object_id = package_id) is null) order by instance_name Index: openacs-4/packages/acs-admin/lib/service-parameters-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/lib/Attic/service-parameters-postgresql.xql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-admin/lib/service-parameters-postgresql.xql 19 Sep 2003 15:18:01 -0000 1.4 +++ openacs-4/packages/acs-admin/lib/service-parameters-postgresql.xql 23 Jan 2004 14:29:25 -0000 1.5 @@ -13,10 +13,6 @@ apm_package_types where ap.package_key = apm_package_types.package_key and package_type = 'apm_service' - and ( - acs_permission__permission_p(package_id, :user_id, 'read') = 't' - or acs_permission__permission_p(package_id, acs__magic_object_id('the_public'), 'read') = 't' - ) and (ap.package_key != 'acs-subsite' or (select parent_id from site_nodes where object_id = package_id) is null) order by instance_name Index: openacs-4/packages/acs-admin/lib/service-parameters.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/lib/service-parameters.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-admin/lib/service-parameters.tcl 11 Dec 2003 21:39:45 -0000 1.4 +++ openacs-4/packages/acs-admin/lib/service-parameters.tcl 23 Jan 2004 14:29:25 -0000 1.5 @@ -3,6 +3,13 @@ # +if { ![acs_user::site_wide_admin_p] } { + ad_return_forbidden \ + "Permission Denied" \ + "
You don't have permission to view this page.
" + ad_script_abort +} + set user_id [ad_conn user_id] set swadmin_p 0 db_multirow -extend { url admin_url param_url } packages services_select {} {