Index: openacs-4/packages/acs-subsite/www/admin/attributes/edit-one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/edit-one.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/admin/attributes/edit-one.tcl 6 Sep 2002 21:49:57 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/attributes/edit-one.tcl 18 Sep 2002 12:16:40 -0000 1.3 @@ -94,7 +94,5 @@ where $type_column = :id_column" ad_returnredirect $return_url - return + ad_script_abort } - -ad_return_template Index: openacs-4/packages/acs-subsite/www/admin/attributes/value-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/value-delete.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/admin/attributes/value-delete.tcl 6 Sep 2002 21:49:57 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/attributes/value-delete.tcl 18 Sep 2002 12:16:40 -0000 1.3 @@ -26,7 +26,7 @@ }] } { # Already deleted ad_returnredirect $return_url - return + ad_script_abort } set context [list [list one?[ad_export_vars attribute_id] "One attribute"] "Delete value"] Index: openacs-4/packages/acs-subsite/www/admin/parties/one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/parties/one.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/admin/parties/one.tcl 6 Sep 2002 21:50:00 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/parties/one.tcl 18 Sep 2002 12:16:41 -0000 1.3 @@ -55,6 +55,7 @@ foreach {type url} $redirects_for_type { if {[lsearch $object_type_path_list $type] != -1} { ad_returnredirect [ad_conn package_url]admin/$url + ad_script_abort } } @@ -70,5 +71,3 @@ -object_type $party_type \ $party_id -ad_return_template - Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete-2.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete-2.tcl 13 Mar 2001 22:59:26 -0000 1.1 +++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete-2.tcl 18 Sep 2002 12:16:42 -0000 1.2 @@ -41,7 +41,7 @@ }] } { # The constraint is already deleted or not in scope ad_returnredirect $return_url - return + ad_script_abort } db_exec_plsql delete_constraint { Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete.tcl 6 Sep 2002 21:50:02 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete.tcl 18 Sep 2002 12:16:42 -0000 1.3 @@ -34,9 +34,7 @@ }] } { # The constraint is already deleted.... return ad_returnredirect $return_url - return + ad_script_abort } set export_vars [ad_export_vars -form {constraint_id return_url}] - -ad_return_template Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new.tcl 6 Sep 2002 21:50:02 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new.tcl 18 Sep 2002 12:16:42 -0000 1.3 @@ -151,8 +151,6 @@ set return_url "../one?segment_id=$rel_segment" } ad_returnredirect $return_url - return + ad_script_abort } -ad_return_template - Index: openacs-4/packages/acs-subsite/www/admin/rel-types/roles/edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/roles/edit.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/admin/rel-types/roles/edit.tcl 6 Sep 2002 21:50:03 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/rel-types/roles/edit.tcl 18 Sep 2002 12:16:43 -0000 1.3 @@ -60,8 +60,5 @@ set return_url "one?[ad_export_vars role]" } ad_returnredirect $return_url - return + ad_script_abort } - - -ad_return_template Index: openacs-4/packages/acs-subsite/www/admin/rel-types/roles/new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/roles/new.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/acs-subsite/www/admin/rel-types/roles/new.tcl 6 Sep 2002 21:50:03 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/admin/rel-types/roles/new.tcl 18 Sep 2002 12:16:43 -0000 1.4 @@ -57,8 +57,5 @@ } } ad_returnredirect $return_url - return + ad_script_abort } - - -ad_return_template Index: openacs-4/packages/acs-subsite/www/permissions/revoke.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/revoke.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/permissions/revoke.tcl 22 Apr 2001 16:13:15 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/permissions/revoke.tcl 18 Sep 2002 12:16:44 -0000 1.3 @@ -13,8 +13,8 @@ ad_require_permission $object_id admin if {[llength $revoke_list] == 0} { - ad_returnredirect ".?[export_url_vars object_id]" - return + ad_returnredirect "./?[export_url_vars object_id]" + ad_script_abort } doc_body_append "[ad_header "Revoke Confirm"] Index: openacs-4/packages/acs-subsite/www/pvt/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/index.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/acs-subsite/www/pvt/index.tcl 13 Mar 2001 22:59:26 -0000 1.1 +++ openacs-4/packages/acs-subsite/www/pvt/index.tcl 18 Sep 2002 12:16:45 -0000 1.2 @@ -6,4 +6,4 @@ @cvs-id $Id$ } {} -ns_returnredirect "home" +ad_returnredirect "home" Index: openacs-4/packages/acs-subsite/www/pvt/toggle-dont-spam-me-p.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/toggle-dont-spam-me-p.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/acs-subsite/www/pvt/toggle-dont-spam-me-p.tcl 13 Mar 2001 22:59:26 -0000 1.1 +++ openacs-4/packages/acs-subsite/www/pvt/toggle-dont-spam-me-p.tcl 18 Sep 2002 12:16:45 -0000 1.2 @@ -6,4 +6,4 @@ db_dml unused "update user_preferences set dont_spam_me_p = util.logical_negation(dont_spam_me_p) where user_id = :user_id" -ad_returnredirect "home.tcl" +ad_returnredirect "home" Index: openacs-4/packages/acs-subsite/www/register/awaiting-approval.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/awaiting-approval.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/register/awaiting-approval.tcl 12 May 2002 20:57:02 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/register/awaiting-approval.tcl 18 Sep 2002 12:16:48 -0000 1.3 @@ -25,15 +25,13 @@ if {$email_verified_p == "t"} { # we don't require email verification ad_returnredirect "index?[export_url_vars email]" - return + ad_script_abort } else { ad_returnredirect "awaiting-email-verification?[export_url_vars user_id]" - return + ad_script_abort } # try to login again with this new state } set system_name [ad_system_name] - -ad_return_template \ No newline at end of file Index: openacs-4/packages/acs-subsite/www/register/awaiting-email-verification.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/awaiting-email-verification.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/acs-subsite/www/register/awaiting-email-verification.tcl 14 Feb 2002 00:53:10 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/register/awaiting-email-verification.tcl 18 Sep 2002 12:16:48 -0000 1.4 @@ -14,10 +14,9 @@ from cc_users where user_id = :user_id and email_verified_p = 'f' }]} { - ns_log Notice "Couldn't find $user_id in /register/awaiting-email-verification.tcl" - + ns_log Notice "Couldn't find $user_id in /register/awaiting-email-verification" ad_return_error "Couldn't find your record" "User id $user_id is not found in the need email verification state." - return + ad_script_abort } @@ -30,20 +29,20 @@ where user_id = :user_id" if {$member_state == "approved"} { # we don't require administration approval to get to get authorized - ad_returnredirect "index.tcl?[export_url_vars email]" - return + ad_returnredirect "index?[export_url_vars email]" + ad_script_abort } else { - ad_returnredirect "awaiting-approval.tcl?[export_url_vars user_id]" - return + ad_returnredirect "awaiting-approval?[export_url_vars user_id]" + ad_script_abort } } db_release_unused_handles -# we are waiting for the user to verify their email +# we are waiting for the user to verify their email -- return template ad_return_template -# the user has to come back and activate their account -ns_sendmail "$email" "[ad_parameter NewRegistrationEmailAddress "security"]" "Welcome to [ad_system_name]" "To confirm your registration, please go to [ad_parameter -package_id [ad_acs_kernel_id] SystemURL]/register/email-confirm.tcl?[export_url_vars row_id]" +# Send them the mail for them to come back and activate their account +ns_sendmail "$email" "[ad_parameter NewRegistrationEmailAddress "security"]" "Welcome to [ad_system_name]" "To confirm your registration, please go to [ad_parameter -package_id [ad_acs_kernel_id] SystemURL]/register/email-confirm?[export_url_vars row_id]" Index: openacs-4/packages/acs-subsite/www/register/user-login.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/user-login.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/register/user-login.tcl 12 May 2002 20:57:02 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/register/user-login.tcl 18 Sep 2002 12:16:48 -0000 1.3 @@ -23,10 +23,10 @@ # although this technically is not an expired login, we'll # just use it anyway. ad_returnredirect "login-expired" - return + ad_script_abort } elseif { $time < [ns_time] - [ad_parameter -package_id [ad_acs_kernel_id] LoginExpirationTime security 600] } { ad_returnredirect "login-expired" - return + ad_script_abort } # Obtain the user ID corresponding to the provided email address. @@ -41,8 +41,7 @@ # The user is not in the database. Redirect to user-new.tcl so the user can register. ad_set_client_property -persistent "f" register password $password ad_returnredirect "user-new?[ad_export_vars { email return_url persistent_cookie_p }]" - - return + ad_script_abort } @@ -52,37 +51,37 @@ "approved" { if { $email_verified_p == "f" } { ad_returnredirect "awaiting-email-verification?user_id=$user_id" - return + ad_script_abort } if { [ad_check_password $user_id $password] } { # The user has provided a correct, non-empty password. Log # him/her in and redirect to return_url. ad_user_login -forever=$persistent_cookie_p $user_id ad_returnredirect $return_url - return + ad_script_abort } } "banned" { ad_returnredirect "banned-user?user_id=$user_id" - return + ad_script_abort } "deleted" { ad_returnredirect "deleted-user?user_id=$user_id" - return + ad_script_abort } "rejected" { ad_returnredirect "awaiting-approval?user_id=$user_id" - return + ad_script_abort } "needs approval" { ad_returnredirect "awaiting-approval?user_id=$user_id" - return + ad_script_abort } default { ns_log Warning "Problem with registration state machine on user-login.tcl" ad_return_error "Problem with login" "There was a problem authenticating the account: $user_id. Most likely, the database contains users with no user_state." - return + ad_script_abort } } Index: openacs-4/packages/acs-subsite/www/shared/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/index.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/acs-subsite/www/shared/index.tcl 13 Mar 2001 22:59:26 -0000 1.1 +++ openacs-4/packages/acs-subsite/www/shared/index.tcl 18 Sep 2002 12:16:50 -0000 1.2 @@ -1,4 +1,4 @@ # $Id$ # user try to play with the URL and get the directory structure instead of a file -ad_returnredirect "filenotfound" +ad_returnredirect / Index: openacs-4/packages/acs-subsite/www/shared/send-email.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/send-email.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/shared/send-email.tcl 10 Sep 2002 22:22:13 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/shared/send-email.tcl 18 Sep 2002 12:16:50 -0000 1.3 @@ -26,13 +26,11 @@ if [catch {ns_sendmail $email $email_from $subject $message} errmsg] { ad_return_error $error_subject "$error_message: 
[ad_quotehtml $errmsg]
" - return + ad_script_abort } if { $show_sent_message_p != "t" } { # Do not show any message. Just go to return url ad_returnredirect $return_url - return + ad_script_abort } - -ad_return_template \ No newline at end of file Index: openacs-4/packages/acs-subsite/www/user/basic-info-update-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/Attic/basic-info-update-2.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/www/user/basic-info-update-2.tcl 16 Sep 2002 22:07:47 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/user/basic-info-update-2.tcl 18 Sep 2002 12:16:52 -0000 1.5 @@ -88,7 +88,7 @@ if { $exception_count > 0 } { ad_return_complaint $exception_count $exception_text - return + ad_script_abort } if { [db_string email_unique_count "select count(party_id) from parties where email = lower(:email) and party_id <> :user_id"] > 0 } { @@ -97,7 +97,7 @@ perhaps you're trying to combine two accounts? If so, please email [ad_system_owner] with your request." - return + ad_script_abort } # bio_change_to = 0 -> insert @@ -167,7 +167,7 @@ if { [exists_and_not_null return_url] } { ad_returnredirect $return_url } else { - ad_returnredirect "/pvt/home.tcl" + ad_returnredirect "/pvt/home" } Index: openacs-4/packages/acs-subsite/www/user/portrait/upload-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/Attic/upload-2.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/user/portrait/upload-2.tcl 3 May 2001 04:00:49 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/user/portrait/upload-2.tcl 18 Sep 2002 12:16:53 -0000 1.3 @@ -183,5 +183,5 @@ if { [exists_and_not_null return_url] } { ad_returnredirect $return_url } else { - ad_returnredirect "index.tcl" + ad_returnredirect {} } Index: openacs-4/packages/simple-survey/www/admin/description-edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/description-edit-2.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/simple-survey/www/admin/description-edit-2.tcl 10 Sep 2002 22:23:23 -0000 1.4 +++ openacs-4/packages/simple-survey/www/admin/description-edit-2.tcl 18 Sep 2002 12:14:55 -0000 1.5 @@ -31,7 +31,7 @@ if {$exception_count > 0} { ad_return_complaint $exception_count $exception_text - return + ad_script_abort } if {$checked_p == "f"} { @@ -52,7 +52,6 @@ } } - ad_return_template } else { @@ -63,6 +62,7 @@ db_release_unused_handles ad_returnredirect "one?[export_url_vars survey_id]" + ad_script_abort } Index: openacs-4/packages/simple-survey/www/admin/edit-logic-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/edit-logic-2.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/simple-survey/www/admin/edit-logic-2.tcl 10 Sep 2002 22:23:23 -0000 1.2 +++ openacs-4/packages/simple-survey/www/admin/edit-logic-2.tcl 18 Sep 2002 12:14:55 -0000 1.3 @@ -25,4 +25,4 @@ returning logic into :1" -clobs [list $logic] db_release_unused_handles -ad_returnredirect "one.tcl?survey_id=$survey_id" +ad_returnredirect "one?survey_id=$survey_id" Index: openacs-4/packages/simple-survey/www/admin/question-add-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/question-add-3.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/simple-survey/www/admin/question-add-3.tcl 10 Sep 2002 22:23:23 -0000 1.5 +++ openacs-4/packages/simple-survey/www/admin/question-add-3.tcl 18 Sep 2002 12:14:55 -0000 1.6 @@ -81,7 +81,7 @@ if { $exception_count > 0 } { ad_return_complaint $exception_count $exception_text - return + ad_script_abort } if { $type == "scored" } { @@ -153,7 +153,7 @@ if { !$already_inserted_p } { db_release_unused_handles ad_return_error "Database Error" "
$errmsg
" - return + ad_script_abort } } @@ -240,7 +240,7 @@ if { !$already_inserted_p } { db_release_unused_handles ad_return_error "Database Error" "
$errmsg
" - return +ad_script_abort } } } Index: openacs-4/packages/simple-survey/www/admin/question-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/question-delete-2.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/simple-survey/www/admin/question-delete-2.tcl 10 Sep 2002 22:23:23 -0000 1.3 +++ openacs-4/packages/simple-survey/www/admin/question-delete-2.tcl 18 Sep 2002 12:14:55 -0000 1.4 @@ -37,7 +37,7 @@

Please go back to the survey. " - return +ad_script_abort } db_release_unused_handles Index: openacs-4/packages/simple-survey/www/admin/question-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/question-delete.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/simple-survey/www/admin/question-delete.tcl 10 Sep 2002 22:23:23 -0000 1.4 +++ openacs-4/packages/simple-survey/www/admin/question-delete.tcl 18 Sep 2002 12:14:55 -0000 1.5 @@ -45,12 +45,12 @@

Please go back using your browser. " - return + ad_script_abort } db_release_unused_handles ad_returnredirect "one?survey_id=$survey_id" - return + ad_script_abort } else { doc_return 200 text/html "[ad_header "Confirm Question Deletion"] Index: openacs-4/packages/simple-survey/www/admin/question-modify-text-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/question-modify-text-2.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/simple-survey/www/admin/question-modify-text-2.tcl 10 Sep 2002 22:23:23 -0000 1.2 +++ openacs-4/packages/simple-survey/www/admin/question-modify-text-2.tcl 18 Sep 2002 12:14:55 -0000 1.3 @@ -23,5 +23,5 @@ db_dml survey_question_text_update "update survsimp_questions set question_text=:question_text where question_id=:question_id" db_release_unused_handles -ad_returnredirect "one.tcl?survey_id=$survey_id" +ad_returnredirect "one?survey_id=$survey_id" Index: openacs-4/packages/simple-survey/www/admin/survey-create-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/survey-create-2.tcl,v diff -u -N -r1.8 -r1.9 --- openacs-4/packages/simple-survey/www/admin/survey-create-2.tcl 10 Sep 2002 22:23:23 -0000 1.8 +++ openacs-4/packages/simple-survey/www/admin/survey-create-2.tcl 18 Sep 2002 12:14:55 -0000 1.9 @@ -60,7 +60,7 @@ if {$exception_count > 0} { ad_return_complaint $exception_count $exception_text - return + ad_script_abort } if {$checked_p == "f"} { @@ -83,7 +83,7 @@ } ad_return_template survey-create-confirm - return + ad_script_abort } else { # make sure the short_name is unique @@ -149,5 +149,6 @@ db_release_unused_handles - ad_returnredirect "question-add.tcl?survey_id=$survey_id" + ad_returnredirect "question-add?survey_id=$survey_id" + ad_script_abort } Index: openacs-4/packages/survey/www/process-response.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/process-response.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/survey/www/process-response.tcl 16 Sep 2002 00:00:23 -0000 1.1 +++ openacs-4/packages/survey/www/process-response.tcl 18 Sep 2002 12:15:21 -0000 1.2 @@ -278,7 +278,7 @@ if {[info exists return_url] && ![empty_string_p $return_url]} { ad_returnredirect "$return_url" - return + ad_script_abort } else { set context_bar [ad_context_bar "Response Submitted for $survey_name"] ad_return_template @@ -314,7 +314,7 @@ default { if {[info exists return_url] && ![empty_string_p $return_url]} { ad_returnredirect "$return_url" - return + ad_script_abort } else { set context_bar [ad_context_bar "Response Submitted for $survey_name"] Index: openacs-4/packages/survey/www/admin/description-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/description-edit.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/survey/www/admin/description-edit.tcl 16 Sep 2002 00:00:24 -0000 1.1 +++ openacs-4/packages/survey/www/admin/description-edit.tcl 18 Sep 2002 12:15:21 -0000 1.2 @@ -48,6 +48,7 @@ db_dml survey_update_description "" ad_returnredirect "one?[export_url_vars survey_id]" + ad_script_abort } set context_bar [ad_context_bar [list "one.tcl?[export_url_vars survey_id]" $survey_info(name)] "Edit Description"] Index: openacs-4/packages/survey/www/admin/name-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/name-edit.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/survey/www/admin/name-edit.tcl 16 Sep 2002 00:00:24 -0000 1.1 +++ openacs-4/packages/survey/www/admin/name-edit.tcl 18 Sep 2002 12:15:21 -0000 1.2 @@ -36,10 +36,11 @@ } -edit_data { db_dml survey_update "" ad_returnredirect "one?[export_vars survey_id]" + ad_script_abort } + set context_bar [ad_context_bar "Edit Name"] - ad_return_template Index: openacs-4/packages/survey/www/admin/question-add-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/question-add-3.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/survey/www/admin/question-add-3.tcl 16 Sep 2002 00:00:24 -0000 1.1 +++ openacs-4/packages/survey/www/admin/question-add-3.tcl 18 Sep 2002 12:15:21 -0000 1.2 @@ -64,7 +64,7 @@ if { $exception_count > 0 } { ad_return_complaint $exception_count $exception_text - return + ad_script_abort } @@ -129,7 +129,7 @@ if { !$already_inserted_p } { db_release_unused_handles ad_return_error "Database Error" "

$errmsg
" - return + ad_script_abort } } Index: openacs-4/packages/survey/www/admin/question-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/Attic/question-delete-2.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/survey/www/admin/question-delete-2.tcl 16 Sep 2002 00:00:24 -0000 1.1 +++ openacs-4/packages/survey/www/admin/question-delete-2.tcl 18 Sep 2002 12:15:21 -0000 1.2 @@ -36,7 +36,7 @@

Please go back to the survey. " - return + ad_script_abort } db_release_unused_handles Index: openacs-4/packages/survey/www/admin/question-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/question-delete.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/survey/www/admin/question-delete.tcl 16 Sep 2002 00:00:24 -0000 1.1 +++ openacs-4/packages/survey/www/admin/question-delete.tcl 18 Sep 2002 12:15:21 -0000 1.2 @@ -69,14 +69,14 @@

Please go back using your browser. " - return + ad_script_abort } db_release_unused_handles set sort_order [expr {$sort_order -1}] } - ad_returnredirect "one?[export_url_vars survey_id]&#${sort_order}" - return + ad_returnredirect "one?[export_url_vars survey_id]&#${sort_order}" + ad_script_abort } set context_bar [ad_context_bar "Delete Question"] Index: openacs-4/packages/survey/www/admin/question-modify-text.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/question-modify-text.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/survey/www/admin/question-modify-text.tcl 16 Sep 2002 00:00:24 -0000 1.1 +++ openacs-4/packages/survey/www/admin/question-modify-text.tcl 18 Sep 2002 12:15:21 -0000 1.2 @@ -29,8 +29,9 @@ {survey_id:text(hidden) {value $survey_id}} } -select_query_name {survey_question_text_from_id} -edit_data { -db_dml survey_question_text_update "update survey_questions set question_text=:question_text where question_id=:question_id" -ad_returnredirect "one.tcl?survey_id=$survey_id" + db_dml survey_question_text_update "update survey_questions set question_text=:question_text where question_id=:question_id" + ad_returnredirect "one?survey_id=$survey_id" + ad_script_abort } Index: openacs-4/packages/survey/www/admin/question-modify.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/question-modify.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/survey/www/admin/question-modify.tcl 16 Sep 2002 00:00:24 -0000 1.1 +++ openacs-4/packages/survey/www/admin/question-modify.tcl 18 Sep 2002 12:15:21 -0000 1.2 @@ -71,73 +71,73 @@ foreach response $valid_responses_list { append valid_responses "$response\n" } - ad_form -extend -name modify_question -form { - {valid_responses:text(textarea) - {label "For Multiple Choice
Enter a List of Valid Responses
(enter one choice per line)"} - {html {rows 10 cols 50}} - {value $valid_responses}} + ad_form -extend -name modify_question -form { + {valid_responses:text(textarea) + {label "For Multiple Choice
Enter a List of Valid Responses
(enter one choice per line)"} + {html {rows 10 cols 50}} + {value $valid_responses}} } } if {$presentation_type == "textarea" || $presentation_type == "textbox"} { ad_form -extend -name modify_question -form { {presentation_options:text(select) {options {{Small small} {Medium medium} {Large large}}} {value $presentation_options} {label "[string totitle $presentation_type] Size"}} - } - } + } +} ad_form -extend -name modify_question -select_query_name {survey_question_details} -edit_data { - db_dml survey_question_update {} + db_dml survey_question_update {} -# add new responses is choice type question + # add new responses is choice type question - if {[info exists valid_responses]} { + if {[info exists valid_responses]} { - set responses [split $valid_responses "\n"] - set count 0 - set response_list "" - foreach response $responses { - set trimmed_response [string trim $response] - if { [empty_string_p $trimmed_response] } { - # skip empty lines - continue - } + set responses [split $valid_responses "\n"] + set count 0 + set response_list "" + foreach response $responses { + set trimmed_response [string trim $response] + if { [empty_string_p $trimmed_response] } { + # skip empty lines + continue + } - lappend response_list [list "$trimmed_response" "$count"] - incr count - } - - set choice_id_to_update_list [db_list get_choice_id {}] + lappend response_list [list "$trimmed_response" "$count"] + incr count + } + + set choice_id_to_update_list [db_list get_choice_id {}] set choice_count 0 foreach one_response $response_list { set choice_name [lindex $one_response 0] set choice_value [lindex $one_response 1] set choice_id_to_update [lindex $choice_id_to_update_list $choice_count] -if {[empty_string_p $choice_id_to_update]} { - db_dml insert_new_choice {} -} else { + if {[empty_string_p $choice_id_to_update]} { + db_dml insert_new_choice {} + } else { - db_dml update_new_choice {} -} + db_dml update_new_choice {} + } incr choice_count -} -while {[llength $choice_id_to_update_list] >= $choice_count} { + } + while {[llength $choice_id_to_update_list] >= $choice_count} { set choice_id_to_delete [lindex $choice_id_to_update_list $choice_count] -db_dml delete_old_choice {} + db_dml delete_old_choice {} incr choice_count -} + } -} + } - + -ad_returnredirect "one.tcl?survey_id=$survey_id&#${sort_order}" - + ad_returnredirect "one?survey_id=$survey_id&#${sort_order}" + ad_script_abort } Index: openacs-4/packages/survey/www/admin/question-swap.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/question-swap.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/survey/www/admin/question-swap.tcl 16 Sep 2002 00:00:24 -0000 1.1 +++ openacs-4/packages/survey/www/admin/question-swap.tcl 18 Sep 2002 12:15:21 -0000 1.2 @@ -30,8 +30,6 @@ where section_id = :section_id and sort_order in (:sort_order, :next_sort_order)" -ad_returnredirect "one?survey_id=$survey_id&#${sort_order}" - } on_error { ad_return_error "Database error" "A database error occured while trying @@ -40,5 +38,7 @@ $errmsg " + ad_script_abort } +ad_returnredirect "one?survey_id=$survey_id&#${sort_order}" Index: openacs-4/packages/survey/www/admin/send-mail.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/send-mail.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/survey/www/admin/send-mail.tcl 16 Sep 2002 00:00:24 -0000 1.1 +++ openacs-4/packages/survey/www/admin/send-mail.tcl 18 Sep 2002 12:15:21 -0000 1.2 @@ -96,7 +96,8 @@ -subject $subject \ -message $message \ -query $query - ad_returnredirect "one.tcl?survey_id=$survey_id" + ad_returnredirect "one?survey_id=$survey_id" + ad_script_abort } set context_bar [ad_context_bar "Send Mail"] Index: openacs-4/packages/survey/www/admin/survey-copy.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/survey-copy.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/survey/www/admin/survey-copy.tcl 16 Sep 2002 00:00:25 -0000 1.1 +++ openacs-4/packages/survey/www/admin/survey-copy.tcl 18 Sep 2002 12:15:21 -0000 1.2 @@ -27,9 +27,10 @@ } -on_submit { set new_survey_id [survey_copy -survey_id $survey_id -new_name $name] -set survey_id $new_survey_id - -ad_returnredirect "one?[export_vars survey_id]" + set survey_id $new_survey_id + + ad_returnredirect "one?[export_vars survey_id]" + ad_script_abort } Index: openacs-4/packages/survey/www/admin/survey-create.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/survey-create.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/survey/www/admin/survey-create.tcl 16 Sep 2002 10:26:34 -0000 1.2 +++ openacs-4/packages/survey/www/admin/survey-create.tcl 18 Sep 2002 12:15:21 -0000 1.3 @@ -72,7 +72,8 @@ set section_id "" set section_id [db_exec_plsql create_section ""] } - ad_returnredirect "question-add.tcl?section_id=$section_id" + ad_returnredirect "question-add?section_id=$section_id" + ad_script_abort } Index: openacs-4/packages/survey/www/admin/survey-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/survey-delete.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/survey/www/admin/survey-delete.tcl 16 Sep 2002 00:00:25 -0000 1.1 +++ openacs-4/packages/survey/www/admin/survey-delete.tcl 18 Sep 2002 12:15:21 -0000 1.2 @@ -35,8 +35,10 @@ if {$confirmation} { db_exec_plsql delete_survey {} ad_returnredirect "." + ad_script_abort } else { - ad_returnredirect "one.tcl?[export_vars survey_id]" + ad_returnredirect "one?[export_vars survey_id]" + ad_script_abort } } Index: openacs-4/packages/survey/www/admin/user-responses-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/user-responses-delete.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/survey/www/admin/user-responses-delete.tcl 16 Sep 2002 00:00:25 -0000 1.1 +++ openacs-4/packages/survey/www/admin/user-responses-delete.tcl 18 Sep 2002 12:15:21 -0000 1.2 @@ -38,6 +38,7 @@ } } ad_returnredirect "one-respondent?[export_vars {survey_id user_id}]" + ad_script_abort } set context_bar [ad_context_bar "Delete Response"] \ No newline at end of file Index: openacs-4/packages/webmail/tcl/wm-filter-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/tcl/wm-filter-procs.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail/tcl/wm-filter-procs.tcl 20 Apr 2001 20:51:23 -0000 1.1 +++ openacs-4/packages/webmail/tcl/wm-filter-procs.tcl 18 Sep 2002 12:17:43 -0000 1.2 @@ -37,7 +37,7 @@ if { [empty_string_p $mailbox_ids] || [empty_string_p $constraint_list] || [empty_string_p $and_p] } { ad_returnredirect index-search - return + ad_script_abort } } elseif { ![db_0or1row view_query { SELECT mailbox_ids, and_p Index: openacs-4/packages/webmail/www/create-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/create-view.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/webmail/www/create-view.tcl 10 Sep 2002 22:23:29 -0000 1.2 +++ openacs-4/packages/webmail/www/create-view.tcl 18 Sep 2002 12:17:44 -0000 1.3 @@ -85,8 +85,9 @@ We had an error inserting this view: $errmsg " -return + ad_script_abort } + set view_id $filter_view ad_returnredirect "$return_url?[export_url_vars view_id edit_filter_id]" Index: openacs-4/packages/webmail/www/folder-change-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/folder-change-2.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail/www/folder-change-2.tcl 20 Apr 2001 20:51:23 -0000 1.1 +++ openacs-4/packages/webmail/www/folder-change-2.tcl 18 Sep 2002 12:17:44 -0000 1.2 @@ -26,7 +26,7 @@ if { [wm_mailbox_name_reserved $folder_name] } { wm_return_error "You are not allowed to delete the following mailboxes: [wm_mailbox_name_for_display INBOX], [wm_mailbox_name_for_display DRAFTS], [wm_mailbox_name_for_display SENT], [wm_mailbox_name_for_display TRASH] and SYSTEM." - return + ad_script_abort } with_catch errmsg { db_dml folder_mailbox_delete " @@ -35,7 +35,7 @@ wm_return_error "There was an error deleting your folder: $errmsg" - return + ad_script_abort } ad_set_client_property -persistent f "webmail" "mailbox_list" "" ad_returnredirect "folder-index" @@ -49,10 +49,10 @@ wm_return_error "There was an error deleting your folder: $errmsg" - return + ad_script_abort } ad_returnredirect $target - return + ad_script_abort } Index: openacs-4/packages/webmail/www/folder-change.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/folder-change.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail/www/folder-change.tcl 20 Apr 2001 20:51:23 -0000 1.1 +++ openacs-4/packages/webmail/www/folder-change.tcl 18 Sep 2002 12:17:44 -0000 1.2 @@ -15,8 +15,8 @@ } -validate { action_valid -requires { action:notnull } { if { ![string equal $action "Empty"] - && ![string equal $action "Delete"] - && ![string equal $action "Rename"] } { + && ![string equal $action "Delete"] + && ![string equal $action "Rename"] } { ad_complain { You have entered an invalid action } } } @@ -26,15 +26,15 @@ set folder_name [wm_mailbox_verify_and_get_name $mailbox_id $user_id] if { [string equal $action Empty] -&& [string equal $folder_name "TRASH"] } { + && [string equal $folder_name "TRASH"] } { set action2 "Empty" ad_returnredirect "folder-change-2?[export_url_vars action action2 mailbox_id]" - return + ad_script_abort } set context "[ad_context_bar_ws [list "index?[export_url_vars mailbox_id]" "Webmail"] [list "folder-index" "Manage Folders"] "$action Folder"]" set folder_name [wm_mailbox_name_for_display $folder_name] set form_vars [export_form_vars action mailbox_id] ad_return_template -return + Index: openacs-4/packages/webmail/www/folder-create-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/folder-create-2.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail/www/folder-create-2.tcl 20 Apr 2001 20:51:23 -0000 1.1 +++ openacs-4/packages/webmail/www/folder-create-2.tcl 18 Sep 2002 12:17:44 -0000 1.2 @@ -16,13 +16,13 @@ if { [string length $folder_name] > 50 } { wm_return_error "The folder name you entered ($folder_name) was invalid. Please hit back and try again (the length limit is 50 characters)" - return + ad_script_abort } if { [string equal $folder_name SYSTEM] } { wm_return_error "We're sorry, you are not allowed to create a mailbox named SYSTEM. Please hit back and try another name." - return + ad_script_abort } db_transaction { set mailbox_id [db_nextval wm_global_sequence] @@ -33,12 +33,12 @@ } on_error { if { [regexp -nocase {WM_MAILBOXES_USER_NAME_UN} $errmsg] } { wm_return_error "A mailbox already exists with that name" - return + ad_script_abort } wm_return_error "An error occured while trying to create your folder: $errmsg " - return + ad_script_abort } ad_set_client_property -persistent f "webmail" "mailbox_list" "" Index: openacs-4/packages/webmail/www/folder-move-to.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/folder-move-to.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail/www/folder-move-to.tcl 20 Apr 2001 20:51:23 -0000 1.1 +++ openacs-4/packages/webmail/www/folder-move-to.tcl 18 Sep 2002 12:17:44 -0000 1.2 @@ -17,7 +17,7 @@ if { $mailbox_id == "@NEW" } { # Create new mailbox. ad_returnredirect "folder-create?target=[ad_urlencode $return_url]" - return + ad_script_abort } # Have to explicitly validate this integer because it was not validated in Index: openacs-4/packages/webmail/www/folder-rename-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/folder-rename-2.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail/www/folder-rename-2.tcl 20 Apr 2001 20:51:23 -0000 1.1 +++ openacs-4/packages/webmail/www/folder-rename-2.tcl 18 Sep 2002 12:17:44 -0000 1.2 @@ -13,14 +13,14 @@ } if { [string equal $action2 "Cancel"] -|| [empty_string_p $folder_name] } { + || [empty_string_p $folder_name] } { ad_returnredirect "folder-index" - return + ad_script_abort } if { [string length $folder_name] > 50 } { wm_return_error "The folder name you entered ($folder_name) was invalid. Please hit back and try again (the length limit is 50 characters)" - return + ad_script_abort } set user_id [ad_maybe_redirect_for_registration] @@ -29,7 +29,7 @@ if { [wm_mailbox_name_reserved $name] } { wm_return_error "You are not allowed to rename the following mailboxes: [wm_mailbox_name_for_display INBOX], [wm_mailbox_name_for_display DRAFTS], [wm_mailbox_name_for_display SENT], [wm_mailbox_name_for_display TRASH], and SYSTEM." - return + ad_script_abort } with_catch errmsg { @@ -38,9 +38,11 @@ WHERE mailbox_id=:mailbox_id" } { wm_return_error "There was an error renaming your folder. Most likely a folder with the same name already exists." - return + ad_script_abort } + ad_returnredirect "folder-index" -return +ad_script_abort ad_set_client_property -persistent f "webmail" "mailbox_list" "" + Index: openacs-4/packages/webmail/www/message-process.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/message-process.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail/www/message-process.tcl 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/webmail/www/message-process.tcl 18 Sep 2002 12:17:44 -0000 1.2 @@ -25,7 +25,7 @@ if { [empty_string_p $mailbox_id] && [string equal $action "Refile"] } { ad_return_complaint 1 "

  • You have to select a folder to which to refile this message." - return + ad_script_abort } with_catch errmsg { @@ -36,7 +36,7 @@ AND name='TRASH'"] } { wm_return_error "You do not have a '[wm_mailbox_name_for_display TRASH]' folder. That is not good." - return + ad_script_abort } if { [string equal $action "Delete"] } { @@ -58,7 +58,7 @@ wm_return_error "Refiling failed: $errmsg " - return + ad_script_abort } set index_url "index" @@ -74,10 +74,10 @@ } if { ( [string equal $action "Delete"] -&& [wm_get_preference $user_id delete_move_index_p]=="t" ) -|| $next_msg_id == "" } { + && [wm_get_preference $user_id delete_move_index_p]=="t" ) + || $next_msg_id == "" } { ad_returnredirect $index_url - return + ad_script_abort } ad_returnredirect "message?msg_id=$next_msg_id&view_id=$view_id" Index: openacs-4/packages/webmail/www/message-remove-attachment.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/message-remove-attachment.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail/www/message-remove-attachment.tcl 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/webmail/www/message-remove-attachment.tcl 18 Sep 2002 12:17:44 -0000 1.2 @@ -21,7 +21,7 @@ where m.outgoing_msg_id = :outgoing_msg_id } -default ""] if { $creation_user!=$user_id } { doc_return 200 text/html "You are not the owner of this message." - return + ad_script_abort } db_dml attachment_remove_dml { Index: openacs-4/packages/webmail/www/message-send-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/message-send-2.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail/www/message-send-2.tcl 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/webmail/www/message-send-2.tcl 18 Sep 2002 12:17:44 -0000 1.2 @@ -25,7 +25,7 @@ if { [string equal $action "Cancel"] } { ad_returnredirect $return_url - return + ad_script_abort } # from is reserved word in Oracle @@ -37,7 +37,7 @@ if { [empty_string_p $to] && [empty_string_p $cc] && [empty_string_p $bcc] } { wm_return_error "You did not specify any recipients for your message." - return + ad_script_abort } set user_id [ad_verify_and_get_user_id] @@ -49,7 +49,7 @@ if { $creation_user != $user_id } { wm_return_error "We're sorry, but no such message exists. You may have taken to long to compose it and it got cleaned up." - return + ad_script_abort } # only add signature if signature_use is checked and we're not saving a draft Index: openacs-4/packages/webmail/www/message-send-add-attachment.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/message-send-add-attachment.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail/www/message-send-add-attachment.tcl 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/webmail/www/message-send-add-attachment.tcl 18 Sep 2002 12:17:44 -0000 1.2 @@ -23,18 +23,18 @@ set errmsg "The message to which you are attempting to attach a file is no longer valid. Maybe you already sent it away, or you waited too long." - ad_returnredirect "attachments-error.tcl?[export_url_vars errmsg outgoing_msg_id]" - return + ad_returnredirect "attachments-error?[export_url_vars errmsg outgoing_msg_id]" + ad_script_abort } elseif { $creation_user != $user_id } { set errmsg "You do not have permission to attach a file to this message." - ad_returnredirect "attachments-error.tcl?[export_url_vars errmsg outgoing_msg_id]" - return + ad_returnredirect "attachments-error?[export_url_vars errmsg outgoing_msg_id]" + ad_script_abort } if { [empty_string_p $upload_file] } { set errmsg "You must specify a file to attach." - ad_returnredirect "attachments-error.tcl?[export_url_vars errmsg outgoing_msg_id]" - return + ad_returnredirect "attachments-error?[export_url_vars errmsg outgoing_msg_id]" + ad_script_abort } set tmp_filename [ns_queryget upload_file.tmpfile] Index: openacs-4/packages/webmail/www/preferences-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/preferences-2.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail/www/preferences-2.tcl 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/webmail/www/preferences-2.tcl 18 Sep 2002 12:17:44 -0000 1.2 @@ -127,6 +127,7 @@ $errmsg " + ad_script_abort } ad_set_client_property -persistent f "webmail" "client_tz_offset" "" Index: openacs-4/packages/webmail/www/process-search.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/process-search.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/webmail/www/process-search.tcl 10 Sep 2002 22:23:29 -0000 1.2 +++ openacs-4/packages/webmail/www/process-search.tcl 18 Sep 2002 12:17:44 -0000 1.3 @@ -48,7 +48,7 @@ ad_set_client_property -persistent f "webmail" "filter_mailboxes" $mailboxes ad_set_client_property -persistent f "webmail" "filter_constraints" $filter_list ad_returnredirect "clear-cache-view?customize=t&view_id=-1" - return + ad_script_abort } Index: openacs-4/packages/webmail/www/process-selected-messages.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/process-selected-messages.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail/www/process-selected-messages.tcl 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/webmail/www/process-selected-messages.tcl 18 Sep 2002 12:17:44 -0000 1.2 @@ -16,13 +16,13 @@ if { ![exists_and_not_null msg_ids] } { # nothing selected ad_returnredirect $return_url - return + ad_script_abort } ad_set_client_property -persistent f "webmail" "selected_messages" $msg_ids if { [string equal $mailbox_id "@NEW"] } { - ad_returnredirect "folder-create.tcl?target=[ad_urlencode "refile-selected?[export_url_vars return_url]"]" + ad_returnredirect "folder-create?target=[ad_urlencode "refile-selected?[export_url_vars return_url]"]" } set user_id [ad_verify_and_get_user_id] @@ -35,7 +35,7 @@ AND name='TRASH'"] } { wm_return_error "You do not have a 'TRASH' folder--this is a problem." - return + ad_script_abort } wm_mailbox_verify_and_get_name $mailbox_id $user_id @@ -60,7 +60,7 @@ wm_return_error "Refiling of messages failed: $errmsg " - return + ad_script_abort } ad_returnredirect $return_url Index: openacs-4/packages/webmail/www/refile-selected.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/refile-selected.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail/www/refile-selected.tcl 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/webmail/www/refile-selected.tcl 18 Sep 2002 12:17:44 -0000 1.2 @@ -17,7 +17,7 @@ if { ![regexp {^[{} 0-9]+$} $msg_ids] } { wm_return_error "You have specified an invalid message." - return + ad_script_abort } wm_mailbox_verify_and_get_name $mailbox_id $user_id @@ -32,7 +32,7 @@ wm_return_error "Refiling Failed" "Refiling of messages failed: $errmsg " - return + ad_script_abort } ad_returnredirect $return_url Index: openacs-4/packages/webmail/www/admin/admin-choose-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/admin/admin-choose-2.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail/www/admin/admin-choose-2.tcl 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/webmail/www/admin/admin-choose-2.tcl 18 Sep 2002 12:17:45 -0000 1.2 @@ -29,6 +29,7 @@ } } on_error { doc_return 200 text/html "$errmsg" + ad_script_abort } ad_returnredirect "domain-one?[export_url_vars short_name]" Index: openacs-4/packages/webmail/www/admin/delete-user-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/admin/delete-user-2.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail/www/admin/delete-user-2.tcl 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/webmail/www/admin/delete-user-2.tcl 18 Sep 2002 12:17:45 -0000 1.2 @@ -36,9 +36,10 @@ doc_return 200 text/html $result } else { ad_returnredirect "domain-one?[export_url_vars short_name]" + ad_script_abort } } else { ad_returnredirect "domain-one-user?[export_url_vars user_id short_name]" - return + ad_script_abort } Index: openacs-4/packages/webmail/www/admin/domain-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/admin/domain-add-2.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail/www/admin/domain-add-2.tcl 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/webmail/www/admin/domain-add-2.tcl 18 Sep 2002 12:17:45 -0000 1.2 @@ -14,14 +14,14 @@ set short_name [string tolower $short_name] if [db_0or1row check_if_domain_exists "select short_name as sn -from wm_domains where short_name = :short_name"] { + from wm_domains where short_name = :short_name"] { ad_return_complaint 1 "Short name already exists. You either double-clicked or forgot to choose a unique short name" - return + ad_script_abort } else { db_dml add_domain { insert into wm_domains (short_name, full_domain_name) values (:short_name, :full_name) } } -ad_returnredirect "index.tcl" \ No newline at end of file +ad_returnredirect {} \ No newline at end of file Index: openacs-4/packages/webmail/www/admin/domain-add-user-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/admin/domain-add-user-3.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail/www/admin/domain-add-user-3.tcl 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/webmail/www/admin/domain-add-user-3.tcl 18 Sep 2002 12:17:45 -0000 1.2 @@ -14,4 +14,4 @@ wm_add_user $user_id_from_search $username $short_name -ad_returnredirect "domain-one.tcl?[export_url_vars short_name]" +ad_returnredirect "domain-one?[export_url_vars short_name]" Index: openacs-4/packages/webmail/www/admin/domain-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/admin/domain-delete-2.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail/www/admin/domain-delete-2.tcl 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/webmail/www/admin/domain-delete-2.tcl 18 Sep 2002 12:17:45 -0000 1.2 @@ -23,9 +23,10 @@ } db_dml wm_delete_domain "begin webmail.delete_domain(:short_name); end;" ad_returnredirect "index" + ad_script_abort } else { ad_returnredirect "domain-one?[export_url_vars short_name]" - return + ad_script_abort } Index: openacs-4/packages/webmail/www/admin/job-restart.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/admin/job-restart.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail/www/admin/job-restart.tcl 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/webmail/www/admin/job-restart.tcl 18 Sep 2002 12:17:45 -0000 1.2 @@ -14,5 +14,5 @@ ns_db dml $db "begin dbms_job.broken($job, FALSE, sysdate); end;" -ad_returnredirect "problems.tcl" +ad_returnredirect "problems" Index: openacs-4/packages/webmail/www/admin/repeated-message-cleanup.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/admin/repeated-message-cleanup.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail/www/admin/repeated-message-cleanup.tcl 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/webmail/www/admin/repeated-message-cleanup.tcl 18 Sep 2002 12:17:45 -0000 1.2 @@ -27,4 +27,4 @@ } } -ad_returnredirect "problems.tcl" \ No newline at end of file +ad_returnredirect "problems" \ No newline at end of file