Index: openacs-4/packages/acs-content-repository/tcl/image-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/image-procs.tcl,v diff -u -r1.18.2.4 -r1.18.2.5 --- openacs-4/packages/acs-content-repository/tcl/image-procs.tcl 26 Feb 2021 19:20:06 -0000 1.18.2.4 +++ openacs-4/packages/acs-content-repository/tcl/image-procs.tcl 24 Nov 2022 14:45:54 -0000 1.18.2.5 @@ -383,7 +383,7 @@ set revision_id [content::item::get_best_revision -item_id $item_id] } set original_filename [content::revision::get_cr_file_path -revision_id $revision_id] - set tmp_filename [ns_mktemp "[ad_tmpdir]/XXXXXX"] + set tmp_filename [ad_tmpnam "[ad_tmpdir]/XXXXXX"] array set sizes [image::get_convert_to_sizes] if {[catch {exec [image::convert_binary] -resize $sizes($size_name) $original_filename $tmp_filename} errmsg]} { Index: openacs-4/packages/acs-content-repository/tcl/test/content-image-test-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/test/content-image-test-procs.tcl,v diff -u -r1.9.2.1 -r1.9.2.2 --- openacs-4/packages/acs-content-repository/tcl/test/content-image-test-procs.tcl 16 Feb 2021 20:59:03 -0000 1.9.2.1 +++ openacs-4/packages/acs-content-repository/tcl/test/content-image-test-procs.tcl 24 Nov 2022 14:45:54 -0000 1.9.2.2 @@ -103,7 +103,7 @@ set tmp_filename "$::acs::rootdir/packages/acs-content-repository/tcl/test/test-image-1.jpg" set image_item_id_orig [db_nextval "acs_object_id_seq"] - set image_name [ns_mktemp "XXXXXX"] + set image_name [ad_tmpnam "XXXXXX"] set image_item_id [image::new \ -item_id $image_item_id_orig \ -parent_id $first_folder_id \ Index: openacs-4/packages/acs-content-repository/tcl/test/content-item-test-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/test/content-item-test-procs.tcl,v diff -u -r1.13.2.8 -r1.13.2.9 --- openacs-4/packages/acs-content-repository/tcl/test/content-item-test-procs.tcl 31 Jan 2022 15:38:23 -0000 1.13.2.8 +++ openacs-4/packages/acs-content-repository/tcl/test/content-item-test-procs.tcl 24 Nov 2022 14:45:54 -0000 1.13.2.9 @@ -418,7 +418,7 @@ ######################################################### # new from tmpfile ######################################################### - set tmp_item_name [ns_mktemp "__content_item_test_XXXXXX"] + set tmp_item_name [ad_tmpnam "__content_item_test_XXXXXX"] set tmp_item_id [content::item::new \ -name $tmp_item_name \ -title $tmp_item_name \ Index: openacs-4/packages/acs-content-repository/tcl/test/content-search-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/test/content-search-procs.tcl,v diff -u -r1.6.2.4 -r1.6.2.5 --- openacs-4/packages/acs-content-repository/tcl/test/content-search-procs.tcl 27 Jan 2022 09:23:58 -0000 1.6.2.4 +++ openacs-4/packages/acs-content-repository/tcl/test/content-search-procs.tcl 24 Nov 2022 14:45:54 -0000 1.6.2.5 @@ -51,7 +51,7 @@ } { setup test environment for search trigger tests } { - set folder_name [ns_mktemp cr_item_search_XXXXXX] + set folder_name [ad_tmpnam cr_item_search_XXXXXX] set folder_id [content::folder::new -name $folder_name] content::folder::register_content_type -folder_id $folder_id -content_type content_revision -include_subtypes t return $folder_id @@ -86,7 +86,7 @@ -test_code \ { set folder_id [cr_item_search::test_setup] - set item_name [ns_mktemp cr_itemXXXXXX] + set item_name [ad_tmpnam cr_itemXXXXXX] # test new item, not live set item_id [content::item::new \ Index: openacs-4/packages/acs-tcl/tcl/test/application-data-link-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/application-data-link-procs.tcl,v diff -u -r1.8.2.2 -r1.8.2.3 --- openacs-4/packages/acs-tcl/tcl/test/application-data-link-procs.tcl 15 Feb 2021 17:53:27 -0000 1.8.2.2 +++ openacs-4/packages/acs-tcl/tcl/test/application-data-link-procs.tcl 24 Nov 2022 14:45:54 -0000 1.8.2.3 @@ -44,7 +44,7 @@ } { aa_run_with_teardown -rollback -test_code { # create some test objects - set name [ns_mktemp "cr_item__XXXXXX"] + set name [ad_tmpnam "cr_item__XXXXXX"] for {set i 0} {$i<10} {incr i} { set o($i) [content::item::new \ @@ -139,7 +139,7 @@ } { aa_run_with_teardown -rollback -test_code { # create some test objects - set name [ns_mktemp "cr_item__XXXXXX"] + set name [ad_tmpnam "cr_item__XXXXXX"] for {set i 0} {$i<10} {incr i} { set o($i) [content::item::new \ @@ -216,7 +216,7 @@ } { aa_run_with_teardown -rollback -test_code { # create some test objects - set name [ns_mktemp "cr_item__XXXXXX"] + set name [ad_tmpnam "cr_item__XXXXXX"] for {set i 0} {$i<6} {incr i} { set o($i) [content::item::new \ Index: openacs-4/packages/assessment/tcl/test/as-assessment-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/test/as-assessment-procs.tcl,v diff -u -r1.6.2.3 -r1.6.2.4 --- openacs-4/packages/assessment/tcl/test/as-assessment-procs.tcl 19 Feb 2021 14:19:24 -0000 1.6.2.3 +++ openacs-4/packages/assessment/tcl/test/as-assessment-procs.tcl 24 Nov 2022 14:45:55 -0000 1.6.2.4 @@ -134,7 +134,7 @@ -rollback \ -test_code { - set folder_name [ns_mktemp as_folder_XXXXXX] + set folder_name [ad_tmpnam as_folder_XXXXXX] set folder_id [content::folder::new \ -name $folder_name \ -label $folder_name \ @@ -174,7 +174,7 @@ -rollback \ -test_code { - set folder_name [ns_mktemp as_folder_XXXXXX] + set folder_name [ad_tmpnam as_folder_XXXXXX] set folder_id [content::folder::new \ -name $folder_name \ -label $folder_name \ @@ -219,7 +219,7 @@ -rollback \ -test_code { - set folder_name [ns_mktemp as_folder_XXXXXX] + set folder_name [ad_tmpnam as_folder_XXXXXX] set folder_id [content::folder::new \ -name $folder_name \ -label $folder_name \ @@ -256,7 +256,7 @@ -rollback \ -test_code { - set folder_name [ns_mktemp as_folder_XXXXXX] + set folder_name [ad_tmpnam as_folder_XXXXXX] set folder_id [content::folder::new \ -name $folder_name \ -label $folder_name \ Index: openacs-4/packages/assessment/tcl/test/as-item-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/test/as-item-procs.tcl,v diff -u -r1.5.2.2 -r1.5.2.3 --- openacs-4/packages/assessment/tcl/test/as-item-procs.tcl 19 Feb 2021 14:19:24 -0000 1.5.2.2 +++ openacs-4/packages/assessment/tcl/test/as-item-procs.tcl 24 Nov 2022 14:45:55 -0000 1.5.2.3 @@ -23,7 +23,7 @@ -rollback \ -test_code { - set folder_name [ns_mktemp as_folder_XXXXXX] + set folder_name [ad_tmpnam as_folder_XXXXXX] set folder_id [content::folder::new \ -name $folder_name \ -label $folder_name \ Index: openacs-4/packages/assessment/tcl/test/twt-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/test/twt-procs.tcl,v diff -u -r1.6.2.3 -r1.6.2.4 --- openacs-4/packages/assessment/tcl/test/twt-procs.tcl 15 Sep 2022 11:10:02 -0000 1.6.2.3 +++ openacs-4/packages/assessment/tcl/test/twt-procs.tcl 24 Nov 2022 14:45:55 -0000 1.6.2.4 @@ -11,8 +11,8 @@ } ::tclwebtest::init - set assessment_name "__test [ns_mktemp XXXXXX]" - set assessment_url "__test_[ns_mktemp XXXXXX]" + set assessment_name "__test [ad_tmpnam XXXXXX]" + set assessment_url "__test_[ad_tmpnam XXXXXX]" aa_log "Assessment url = '${assessment_url}'" aa_log "Assessment name = '${assessment_name}'" Index: openacs-4/packages/dotlrn-fs/tcl/test/dotlrn-fs-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-fs/tcl/test/dotlrn-fs-procs.tcl,v diff -u -r1.4.2.4 -r1.4.2.5 --- openacs-4/packages/dotlrn-fs/tcl/test/dotlrn-fs-procs.tcl 21 Aug 2020 18:09:55 -0000 1.4.2.4 +++ openacs-4/packages/dotlrn-fs/tcl/test/dotlrn-fs-procs.tcl 24 Nov 2022 14:45:55 -0000 1.4.2.5 @@ -29,7 +29,7 @@ # create a test instance of file storage set fs_package_id \ [site_node::instantiate_and_mount \ - -node_name [ns_mktemp "__test__XXXXXX"] \ + -node_name [ad_tmpnam "__test__XXXXXX"] \ -package_key file-storage] # get the user folder and shared folders set user_root_folder_name \