Index: openacs-4/packages/categories/categories.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/categories.info,v diff -u -r1.21.2.2 -r1.21.2.3 --- openacs-4/packages/categories/categories.info 17 Apr 2019 09:07:08 -0000 1.21.2.2 +++ openacs-4/packages/categories/categories.info 3 May 2020 17:39:48 -0000 1.21.2.3 @@ -10,7 +10,7 @@ t categories - + timo@timohentschel.de Manage categories in category trees and let users map objects to categories. 2017-08-06 @@ -19,8 +19,9 @@ GPL 1 - + + Index: openacs-4/packages/categories/lib/contributions.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/lib/contributions.tcl,v diff -u -r1.5.2.1 -r1.5.2.2 --- openacs-4/packages/categories/lib/contributions.tcl 20 Nov 2019 13:24:52 -0000 1.5.2.1 +++ openacs-4/packages/categories/lib/contributions.tcl 3 May 2020 17:39:48 -0000 1.5.2.2 @@ -117,7 +117,7 @@ } if {$packages ne ""} { - append restrict "\nand o.package_id in ([join $packages ,])" + append restrict "\nand o.package_id in ([ns_dbquotelist $packages])" } # JCDXXX: TODO: need to get the dimension to display, need to find the right CoP, permissions Index: openacs-4/packages/categories/www/cadmin/category-link-add-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-link-add-3.tcl,v diff -u -r1.8.2.2 -r1.8.2.3 --- openacs-4/packages/categories/www/cadmin/category-link-add-3.tcl 20 Dec 2019 21:18:10 -0000 1.8.2.2 +++ openacs-4/packages/categories/www/cadmin/category-link-add-3.tcl 3 May 2020 17:39:48 -0000 1.8.2.3 @@ -20,7 +20,7 @@ foreach link_category_id [db_list check_link_target_permissions [subst { select c.category_id as link_category_id from categories c - where c.category_id in ([join $link_category_id ,]) + where c.category_id in ([ns_dbquotelist $link_category_id]) and acs_permission.permission_p(c.tree_id,:user_id,'category_tree_write') = 't' and c.category_id <> :category_id and not exists (select 1 Index: openacs-4/packages/categories/www/cadmin/category-link-add-4.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-link-add-4.tcl,v diff -u -r1.8.2.2 -r1.8.2.3 --- openacs-4/packages/categories/www/cadmin/category-link-add-4.tcl 20 Dec 2019 21:18:10 -0000 1.8.2.2 +++ openacs-4/packages/categories/www/cadmin/category-link-add-4.tcl 3 May 2020 17:39:48 -0000 1.8.2.3 @@ -20,7 +20,7 @@ foreach forward_category_id [db_list check_link_forward_permissions [subst { select c.category_id as link_category_id from categories c - where c.category_id in ([join $link_category_id ,]) + where c.category_id in ([ns_dbquotelist $link_category_id]) and acs_permission.permission_p(c.tree_id,:user_id,'category_tree_write') = 't' and c.category_id <> :category_id and not exists (select 1 @@ -34,7 +34,7 @@ foreach backward_category_id [db_list check_link_backward_permissions [subst { select c.category_id as link_category_id from categories c - where c.category_id in ([join $link_category_id ,]) + where c.category_id in ([ns_dbquotelist $link_category_id]) and acs_permission.permission_p(c.tree_id,:user_id,'category_tree_write') = 't' and c.category_id <> :category_id and not exists (select 1 Index: openacs-4/packages/categories/www/cadmin/category-link-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-link-delete-2.tcl,v diff -u -r1.9.2.2 -r1.9.2.3 --- openacs-4/packages/categories/www/cadmin/category-link-delete-2.tcl 20 Dec 2019 21:18:10 -0000 1.9.2.2 +++ openacs-4/packages/categories/www/cadmin/category-link-delete-2.tcl 3 May 2020 17:39:48 -0000 1.9.2.3 @@ -20,7 +20,7 @@ foreach link_id [db_list check_category_link_permissions [subst { select l.link_id from category_links l, categories c - where l.link_id in ([join $link_id ,]) + where l.link_id in ([ns_dbquotelist $link_id]) and acs_permission.permission_p(c.tree_id,:user_id,'category_tree_write') = 't' and ((l.from_category_id = :category_id and l.to_category_id = c.category_id) Index: openacs-4/packages/categories/www/cadmin/category-link-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-link-delete.tcl,v diff -u -r1.9.2.3 -r1.9.2.4 --- openacs-4/packages/categories/www/cadmin/category-link-delete.tcl 20 Dec 2019 21:18:10 -0000 1.9.2.3 +++ openacs-4/packages/categories/www/cadmin/category-link-delete.tcl 3 May 2020 17:39:48 -0000 1.9.2.4 @@ -43,7 +43,7 @@ acs_permission.permission_p(c.tree_id,:user_id,'category_tree_write') as write_p, l.link_id from category_links l, categories c - where l.link_id in ([join $link_id ,]) + where l.link_id in ([ns_dbquotelist $link_id]) and ((l.from_category_id = :category_id and l.to_category_id = c.category_id) or (l.from_category_id = c.category_id Index: openacs-4/packages/categories/www/cadmin/synonym-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/synonym-delete-2.tcl,v diff -u -r1.7.2.2 -r1.7.2.3 --- openacs-4/packages/categories/www/cadmin/synonym-delete-2.tcl 20 Dec 2019 21:18:10 -0000 1.7.2.2 +++ openacs-4/packages/categories/www/cadmin/synonym-delete-2.tcl 3 May 2020 17:39:48 -0000 1.7.2.3 @@ -20,7 +20,7 @@ foreach synonym_id [db_list check_synonyms_for_delete [subst { select s.synonym_id from category_synonyms s, categories c - where s.synonym_id in ([join $synonym_id ,]) + where s.synonym_id in ([ns_dbquotelist $synonym_id]) and c.category_id = s.category_id and acs_permission.permission_p(c.tree_id,:user_id,'category_tree_write') = 't' and s.synonym_p = 't' Index: openacs-4/packages/categories/tcl/category-trees-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/tcl/category-trees-procs.tcl,v diff -u -r1.31.2.12 -r1.31.2.13 --- openacs-4/packages/categories/tcl/category-trees-procs.tcl 25 Nov 2019 09:31:10 -0000 1.31.2.12 +++ openacs-4/packages/categories/tcl/category-trees-procs.tcl 3 May 2020 17:41:51 -0000 1.31.2.13 @@ -318,7 +318,7 @@ select tree_id, subtree_category_id, assign_single_p, require_category_p, widget from category_tree_map - where object_id in ([join $object_id_list ", "]) + where object_id in ([ns_dbquotelist $object_id_list]) }] { lappend result [list $tree_id [get_name $tree_id $locale] $subtree_category_id $assign_single_p $require_category_p $widget] } Index: openacs-4/packages/xowiki/tcl/syndicate-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/syndicate-procs.tcl,v diff -u -r1.51.2.7 -r1.51.2.8 --- openacs-4/packages/xowiki/tcl/syndicate-procs.tcl 3 May 2020 17:14:02 -0000 1.51.2.7 +++ openacs-4/packages/xowiki/tcl/syndicate-procs.tcl 3 May 2020 17:47:40 -0000 1.51.2.8 @@ -153,7 +153,7 @@ } if {[llength $folder_ids] > 1} { - set folder_select "ci.parent_id in ([join $folder_ids ,])" + set folder_select "ci.parent_id in ([ns_dbquotelist $folder_ids])" } else { set folder_select "ci.parent_id = :folder_ids" } @@ -237,7 +237,7 @@ set sql [::xo::dc select \ -vars * \ -from "xowiki_podcast_itemi p, cr_items ci, cr_mime_types m" \ - -where "ci.parent_id in ([join $folder_ids ,]) and ci.item_id = p.item_id \ + -where "ci.parent_id in ([ns_dbquotelist $folder_ids]) and ci.item_id = p.item_id \ and ci.live_revision = p.object_id \ and p.mime_type = m.mime_type \ and ci.publish_status <> 'production' [:extra_where_clause]" \ @@ -286,7 +286,7 @@ -from "cr_items ci, cr_revisions cr, acs_objects o, acs_objects o2" \ -where "cr.item_id = ci.item_id and o.object_id = cr.revision_id and o2.object_id = cr.item_id - and ci.parent_id in ([join $folder_ids ,]) and o.creation_user is not null + and ci.parent_id in ([ns_dbquotelist $folder_ids]) and o.creation_user is not null $where_clause" \ -orderby "revision_id desc" \ -limit $limit]