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 -r1.58 -r1.58.2.1
--- openacs-4/packages/acs-admin/acs-admin.info 27 Sep 2018 08:59:05 -0000 1.58
+++ openacs-4/packages/acs-admin/acs-admin.info 17 May 2019 19:28:06 -0000 1.58.2.1
@@ -9,7 +9,7 @@
f
t
-
+
Don Baccus
An interface for Site-wide administration of an OpenACS Installation.
2017-08-06
@@ -20,7 +20,7 @@
GPL
3
-
+
Index: openacs-4/packages/acs-admin/www/users/member-state-change.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/member-state-change.tcl,v
diff -u -r1.23 -r1.23.2.1
--- openacs-4/packages/acs-admin/www/users/member-state-change.tcl 12 Jun 2018 14:27:23 -0000 1.23
+++ openacs-4/packages/acs-admin/www/users/member-state-change.tcl 17 May 2019 19:28:06 -0000 1.23.2.1
@@ -11,6 +11,7 @@
{member_state:trim}
{email_verified_p:boolean ""}
{return_url:localurl ""}
+ {pass_through:boolean}
} -validate {
valid_member_state -requires member_state {
if {$member_state ni {approved banned deleted merged "needs approval" rejected}} {
@@ -97,6 +98,11 @@
set return_url [acs_community_member_admin_url -user_id $user_id]
}
+if {$pass_through} {
+ ad_returnredirect $return_url
+ ad_script_abort
+}
+
set context [list [list "./" "Users"] "$action"]
set export_vars [export_vars {email email_from subject message return_url}]
Index: openacs-4/packages/dotlrn/dotlrn.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/dotlrn.info,v
diff -u -r1.148.2.1 -r1.148.2.2
--- openacs-4/packages/dotlrn/dotlrn.info 15 Mar 2019 08:59:18 -0000 1.148.2.1
+++ openacs-4/packages/dotlrn/dotlrn.info 17 May 2019 19:28:06 -0000 1.148.2.2
@@ -7,19 +7,19 @@
f
f
-
+
OpenACS
A Course Management System
2017-08-06
DotLRN Consortium
2
Course Management
-
+
-
+
Index: openacs-4/packages/dotlrn/www/index-not-a-user.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/index-not-a-user.tcl,v
diff -u -r1.20 -r1.20.2.1
--- openacs-4/packages/dotlrn/www/index-not-a-user.tcl 29 Jun 2018 17:27:19 -0000 1.20
+++ openacs-4/packages/dotlrn/www/index-not-a-user.tcl 17 May 2019 19:28:06 -0000 1.20.2.1
@@ -14,8 +14,6 @@
# details.
#
-# dotlrn/www/index-not-a-user.tcl
-
ad_page_contract {
@author yon (yon@openforce.net)
@creation-date Dec 11, 2001
@@ -29,8 +27,12 @@
}
if { [dotlrn::admin_p] } {
- set return_url [export_vars -base "[dotlrn::get_admin_url]/user-new-2" { { user_id {[ad_conn user_id]} } { referer "[dotlrn::get_url]/"} }]
- set self_approve_url [export_vars -base "[apm_package_url_from_key "acs-admin"]users/member-state-change" { { user_id {[ad_conn user_id]} } { member_state approved} return_url }]
+ set return_url [export_vars -base "[dotlrn::get_admin_url]/user-new-2" {
+ { user_id {[ad_conn user_id]} } { referer "[dotlrn::get_url]/"}
+ }]
+ set self_approve_url [export_vars -base "[apm_package_url_from_key acs-admin]users/member-state-change" {
+ { user_id {[ad_conn user_id]} } { member_state approved} return_url {pass_through 1}
+ }]
ad_returnredirect $self_approve_url
ad_script_abort
}