Index: openacs-4/packages/acs-tcl/tcl/admin-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/admin-procs.tcl,v diff -u -r1.23 -r1.24 --- openacs-4/packages/acs-tcl/tcl/admin-procs.tcl 15 Jun 2015 11:20:16 -0000 1.23 +++ openacs-4/packages/acs-tcl/tcl/admin-procs.tcl 7 Aug 2017 23:47:59 -0000 1.24 @@ -38,16 +38,27 @@ ad_proc -private ad_user_class_parameters {} { Returns the list of parameter var names used to define a user class. } { - return [list category_id country_code usps_abbrev intranet_user_p group_id last_name_starts_with email_starts_with expensive user_state sex age_above_years age_below_years registration_during_month registration_before_days registration_after_days registration_after_date last_login_before_days last_login_after_days last_login_equals_days number_visits_below number_visits_above user_class_id sql_post_select crm_state curriculum_elements_completed] + return { + category_id country_code usps_abbrev intranet_user_p + group_id last_name_starts_with email_starts_with expensive + user_state sex age_above_years age_below_years + registration_during_month registration_before_days + registration_after_days registration_after_date + last_login_before_days last_login_after_days + last_login_equals_days number_visits_below number_visits_above + user_class_id sql_post_select crm_state + curriculum_elements_completed + } } ad_proc -private ad_user_class_description { set_id } { - Takes an ns_set of key/value pairs and produces a human-readable description of the class of users specified. + Takes an ns_set of key/value pairs and produces a human-readable + description of the class of users specified. } { set clauses [list] set pretty_description "" - # turn all the parameters in the ns_set into tcl vars + # turn all the parameters in the ns_set into Tcl vars ad_ns_set_to_tcl_vars -duplicates fail $set_id # All the SQL statements are named after the criteria name (e.g. category_id) @@ -178,41 +189,63 @@ user_id {return_url ""} } { - Returns the admininistation links to change the user's state in the user_state finite state machine. If the nohtml switch is set, then a list of lists will be returned (url label). + Returns the admininistation links to change the user's state + in the user_state finite state machine. If the nohtml switch + is set, then a list of lists will be returned (url label). } { set user_finite_states [list] switch $member_state { "approved" { lappend user_finite_states \ - [list [export_vars -base "/acs-admin/users/member-state-change" {user_id return_url {member_state banned}}] [_ acs-tcl.ban]] \ - [list [export_vars -base "/acs-admin/users/member-state-change" {user_id return_url {member_state deleted}}] [_ acs-tcl.delete]] + [list [export_vars -base "/acs-admin/users/member-state-change" { + user_id return_url {member_state banned} + }] [_ acs-tcl.ban]] \ + [list [export_vars -base "/acs-admin/users/member-state-change" { + user_id return_url {member_state deleted} + }] [_ acs-tcl.delete]] } "deleted" { lappend user_finite_states \ - [list [export_vars -base "/acs-admin/users/member-state-change" {user_id return_url {member_state approved}}] [_ acs-tcl.undelete]] \ - [list [export_vars -base "/acs-admin/users/member-state-change" {user_id return_url {member_state banned}}] [_ acs-tcl.ban]] + [list [export_vars -base "/acs-admin/users/member-state-change" { + user_id return_url {member_state approved} + }] [_ acs-tcl.undelete]] \ + [list [export_vars -base "/acs-admin/users/member-state-change" { + user_id return_url {member_state banned} + }] [_ acs-tcl.ban]] } "needs approval" { lappend user_finite_states \ - [list [export_vars -base "/acs-admin/users/member-state-change" {user_id return_url {member_state approved}}] [_ acs-tcl.approve]] \ - [list [export_vars -base "/acs-admin/users/member-state-change" {user_id return_url {member_state rejected}}] [_ acs-tcl.reject]] + [list [export_vars -base "/acs-admin/users/member-state-change" { + user_id return_url {member_state approved} + }] [_ acs-tcl.approve]] \ + [list [export_vars -base "/acs-admin/users/member-state-change" { + user_id return_url {member_state rejected} + }] [_ acs-tcl.reject]] } "rejected" { lappend user_finite_states \ - [list [export_vars -base "/acs-admin/users/member-state-change" {user_id return_url {member_state approved}}] [_ acs-tcl.approve]] + [list [export_vars -base "/acs-admin/users/member-state-change" { + user_id return_url {member_state approved} + }] [_ acs-tcl.approve]] } "banned" { lappend user_finite_states \ - [list [export_vars -base "/acs-admin/users/member-state-change" {user_id return_url {member_state approved}}] [_ acs-tcl.approve]] + [list [export_vars -base "/acs-admin/users/member-state-change" { + user_id return_url {member_state approved} + }] [_ acs-tcl.approve]] } } if { $email_verified_p == "t" } { lappend user_finite_states \ - [list [export_vars -base "/acs-admin/users/member-state-change" {user_id return_url {email_verified_p f}}] [_ acs-tcl.lt_require_email_verific]] + [list [export_vars -base "/acs-admin/users/member-state-change" { + user_id return_url {email_verified_p f} + }] [_ acs-tcl.lt_require_email_verific]] } else { lappend user_finite_states \ - [list [export_vars -base "/acs-admin/users/member-state-change" {user_id return_url {email_verified_p t}}] [_ acs-tcl.approve_email]] + [list [export_vars -base "/acs-admin/users/member-state-change" { + user_id return_url {email_verified_p t} + }] [_ acs-tcl.approve_email]] } if { $nohtml_p } { @@ -222,17 +255,21 @@ } else { - # Build the list of A tags + # Build a list of anchor tags - set user_finite_state_links [list] - + set user_finite_state_links {} foreach elm $user_finite_states { - set url [lindex $elm 0] - set label [lindex $elm 1] + lassign $elm url label lappend user_finite_state_links [subst {$label}] } return $user_finite_state_links } } + +# Local variables: +# mode: tcl +# tcl-indent-level: 4 +# indent-tabs-mode: nil +# End: