Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-add-2.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-add-2.tcl 19 Nov 2001 18:29:29 -0000 1.2 +++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-add-2.tcl 18 Sep 2002 13:06:04 -0000 1.3 @@ -38,7 +38,7 @@ set return_url "define?[export_vars -url {workflow_key}]" } ad_returnredirect $return_url - return + ad_script_abort } set create_new_role_p 0 Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-edit-2.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-edit-2.tcl 19 Nov 2001 18:29:29 -0000 1.2 +++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-edit-2.tcl 18 Sep 2002 13:06:04 -0000 1.3 @@ -17,7 +17,7 @@ if { [info exists cancel] && ![empty_string_p $cancel] } { # User hit cancel ad_returnredirect $return_url - return + ad_script_abort } db_transaction { Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/create.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/create.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/create.tcl 6 Sep 2002 21:50:18 -0000 1.4 +++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/create.tcl 18 Sep 2002 13:06:05 -0000 1.5 @@ -17,12 +17,12 @@ if { [empty_string_p $workflow_name] } { ad_returnredirect "" - return + ad_script_abort } if { $num_tasks == 0 } { ad_returnredirect "tasks" - return + ad_script_abort } # setup loop_attribute_name, input_place Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/loops.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/loops.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/loops.tcl 6 Sep 2002 21:50:18 -0000 1.3 +++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/loops.tcl 18 Sep 2002 13:06:05 -0000 1.4 @@ -18,7 +18,7 @@ if { [empty_string_p $workflow_name] } { ad_returnredirect "" - return + ad_script_abort } wf_wizard_massage_tasks [ad_get_client_property wf tasks] task_list task tasks Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/tasks.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/tasks.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/tasks.tcl 6 Sep 2002 21:50:18 -0000 1.3 +++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/tasks.tcl 18 Sep 2002 13:06:05 -0000 1.4 @@ -14,7 +14,7 @@ if { [empty_string_p $workflow_name] } { ad_returnredirect "" - return + ad_script_abort } wf_wizard_massage_tasks [ad_get_client_property wf tasks] "" "" tasks Index: openacs-4/contrib/obsolete-packages/photo-album-lite/www/photo-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/photo-album-lite/www/photo-add-2.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/contrib/obsolete-packages/photo-album-lite/www/photo-add-2.tcl 10 Sep 2002 22:23:14 -0000 1.2 +++ openacs-4/contrib/obsolete-packages/photo-album-lite/www/photo-add-2.tcl 18 Sep 2002 13:03:18 -0000 1.3 @@ -29,6 +29,7 @@ if !$caller_id { ad_return_complaint 1 "Sorry, you don't appear to be logged in. Please log in and try again." + ad_script_abort } ad_require_permission $folder_id write @@ -38,6 +39,7 @@ set guessed_file_type [string tolower [ns_guesstype [set file$num]]] if { [lsearch [list image/gif image/jpeg application/x-zip-compressed] $guessed_file_type] < 0 } { ad_return_complaint 1 "Sorry, only GIF, JPEG, and ZIP formats are allowed at this time. Please make sure your images are in the correct format and that your filenames end in .gif or .jpg." + ad_script_abort } } } @@ -50,11 +52,13 @@ if [catch {pl_bulk_insert -use_default_date $use_default_date -use_default_prefix $use_default_prefix $folder_id [set file${num}.tmpfile]} errMsg] { global errorInfo doc_return 200 text/plain "sorry, there was an error: $errMsg" + ad_script_abort } } else { if [catch {pl_photo_insert -use_default_date $use_default_date -use_default_prefix $use_default_prefix $folder_id [set file${num}.tmpfile] [set file$num]} errMsg] { global errorInfo doc_return 200 text/plain "sorry, there was an error: $errMsg" + ad_script_abort } } Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/index.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/contrib/obsolete-packages/ticket-tracker/www/index.tcl 6 Sep 2002 06:57:03 -0000 1.3 +++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/index.tcl 18 Sep 2002 13:04:24 -0000 1.4 @@ -47,7 +47,7 @@ ad_returnredirect "admin/install/" set user_task_table "" set unassigned_task_table "" - return + ad_script_abort } # table definition for user's outstanding tasks Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/ticket-edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/ticket-edit-2.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/obsolete-packages/ticket-tracker/www/ticket-edit-2.tcl 20 Apr 2001 20:51:25 -0000 1.1 +++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/ticket-edit-2.tcl 18 Sep 2002 13:04:24 -0000 1.2 @@ -46,6 +46,7 @@ ns_log Error $errmsg ad_return_complaint 0 "There was an error updating the ticket information.

Here is the full error message:

$errmsg
" + ad_script_abort } if {[exists_and_not_null task_id]} { Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/category-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/category-delete-2.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/category-delete-2.tcl 20 Apr 2001 20:51:25 -0000 1.1 +++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/category-delete-2.tcl 18 Sep 2002 13:04:25 -0000 1.2 @@ -46,12 +46,14 @@ where package_id = :package_id }] } { db_abort_transaction ad_return_complaint 1 "
  • You cannot delete this category. There needs to be at least one category for each ticket tracker instance." + ad_script_abort } } on_error { ns_log Error "$errmsg" } } else { ad_return_complaint 1 "You cannot delete this category. There needs to be at least one category for each ticket tracker instance." + ad_script_abort } } Index: openacs-4/contrib/obsolete-packages/wap/www/admin/add-ua-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/wap/www/admin/add-ua-2.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/contrib/obsolete-packages/wap/www/admin/add-ua-2.tcl 10 Sep 2002 22:23:29 -0000 1.2 +++ openacs-4/contrib/obsolete-packages/wap/www/admin/add-ua-2.tcl 18 Sep 2002 13:05:15 -0000 1.3 @@ -12,4 +12,4 @@ wap_add_user_agent $name $creation_comment $active_p -ad_returnredirect index.tcl \ No newline at end of file +ad_returnredirect {} \ No newline at end of file Index: openacs-4/contrib/obsolete-packages/wap/www/admin/modify-ua-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/wap/www/admin/modify-ua-2.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/obsolete-packages/wap/www/admin/modify-ua-2.tcl 20 Apr 2001 20:51:23 -0000 1.1 +++ openacs-4/contrib/obsolete-packages/wap/www/admin/modify-ua-2.tcl 18 Sep 2002 13:05:15 -0000 1.2 @@ -14,4 +14,4 @@ wap_modify_user_agent $user_agent_id $name $creation_comment $active_p -ad_returnredirect index.tcl \ No newline at end of file +ad_returnredirect {} \ No newline at end of file Index: openacs-4/contrib/obsolete-packages/wap/www/admin/modify-ua.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/wap/www/admin/modify-ua.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/obsolete-packages/wap/www/admin/modify-ua.tcl 20 Apr 2001 20:51:23 -0000 1.1 +++ openacs-4/contrib/obsolete-packages/wap/www/admin/modify-ua.tcl 18 Sep 2002 13:05:15 -0000 1.2 @@ -33,8 +33,8 @@ } delete { wap_delete_user_agent $user_agent_id - ad_returnredirect index.tcl - return + ad_returnredirect {} + ad_script_abort } } Index: openacs-4/contrib/obsolete-packages/wap/www/admin/toggle-wap-enabled.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/wap/www/admin/toggle-wap-enabled.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/obsolete-packages/wap/www/admin/toggle-wap-enabled.tcl 20 Apr 2001 20:51:23 -0000 1.1 +++ openacs-4/contrib/obsolete-packages/wap/www/admin/toggle-wap-enabled.tcl 18 Sep 2002 13:05:15 -0000 1.2 @@ -29,6 +29,7 @@ apm_generate_package_spec $version_id } on_error { ad_return_error "Database Error" "Could not create WAPEnabledP parameter for package $package_key, version $version_id." + ad_script_abort } set current_stat 0 @@ -42,4 +43,4 @@ ad_parameter -set $new_stat -package_id $package_id WAPEnabledP -ns_returnredirect "/wap/admin?[export_url_vars supertype]" \ No newline at end of file +ad_returnredirect "/wap/admin?[export_url_vars supertype]" \ No newline at end of file Index: openacs-4/packages/attachments/www/file-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/file-add-2.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/attachments/www/file-add-2.tcl 2 Jul 2002 04:18:54 -0000 1.1 +++ openacs-4/packages/attachments/www/file-add-2.tcl 18 Sep 2002 13:07:14 -0000 1.2 @@ -153,7 +153,7 @@ ad_return_complaint 1 "You probably clicked on the Add button more than once. Check if the file is properly loaded on the folder you wan, or you can use the Back button to return and re-enter the version file." - return + ad_script_abort } Index: openacs-4/packages/attachments/www/admin/new-root-folder-map.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/admin/new-root-folder-map.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/attachments/www/admin/new-root-folder-map.tcl 10 Sep 2002 22:22:22 -0000 1.3 +++ openacs-4/packages/attachments/www/admin/new-root-folder-map.tcl 18 Sep 2002 13:07:15 -0000 1.4 @@ -28,16 +28,14 @@ # a new one if one doesn't exist. A BUG. set root_folder_id [db_string has_fs_root_folder_p_select \ "select folder_id from fs_root_folders where package_id = :package_id" \ - -default 0 -] + -default 0 ] if {$root_folder_id == 0} { # look for a fs root folder candidate, by looking for an file-storage # sibling of our parent (uncle? or aunt? node). Should generalize sibling # stuff, search by parent etc. set parent_id [site_node::get_parent \ - -node_id [site_node::get_node_id_from_object_id -object_id $package_id] - ] + -node_id [site_node::get_node_id_from_object_id -object_id $package_id] ] # # todo @@ -49,23 +47,22 @@ # else ask to create a new root folder ad_return_template - } else { if {[attachments::root_folder_p -pacakge_id $package_id]} { # sanity check that the attachments_root_folder and fs_root_folder match set attachments_root_folder [attachments::get_root_folder \ - -package_id $package_id - ] + -package_id $package_id ] if {$attachments_root_folder != $root_folder_id} { ad_return_complaint 1 "Error: Attachment root folder and fs root folder different!" - } else { - # since this pkg already has a root folder do the mapping and return - attachments::map_root_folder \ - -package_id $package_id \ - -folder_id $root_folder_id - - ad_returnredirect $referer + } else { + # since this pkg already has a root folder do the mapping and return + attachments::map_root_folder \ + -package_id $package_id \ + -folder_id $root_folder_id + + ad_returnredirect $referer + ad_script_abort } } } Index: openacs-4/packages/chat/www/chat.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/chat.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/chat/www/chat.tcl 4 Sep 2002 08:12:50 -0000 1.2 +++ openacs-4/packages/chat/www/chat.tcl 18 Sep 2002 13:03:47 -0000 1.3 @@ -49,6 +49,7 @@ if { ($read_p == "0" && $write_p == "0") || ($ban_p == "1") } { #Display unauthorize privilege page. ad_returnredirect unauthorized + ad_script_abort } # Get chat screen name. Index: openacs-4/packages/chat/www/room-enter.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/room-enter.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/chat/www/room-enter.tcl 20 Apr 2001 20:51:08 -0000 1.1 +++ openacs-4/packages/chat/www/room-enter.tcl 18 Sep 2002 13:03:47 -0000 1.2 @@ -20,6 +20,7 @@ if { ($read_p == "0" && $write_p == "0") || ($ban_p == "1") } { #Display unauthorize privilege page. ad_returnredirect unauthorized + ad_script_abort } if {$client == "html"} { chat_message_post $room_id $user_id "has entered the room." "1" Index: openacs-4/packages/chat/www/room-exit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room-exit.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/chat/www/room-exit.tcl 20 Apr 2001 20:51:08 -0000 1.1 +++ openacs-4/packages/chat/www/room-exit.tcl 18 Sep 2002 13:03:47 -0000 1.2 @@ -19,9 +19,9 @@ if { ($read_p == "0" && $write_p == "0") || ($ban_p == "1") } { #Display unauthorize privilege page. ad_returnredirect unauthorized + ad_script_abort } -chat_message_post $room_id $user_id "has leaved the room." "1" +chat_message_post $room_id $user_id "has left the room." "1" - ad_returnredirect index Index: openacs-4/packages/download/www/admin/approve-or-reject-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/approve-or-reject-2.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/download/www/admin/approve-or-reject-2.tcl 10 Sep 2002 22:22:35 -0000 1.3 +++ openacs-4/packages/download/www/admin/approve-or-reject-2.tcl 18 Sep 2002 13:06:33 -0000 1.4 @@ -52,6 +52,7 @@ # Everything after here is email related, so let's send the user on their way ad_returnredirect $return_url +# do not abort/return here! if {[ad_parameter -package_id [ad_conn package_id] "approval_notification" "download" 1] == 1} { # We want to send email to use who submitted the version to let Index: openacs-4/packages/download/www/admin/repository-ae.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/repository-ae.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/download/www/admin/repository-ae.tcl 10 Sep 2002 22:22:35 -0000 1.3 +++ openacs-4/packages/download/www/admin/repository-ae.tcl 18 Sep 2002 13:06:33 -0000 1.4 @@ -67,6 +67,7 @@ } } ad_returnredirect "$return_url" + ad_script_abort } ad_return_template \ No newline at end of file Index: openacs-4/packages/download/www/admin/repository-metadata-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/repository-metadata-edit.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/download/www/admin/repository-metadata-edit.tcl 10 Sep 2002 22:22:35 -0000 1.3 +++ openacs-4/packages/download/www/admin/repository-metadata-edit.tcl 18 Sep 2002 13:06:33 -0000 1.4 @@ -94,6 +94,7 @@ } } ad_returnredirect "repository-metadata" + ad_script_abort } Index: openacs-4/packages/download/www/admin/repository-reasons-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/repository-reasons-edit.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/download/www/admin/repository-reasons-edit.tcl 10 Sep 2002 22:22:35 -0000 1.3 +++ openacs-4/packages/download/www/admin/repository-reasons-edit.tcl 18 Sep 2002 13:06:33 -0000 1.4 @@ -31,6 +31,7 @@ where download_reason_id = :download_reason_id } ad_returnredirect "repository-reasons" + ad_script_abort } set title "Edit Reason" Index: openacs-4/packages/download/www/admin/repository-types-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/repository-types-edit.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/download/www/admin/repository-types-edit.tcl 10 Sep 2002 22:22:35 -0000 1.3 +++ openacs-4/packages/download/www/admin/repository-types-edit.tcl 18 Sep 2002 13:06:33 -0000 1.4 @@ -32,6 +32,7 @@ where archive_type_id = :archive_type_id } ad_returnredirect "repository-types" + ad_script_abort } set title "Edit $pretty_name" Index: openacs-4/packages/forums/www/moderate/message-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/message-delete.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/forums/www/moderate/message-delete.tcl 10 Sep 2002 22:22:58 -0000 1.4 +++ openacs-4/packages/forums/www/moderate/message-delete.tcl 18 Sep 2002 13:02:00 -0000 1.5 @@ -20,14 +20,21 @@ # Select the stuff forum::message::get -message_id $message_id -array message -# Confirm? -if {!$confirm_p} { - set url_vars [export_url_vars message_id return_url] - ad_return_template -} else { +# Confirmed? +if {$confirm_p} { # Delete the message and all children forum::message::delete -message_id $message_id # Redirect to the forum ad_returnredirect "../forum-view?forum_id=$message(forum_id)" + ad_script_abort } + +set url_vars [export_url_vars message_id return_url] + +ad_return_template + + + + + Index: openacs-4/packages/spam/www/spam-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/spam/www/spam-edit.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/spam/www/spam-edit.tcl 5 Sep 2002 22:14:36 -0000 1.3 +++ openacs-4/packages/spam/www/spam-edit.tcl 18 Sep 2002 13:02:24 -0000 1.4 @@ -29,6 +29,7 @@ if {$sent_p == "t"} { ad_returnredirect "[spam_base]spam-view?spam_id=$spam_id" + ad_script_abort } ad_set_client_property spam "sql_query" $sql_query @@ -63,6 +64,7 @@ set html_text $content } else { ad_return_error "invalid content type in spam: $mime_type" + ad_script_abort } } Index: openacs-4/packages/spam/www/admin/spam-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/spam/www/admin/spam-edit.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/spam/www/admin/spam-edit.tcl 5 Sep 2002 22:14:37 -0000 1.4 +++ openacs-4/packages/spam/www/admin/spam-edit.tcl 18 Sep 2002 13:02:25 -0000 1.5 @@ -28,6 +28,7 @@ if {$sent_p == "t"} { ad_returnredirect "[spam_base]spam-view?spam_id=$spam_id" + ad_script_abort } ad_set_client_property spam "sql_query" $sql_query