Index: openacs-4/packages/sloan-bboard/www/category-unsubscribe.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/category-unsubscribe.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/sloan-bboard/www/category-unsubscribe.tcl 15 Feb 2002 21:27:06 -0000 1.1 +++ openacs-4/packages/sloan-bboard/www/category-unsubscribe.tcl 18 Mar 2002 05:14:30 -0000 1.2 @@ -10,6 +10,7 @@ forum_id:integer,notnull category_id:integer,notnull,bboard_category_id {sub_page ""} + {return_url ""} } # Not strictly right @@ -20,8 +21,12 @@ -category_id $category_id -subscriber_id [ad_verify_and_get_user_id] } -if [empty_string_p $sub_page] { - ad_returnredirect "forum-by-category?category_id=$category_id&forum_id=$forum_id" +if {[empty_string_p $return_url]} { + if [empty_string_p $sub_page] { + ad_returnredirect "forum-by-category?category_id=$category_id&forum_id=$forum_id" + } else { + ad_returnredirect "subscriptions" + } } else { - ad_returnredirect "subscriptions" + ad_returnredirect $return_url } Index: openacs-4/packages/sloan-bboard/www/forum-unsubscribe.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/forum-unsubscribe.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/sloan-bboard/www/forum-unsubscribe.tcl 15 Feb 2002 21:27:07 -0000 1.1 +++ openacs-4/packages/sloan-bboard/www/forum-unsubscribe.tcl 18 Mar 2002 05:14:30 -0000 1.2 @@ -8,6 +8,7 @@ } { forum_id:integer,notnull,bboard_forum_id + {return_url ""} {sub_page ""} } @@ -16,8 +17,12 @@ -forum_id $forum_id -subscriber_id [ad_verify_and_get_user_id] } -if [empty_string_p $sub_page] { - ad_returnredirect "forum?forum_id=$forum_id" +if {[empty_string_p $return_url]} { + if [empty_string_p $sub_page] { + ad_returnredirect "forum?forum_id=$forum_id" + } else { + ad_returnredirect "subscriptions" + } } else { - ad_returnredirect "subscriptions" + ad_returnredirect $return_url } Index: openacs-4/packages/sloan-bboard/www/message-unsubscribe.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/message-unsubscribe.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/sloan-bboard/www/message-unsubscribe.tcl 15 Feb 2002 21:27:07 -0000 1.1 +++ openacs-4/packages/sloan-bboard/www/message-unsubscribe.tcl 18 Mar 2002 05:14:30 -0000 1.2 @@ -10,15 +10,20 @@ forum_id:integer,notnull,bboard_forum_id message_id:integer,notnull,acs_message_id {sub_page ""} + {return_url ""} } catch { bboard_unsubscribe_thread \ -thread_id $message_id -subscriber_id [ad_verify_and_get_user_id] } -if [empty_string_p $sub_page] { - ad_returnredirect "[bboard_message_page]?forum_id=$forum_id&message_id=$message_id" +if {[empty_string_p $return_url]} { + if [empty_string_p $sub_page] { + ad_returnredirect "[bboard_message_page]?forum_id=$forum_id&message_id=$message_id" + } else { + ad_returnredirect "subscriptions" + } } else { - ad_returnredirect "subscriptions" + ad_returnredirect $return_url }