Index: openacs-4/packages/acs-admin/acs-admin.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/acs-admin.info,v
diff -u -N -r1.45.2.8 -r1.45.2.9
--- openacs-4/packages/acs-admin/acs-admin.info 2 Oct 2013 10:11:34 -0000 1.45.2.8
+++ openacs-4/packages/acs-admin/acs-admin.info 1 Apr 2014 18:37:30 -0000 1.45.2.9
@@ -7,7 +7,7 @@
t
t
-
+
Don Baccus
An interface for Site-wide administration of an OpenACS Installation.
3
@@ -19,7 +19,7 @@
(including package installation, cache, authentication, and user accounts) for an OpenACS system.
-
+
Index: openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl,v
diff -u -N -r1.18.8.7 -r1.18.8.8
--- openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl 17 Oct 2013 08:44:30 -0000 1.18.8.7
+++ openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl 1 Apr 2014 18:37:31 -0000 1.18.8.8
@@ -492,7 +492,7 @@
# The path to the 'packages' directory in the checkout
set packages_root_path [file join {*}[lrange [file split $spec_file] 0 end-2]]
- set tmp_filename [ns_tmpnam]
+ set tmp_filename [ad_tmpnam]
lappend cmd --files-from $tmp_filename -C $packages_root_path
set fp [open $tmp_filename w]
Index: openacs-4/packages/acs-subsite/acs-subsite.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/acs-subsite.info,v
diff -u -N -r1.114.2.7 -r1.114.2.8
--- openacs-4/packages/acs-subsite/acs-subsite.info 30 Sep 2013 07:09:30 -0000 1.114.2.7
+++ openacs-4/packages/acs-subsite/acs-subsite.info 1 Apr 2014 18:37:31 -0000 1.114.2.8
@@ -9,7 +9,7 @@
t
t
-
+
OpenACS
Subsite
2013-09-30
@@ -18,7 +18,7 @@
GPL
3
-
+
Index: openacs-4/packages/acs-subsite/www/shared/1pixel.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/1pixel.tcl,v
diff -u -N -r1.5 -r1.5.2.1
--- openacs-4/packages/acs-subsite/www/shared/1pixel.tcl 30 Mar 2013 19:07:24 -0000 1.5
+++ openacs-4/packages/acs-subsite/www/shared/1pixel.tcl 1 Apr 2014 18:37:31 -0000 1.5.2.1
@@ -23,7 +23,7 @@
# insist on UTF8-encoding it). So we write to a file, then dump
# the file's contents.
- set file_name [ns_tmpnam]
+ set file_name [ad_tmpnam]
ns_log "Notice" "logging to $file_name"
set file [open $file_name w+]
fconfigure $file -encoding binary -translation binary
Index: openacs-4/packages/acs-tcl/acs-tcl.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/acs-tcl.info,v
diff -u -N -r1.67.2.10 -r1.67.2.11
--- openacs-4/packages/acs-tcl/acs-tcl.info 31 Mar 2014 18:24:12 -0000 1.67.2.10
+++ openacs-4/packages/acs-tcl/acs-tcl.info 1 Apr 2014 18:37:31 -0000 1.67.2.11
@@ -7,7 +7,7 @@
t
t
-
+
OpenACS
The Kernel Tcl API library.
2013-09-08
@@ -18,7 +18,7 @@
GPL version 2
3
-
+
Index: openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl,v
diff -u -N -r1.86.2.12 -r1.86.2.13
--- openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl 10 Feb 2014 20:56:00 -0000 1.86.2.12
+++ openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl 1 Apr 2014 18:37:31 -0000 1.86.2.13
@@ -2647,7 +2647,7 @@
oracle {
set user_pass [db_get_sql_user -dbn $dbn]
- set tmpnam [ns_tmpnam]
+ set tmpnam [ad_tmpnam]
set fd [open $file r]
set file_contents [read $fd]
Index: openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl,v
diff -u -N -r1.35.8.11 -r1.35.8.12
--- openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl 31 Mar 2014 13:11:08 -0000 1.35.8.11
+++ openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl 1 Apr 2014 18:37:31 -0000 1.35.8.12
@@ -136,7 +136,7 @@
} {
- set apm_file [ns_tmpnam]
+ set apm_file [ad_tmpnam]
db_blob_get_file distribution_tar_ball_select {
select content
@@ -163,7 +163,7 @@
} {
set package_key [apm_package_key_from_version_id $version_id]
set files [apm_get_package_files -all_db_types -package_key $package_key]
- set tmpfile [ns_tmpnam]
+ set tmpfile [ad_tmpnam]
db_1row package_key_select {
select package_key
@@ -569,7 +569,7 @@
} {
# First download the apm file if a URL is provided
if { $url ne "" } {
- set file_path [ns_tmpnam].apm
+ set file_path [ad_tmpnam].apm
apm_callback_and_log $callback "Downloading $url..."
if { [catch {apm_transfer_file -url $url -output_file_name $file_path} errmsg] } {
apm_callback_and_log $callback "Unable to download. Please check your URL..
@@ -639,7 +639,7 @@
}
apm_callback_and_log $callback "Extracting the .info file ($info_file)..."
- set tmpdir [ns_tmpnam]
+ set tmpdir [ad_tmpnam]
file mkdir $tmpdir
exec [apm_gzip_cmd] -d -q -c -S .apm $file_path | [apm_tar_cmd] -xf - -C $tmpdir $info_file 2> [apm_dev_null]
Index: openacs-4/packages/acs-tcl/tcl/pdf-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/pdf-procs.tcl,v
diff -u -N -r1.2 -r1.2.12.1
--- openacs-4/packages/acs-tcl/tcl/pdf-procs.tcl 4 Jun 2006 00:45:47 -0000 1.2
+++ openacs-4/packages/acs-tcl/tcl/pdf-procs.tcl 1 Apr 2014 18:37:31 -0000 1.2.12.1
@@ -29,7 +29,7 @@
@return the pdf-file-name
} {
- set tmp_filename [ns_tmpnam]
+ set tmp_filename [ad_tmpnam]
# create html.file
set html_content [create_html_content -template_id $template_id -set_var_call $set_var_call]
set tmp_html_filename "${tmp_filename}.html"
@@ -61,7 +61,7 @@
@param html_content HTML Content that is transformed into PDF
@return filename of the pdf file
} {
- set tmp_filename [ns_tmpnam]
+ set tmp_filename [ad_tmpnam]
set tmp_html_filename "${tmp_filename}.html"
set fp [open $tmp_html_filename w]
puts $fp $html_content
Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v
diff -u -N -r1.133.2.34 -r1.133.2.35
--- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 31 Mar 2014 06:16:54 -0000 1.133.2.34
+++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 1 Apr 2014 18:37:32 -0000 1.133.2.35
@@ -4417,8 +4417,8 @@
set new [$filter_proc $new]
}
- set old_f [ns_tmpnam]
- set new_f [ns_tmpnam]
+ set old_f [ad_tmpnam]
+ set new_f [ad_tmpnam]
set old_fd [open $old_f "w"]
set new_fd [open $new_f "w"]
puts $old_fd [join [split $old $split_by] "\n"]
@@ -4838,3 +4838,10 @@
return $result
}
}
+
+ad_proc ad_tmpnam {{template "oacs-XXXXXX"}} {
+ A stub function to replace the deprecated "ns_tmpnam",
+ which uses the deprecated C-library function "tmpnam()"
+} {
+ ns_mktemp $template
+}
Index: openacs-4/packages/file-storage/file-storage.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/file-storage.info,v
diff -u -N -r1.54.2.5 -r1.54.2.6
--- openacs-4/packages/file-storage/file-storage.info 3 Oct 2013 08:33:56 -0000 1.54.2.5
+++ openacs-4/packages/file-storage/file-storage.info 1 Apr 2014 18:37:32 -0000 1.54.2.6
@@ -7,7 +7,7 @@
f
f
-
+
OpenACS
Collaborative document storage
2013-09-08
@@ -17,7 +17,7 @@
2
#file-storage.file-storage#
-
+
Index: openacs-4/packages/file-storage/tcl/file-storage-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs.tcl,v
diff -u -N -r1.67.2.7 -r1.67.2.8
--- openacs-4/packages/file-storage/tcl/file-storage-procs.tcl 3 Oct 2013 08:33:57 -0000 1.67.2.7
+++ openacs-4/packages/file-storage/tcl/file-storage-procs.tcl 1 Apr 2014 18:37:32 -0000 1.67.2.8
@@ -512,7 +512,7 @@
publish a file storage object to the file system
} {
if {$path eq ""} {
- set path [ns_tmpnam]
+ set path [ad_tmpnam]
}
db_1row select_object_info {}
@@ -544,7 +544,7 @@
publish the contents of a file storage folder to the file system
} {
if {$path eq ""} {
- set path [ns_tmpnam]
+ set path [ad_tmpnam]
}
if {$folder_name eq ""} {
@@ -576,7 +576,7 @@
(which at least KDE also knows how to handle)
} {
if {$path eq ""} {
- set path [ns_tmpnam]
+ set path [ad_tmpnam]
file mkdir $path
}
@@ -604,7 +604,7 @@
publish an object to the file system
} {
if {$path eq ""} {
- set path [ns_tmpnam]
+ set path [ad_tmpnam]
file mkdir $path
}
Index: openacs-4/packages/file-storage/www/download-zip.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/download-zip.tcl,v
diff -u -N -r1.6.6.1 -r1.6.6.2
--- openacs-4/packages/file-storage/www/download-zip.tcl 9 Oct 2013 06:36:14 -0000 1.6.6.1
+++ openacs-4/packages/file-storage/www/download-zip.tcl 1 Apr 2014 18:37:32 -0000 1.6.6.2
@@ -11,7 +11,7 @@
set user_id [ad_conn user_id]
# publish the object to the file system
-set in_path [ns_tmpnam]
+set in_path [ad_tmpnam]
file mkdir $in_path
if {[llength $object_id] == 1} {
@@ -35,7 +35,7 @@
}
# create a temp dir to put the archive in
-set out_path [ns_tmpnam]
+set out_path [ad_tmpnam]
file mkdir $out_path
set out_file [file join ${out_path} ${download_name}]
Index: openacs-4/packages/file-storage/www/file-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file-add.tcl,v
diff -u -N -r1.17.2.4 -r1.17.2.5
--- openacs-4/packages/file-storage/www/file-add.tcl 5 Oct 2013 08:30:36 -0000 1.17.2.4
+++ openacs-4/packages/file-storage/www/file-add.tcl 1 Apr 2014 18:37:32 -0000 1.17.2.5
@@ -147,7 +147,7 @@
}
if { $unpack_p && $unpack_binary ne "" && [file extension [template::util::file::get_property filename $upload_file]] eq ".zip" } {
- set path [ns_tmpnam]
+ set path [ad_tmpnam]
file mkdir $path
@@ -177,7 +177,7 @@
# create a tmp file to import from user entered HTML
set content_body [template::util::richtext::get_property html_value $content_body]
set mime_type text/html
- set tmp_filename [ns_tmpnam]
+ set tmp_filename [ad_tmpnam]
set fd [open $tmp_filename w]
puts $fd $content_body
close $fd
Index: openacs-4/packages/file-storage/www/folder-zip-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-zip-add.tcl,v
diff -u -N -r1.4.6.3 -r1.4.6.4
--- openacs-4/packages/file-storage/www/folder-zip-add.tcl 3 Oct 2013 08:33:58 -0000 1.4.6.3
+++ openacs-4/packages/file-storage/www/folder-zip-add.tcl 1 Apr 2014 18:37:32 -0000 1.4.6.4
@@ -97,7 +97,7 @@
if { $unzip_binary ne "" } {
- set unzip_path [ns_tmpnam]
+ set unzip_path [ad_tmpnam]
file mkdir $unzip_path
# save paths! get rid of -j switch --DAVEB 20050628
catch { exec $unzip_binary -d $unzip_path ${upload_file.tmpfile} } errmsg
Index: openacs-4/packages/oacs-dav/oacs-dav.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/oacs-dav/oacs-dav.info,v
diff -u -N -r1.10.2.4 -r1.10.2.5
--- openacs-4/packages/oacs-dav/oacs-dav.info 25 Sep 2013 09:31:47 -0000 1.10.2.4
+++ openacs-4/packages/oacs-dav/oacs-dav.info 1 Apr 2014 18:37:32 -0000 1.10.2.5
@@ -8,15 +8,15 @@
t
webdav-support
-
+
Dave Bauer
Provides services to enable webDAV access to content repository items.
2013-09-08
OpenACS
1
An interface to the tDAV webDAV package. oacs-dav provides services to offer webDAV access to content repository data.
-
+
Index: openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl,v
diff -u -N -r1.12.2.1 -r1.12.2.2
--- openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl 11 Oct 2013 18:19:56 -0000 1.12.2.1
+++ openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl 1 Apr 2014 18:37:32 -0000 1.12.2.2
@@ -115,7 +115,7 @@
proc tdav::read_xml {} {
set fp ""
while {$fp eq ""} {
- set tmpfile [ns_tmpnam]
+ set tmpfile [ad_tmpnam]
set fp [ns_openexcl $tmpfile]
}
#fconfigure $fp -translation binary -encoding binary
@@ -791,7 +791,7 @@
proc tdav::filter_webdav_put {args} {
- set tmpfile [ns_tmpnam]
+ set tmpfile [ad_tmpnam]
set fd [open $tmpfile w+]
ns_writecontent $fd
close $fd
Index: openacs-4/packages/search/search.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/search.info,v
diff -u -N -r1.41.2.7 -r1.41.2.8
--- openacs-4/packages/search/search.info 1 Oct 2013 07:18:11 -0000 1.41.2.7
+++ openacs-4/packages/search/search.info 1 Apr 2014 18:37:33 -0000 1.41.2.8
@@ -9,7 +9,7 @@
f
t
-
+
OpenACS
Site wide search
2013-10-01
@@ -18,7 +18,7 @@
GPL version 2
3
-
+
Index: openacs-4/packages/search/tcl/search-convert-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/tcl/search-convert-procs.tcl,v
diff -u -N -r1.3.10.2 -r1.3.10.3
--- openacs-4/packages/search/tcl/search-convert-procs.tcl 14 Nov 2013 10:56:21 -0000 1.3.10.2
+++ openacs-4/packages/search/tcl/search-convert-procs.tcl 1 Apr 2014 18:37:33 -0000 1.3.10.3
@@ -22,7 +22,7 @@
@creation-date 2005-06-25
} {
- set tmp_filename [ns_tmpnam]
+ set tmp_filename [ad_tmpnam]
set result ""
switch $mime_type {
Index: openacs-4/packages/search/tcl/search-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/tcl/search-procs.tcl,v
diff -u -N -r1.47.6.3 -r1.47.6.4
--- openacs-4/packages/search/tcl/search-procs.tcl 14 Nov 2013 10:56:21 -0000 1.47.6.3
+++ openacs-4/packages/search/tcl/search-procs.tcl 1 Apr 2014 18:37:33 -0000 1.47.6.4
@@ -291,7 +291,7 @@
# Write content to a file and let the filter below extract the
# words for the index from the file.
#
- set tmp_filename [ns_tmpnam]
+ set tmp_filename [ad_tmpnam]
set f [open $tmp_filename w]
puts $f $data
close $f
Index: openacs-4/packages/xotcl-core/xotcl-core.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/xotcl-core.info,v
diff -u -N -r1.89.2.8 -r1.89.2.9
--- openacs-4/packages/xotcl-core/xotcl-core.info 26 Mar 2014 18:10:36 -0000 1.89.2.8
+++ openacs-4/packages/xotcl-core/xotcl-core.info 1 Apr 2014 18:37:33 -0000 1.89.2.9
@@ -10,7 +10,7 @@
t
xotcl
-
+
Gustaf Neumann
XOTcl library functionality (e.g. thread handling, online documentation, Generic Form and List Classes)
2014-03-24
@@ -48,7 +48,7 @@
BSD-Style
2
-
+
Index: openacs-4/packages/xotcl-core/tcl/bgdelivery-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/bgdelivery-procs.tcl,v
diff -u -N -r1.47.2.8 -r1.47.2.9
--- openacs-4/packages/xotcl-core/tcl/bgdelivery-procs.tcl 14 Feb 2014 18:20:44 -0000 1.47.2.8
+++ openacs-4/packages/xotcl-core/tcl/bgdelivery-procs.tcl 1 Apr 2014 18:37:33 -0000 1.47.2.9
@@ -434,7 +434,7 @@
set spooling 1
# puts -nonewline [my channel] $data
# my done
- set filename [ns_tmpnam]
+ set filename [ad_tmpnam]
set fd [open $filename w]
fconfigure $fd -translation binary -encoding $encoding
puts -nonewline $fd $data
Index: openacs-4/packages/xotcl-core/www/show-class-graph.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/www/show-class-graph.tcl,v
diff -u -N -r1.8.6.4 -r1.8.6.5
--- openacs-4/packages/xotcl-core/www/show-class-graph.tcl 14 Feb 2014 18:23:18 -0000 1.8.6.4
+++ openacs-4/packages/xotcl-core/www/show-class-graph.tcl 1 Apr 2014 18:37:33 -0000 1.8.6.5
@@ -158,7 +158,7 @@
if {$dot eq "" && [file executable /usr/bin/dot]} {set dot /usr/bin/dot}
if {$dot eq ""} {ns_return 404 plain/text "dot not found"; ad_script_abort}
-set tmpnam [ns_tmpnam]
+set tmpnam [ad_tmpnam]
set tmpfile $tmpnam.png
set f [open $tmpnam.dot w]; puts $f $dot_code; close $f
Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -N -r1.148.2.8 -r1.148.2.9
--- openacs-4/packages/xowiki/xowiki.info 26 Mar 2014 18:17:18 -0000 1.148.2.8
+++ openacs-4/packages/xowiki/xowiki.info 1 Apr 2014 18:37:33 -0000 1.148.2.9
@@ -10,7 +10,7 @@
t
xowiki
-
+
Gustaf Neumann
A xotcl-based enterprise wiki system with multiple object types
2014-02-11
@@ -55,7 +55,7 @@
BSD-Style
2
-
+
Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -N -r1.239.2.11 -r1.239.2.12
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl 26 Mar 2014 18:17:19 -0000 1.239.2.11
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl 1 Apr 2014 18:37:33 -0000 1.239.2.12
@@ -2854,7 +2854,7 @@
return 0
}
#my msg "guess mime_type of $entry_name = [::xowiki::guesstype $entry_name]"
- set import_file [ns_tmpnam]
+ set import_file [ad_tmpnam]
::xowiki::write_file $import_file $img
set file_object [::xowiki::File new -destroy_on_cleanup \
-title $entry_name \
Index: openacs-4/packages/xowiki/tcl/import-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/import-procs.tcl,v
diff -u -N -r1.27.2.5 -r1.27.2.6
--- openacs-4/packages/xowiki/tcl/import-procs.tcl 13 Mar 2014 17:28:16 -0000 1.27.2.5
+++ openacs-4/packages/xowiki/tcl/import-procs.tcl 1 Apr 2014 18:37:34 -0000 1.27.2.6
@@ -373,7 +373,7 @@
ArchiveFile instproc init {} {
my destroy_on_cleanup
::xo::db::CrClass get_instance_from_db -item_id [my parent_id]
- my set tmpdir [ns_tmpnam]
+ my set tmpdir [ad_tmpnam]
file mkdir [my set tmpdir]
}
ArchiveFile instproc delete {} {
Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -N -r1.472.2.13 -r1.472.2.14
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 26 Mar 2014 18:17:19 -0000 1.472.2.13
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 1 Apr 2014 18:37:34 -0000 1.472.2.14
@@ -658,7 +658,7 @@
if {[my exists __file_content]} {
my instvar import_file __file_content
- set import_file [ns_tmpnam]
+ set import_file [ad_tmpnam]
::xowiki::write_file $import_file [::base64::decode $__file_content]
catch {my unset full_file_name}
unset __file_content
Index: openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl,v
diff -u -N -r1.31.2.6 -r1.31.2.7
--- openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl 13 Mar 2014 12:33:09 -0000 1.31.2.6
+++ openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl 1 Apr 2014 18:37:34 -0000 1.31.2.7
@@ -42,7 +42,7 @@
&& [info commands ::util::which] ne ""} {
set tidycmd [::util::which tidy]
if {$tidycmd ne ""} {
- set in_file [ns_tmpnam]
+ set in_file [ad_tmpnam]
::xowiki::write_file $in_file $text
catch {exec $tidycmd -q -w 0 -ashtml < $in_file 2> /dev/null} output
file delete $in_file
Index: openacs-4/packages/xowiki/www/admin/test.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/test.tcl,v
diff -u -N -r1.36.2.1 -r1.36.2.2
--- openacs-4/packages/xowiki/www/admin/test.tcl 11 Feb 2014 11:58:20 -0000 1.36.2.1
+++ openacs-4/packages/xowiki/www/admin/test.tcl 1 Apr 2014 18:37:34 -0000 1.36.2.2
@@ -741,7 +741,7 @@
set mime_type [::xowiki::guesstype $name]
set f [::xowiki::File new -name $name -description "" \
-parent_id $parent_id -package_id $package_id -mime_type $mime_type]
- set import_file [ns_tmpnam]
+ set import_file [ad_tmpnam]
::xowiki::write_file $import_file [::base64::decode $file_content]
$f set import_file $import_file
}