Index: openacs-4/packages/dotlrn/tcl/community-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.xql,v diff -u -r1.34 -r1.35 --- openacs-4/packages/dotlrn/tcl/community-procs.xql 11 Mar 2002 22:24:32 -0000 1.34 +++ openacs-4/packages/dotlrn/tcl/community-procs.xql 13 Mar 2002 06:14:09 -0000 1.35 @@ -256,6 +256,11 @@ + + +select 1 from dotlrn_active_comms_not_closed where community_id= :community_id + + Index: openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl,v diff -u -r1.27 -r1.28 --- openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl 8 Mar 2002 00:27:05 -0000 1.27 +++ openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl 13 Mar 2002 06:14:09 -0000 1.28 @@ -21,6 +21,19 @@ namespace eval dotlrn { + ad_proc -public generate_key { + {-name:required} + } { + Generate a key from a name. Uses a concatination of the + name and nexval of the acs_oid sequence. To generate a + globally unique key that can be used in urls. + + FIXME : this is abuse of the sequence, add sequence for this in dotlrn + } { + regsub -all {\W+} $name "" name + return "$name-[db_nextval acs_object_id_seq]" + } + ad_proc -private do_abort {} { do an abort if security violation } { Index: openacs-4/packages/dotlrn/www/subcommunity-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/subcommunity-new.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/dotlrn/www/subcommunity-new.tcl 11 Mar 2002 22:24:32 -0000 1.5 +++ openacs-4/packages/dotlrn/www/subcommunity-new.tcl 13 Mar 2002 06:14:09 -0000 1.6 @@ -16,12 +16,6 @@ form create add_subcomm -element create add_subcomm subcomm_key \ - -label "[ad_parameter subcommunity_pretty_name] Key (a short name, no spaces)" \ - -datatype text \ - -widget text \ - -html {size 60} - element create add_subcomm pretty_name \ -label "Name" \ -datatype text \ @@ -47,8 +41,7 @@ -value $referer if {[form is_valid add_subcomm]} { - form get_values add_subcomm \ - subcomm_key pretty_name join_policy referer description + form get_values add_subcomm pretty_name join_policy referer description # we set some extra vars based on the community_type of the parent set parent_type \ @@ -77,7 +70,6 @@ -parent_community_id $parent_community_id \ -description $description \ -community_type "dotlrn_community" \ - -community_key $subcomm_key \ -pretty_name $pretty_name \ -extra_vars $extra_vars]