Index: openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl,v diff -u -r1.114.2.25 -r1.114.2.26 --- openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl 1 Nov 2021 10:41:22 -0000 1.114.2.25 +++ openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl 10 Feb 2022 21:33:44 -0000 1.114.2.26 @@ -1797,7 +1797,7 @@ and u.user_id = m.member_id and u.member_state = 'approved' and u.authority_id <> :authority_id - and acs_permission.permission_p(amo.object_id, u.user_id, 'admin') + and acs_permission.permission_p(amo.object_id, u.user_id, 'admin') = 't' ) }] } Index: openacs-4/packages/acs-authentication/tcl/test/authentication-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/test/authentication-procs.tcl,v diff -u -r1.1.2.14 -r1.1.2.15 --- openacs-4/packages/acs-authentication/tcl/test/authentication-procs.tcl 7 Oct 2021 12:37:46 -0000 1.1.2.14 +++ openacs-4/packages/acs-authentication/tcl/test/authentication-procs.tcl 10 Feb 2022 21:33:44 -0000 1.1.2.15 @@ -37,7 +37,7 @@ and u.user_id = m.member_id and u.member_state = 'approved' and u.authority_id <> :authority_id - and acs_permission.permission_p(amo.object_id, u.user_id, 'admin') + and acs_permission.permission_p(amo.object_id, u.user_id, 'admin') = 't' ) }] aa_equals "Proc should return $expected for authority $authority_id" \ @@ -62,7 +62,7 @@ and p.grantee_id = m.party_id and u.user_id = m.member_id and u.member_state = 'approved' - and acs_permission.permission_p(amo.object_id, u.user_id, 'admin') + and acs_permission.permission_p(amo.object_id, u.user_id, 'admin') = 't' }] { permission::revoke \ -party_id $user_id \ Index: openacs-4/packages/acs-lang/sql/oracle/message-catalog.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/sql/oracle/message-catalog.sql,v diff -u -r1.15.2.1 -r1.15.2.2 --- openacs-4/packages/acs-lang/sql/oracle/message-catalog.sql 25 Aug 2020 13:38:12 -0000 1.15.2.1 +++ openacs-4/packages/acs-lang/sql/oracle/message-catalog.sql 10 Feb 2022 21:33:44 -0000 1.15.2.2 @@ -16,6 +16,11 @@ timezone varchar2(100) ); + +-- The column object_id allows to bind the message key to the +-- lifetime of an acs_object: upon object's deletion, the message +-- key will be automatically deleted from the system. + create table lang_message_keys ( message_key varchar2(200) constraint lang_message_keys_m_key_nn @@ -26,14 +31,10 @@ on delete cascade constraint lang_message_keys_p_key_nn not null, - - -- This optional column allows to bind the message key to the - -- lifetime of an acs_object: upon object's deletion, the message - -- key will be automatically deleted from the system. - object_id integer constraint lang_message_keys_object_id_fk + object_id integer + constraint lang_message_keys_object_id_fk references acs_objects(object_id) on delete cascade, - description clob, constraint lang_message_keys_pk primary key (message_key, package_key) Index: openacs-4/packages/acs-tcl/tcl/20-memoize-init.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/20-memoize-init.tcl,v diff -u -r1.7.2.4 -r1.7.2.5 --- openacs-4/packages/acs-tcl/tcl/20-memoize-init.tcl 27 Oct 2021 16:42:14 -0000 1.7.2.4 +++ openacs-4/packages/acs-tcl/tcl/20-memoize-init.tcl 10 Feb 2022 21:33:44 -0000 1.7.2.5 @@ -4,6 +4,7 @@ # # Create the cache used by util_memoize. # +set ::acs::kernel_id [ad_acs_kernel_id] ns_cache create util_memoize -size \ [parameter::get -package_id $::acs::kernel_id -parameter MaxSize -default 200000] Index: openacs-4/packages/acs-tcl/tcl/acs-kernel-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/acs-kernel-procs.tcl,v diff -u -r1.13.2.3 -r1.13.2.4 --- openacs-4/packages/acs-tcl/tcl/acs-kernel-procs.tcl 18 Feb 2021 14:50:20 -0000 1.13.2.3 +++ openacs-4/packages/acs-tcl/tcl/acs-kernel-procs.tcl 10 Feb 2022 21:33:44 -0000 1.13.2.4 @@ -25,7 +25,7 @@ and p.object_id = amo.object_id and p.grantee_id = m.party_id and u.user_id = m.member_id - and acs_permission.permission_p(amo.object_id, u.user_id, 'admin') + and acs_permission.permission_p(amo.object_id, u.user_id, 'admin') = 't' ) } -default 0] } Index: openacs-4/packages/acs-tcl/tcl/apm-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.tcl,v diff -u -r1.114.2.38 -r1.114.2.39 --- openacs-4/packages/acs-tcl/tcl/apm-procs.tcl 13 Dec 2021 13:26:39 -0000 1.114.2.38 +++ openacs-4/packages/acs-tcl/tcl/apm-procs.tcl 10 Feb 2022 21:33:44 -0000 1.114.2.39 @@ -1887,7 +1887,7 @@ select package_id from apm_package_types t, apm_packages p - where t.singleton_p + where t.singleton_p = 't' and t.package_key = p.package_key and t.package_key = :package_key}] } { @@ -2028,8 +2028,9 @@ db_foreach package_types { select package_key, pretty_name from apm_package_types t - where not (singleton_p and exists (select 1 from apm_packages - where package_key = t.package_key)) + where not (singleton_p = 't' + and exists (select 1 from apm_packages + where package_key = t.package_key)) order by pretty_name } { lappend options [subst {}]