Index: openacs-4/packages/dotlrn/tcl/community-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.tcl,v
diff -u -r1.234.2.7 -r1.234.2.8
--- openacs-4/packages/dotlrn/tcl/community-procs.tcl	6 Aug 2020 13:13:40 -0000	1.234.2.7
+++ openacs-4/packages/dotlrn/tcl/community-procs.tcl	24 Nov 2020 15:26:17 -0000	1.234.2.8
@@ -1211,23 +1211,57 @@
                     -- $name]
     }
 
+    ad_proc -private validate_community_key {
+        {-community_key:required}
+        {-parent_community_id ""}
+    } {
+        Checks if the community_key passed in is valid for creating a
+        new community by checking that the name does not contain
+        spaces and that it's not the same as an existing (possible)
+        sibling's name.
 
+        @return dict with fields 'valid_p' and 'errmsg'
+    } {
+        set errmsg ""
+        set valid_p true
+
+        if {[regexp {\s+} $community_key]} {
+            set valid_p false
+            set errmsg [_ acs-templating.Invalid_url_element [list value $community_key]]
+        } elseif {![db_0or1row collision_check {
+          select 1 from dual where exists (
+            select 1 from dotlrn_communities_all
+             where (:parent_community_id is null or parent_community_id = :parent_community_id)
+               and community_key = :community_key)
+        }]} {
+            set valid_p false
+            set errmsg [_ dotlrn.community_name_already_in_use [list community_key $community_key]]
+        }
+
+        return [list \
+                    valid_p $valid_p \
+                    errmsg $errmsg]
+    }
+
     ad_proc -public check_community_key_valid_p {
         {-community_key:required}
         {-parent_community_id ""}
         {-complain_if_invalid:boolean}
     } {
-        Checks if the community_key passed in is valid for creating a new
-        community by checking that it's not the same as an existing (possible)
+        Checks if the community_key passed in is valid for creating a
+        new community by checking that the name does not contain
+        spaces and that it's not the same as an existing (possible)
         sibling's name.
-    } {
-        set valid_p [expr {![db_0or1row collision_check {}]}]
 
+        @return boolean, or a complaint in the response if
+                complain_if_invalid is set
+    } {
+        set validation [dotlrn_community::validate_community_key]
+        set valid_p [dict get $validation valid_p]
         if {$complain_if_invalid_p && !$valid_p} {
-            ns_log notice "The name '$community_key' is already in use either by an active or archived group. \n Please go back and select a different name."
-            ad_return_complaint 1 \
-                [_ dotlrn.community_name_already_in_use [list community_key $community_key]]
-
+            set errmsg [dict get $validation errmsg]
+            ns_log notice $errmsg
+            ad_return_complaint 1 $errmsg
             ad_script_abort
         } else {
             return $valid_p
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.100 -r1.100.2.1
--- openacs-4/packages/dotlrn/tcl/community-procs.xql	18 Sep 2018 17:27:14 -0000	1.100
+++ openacs-4/packages/dotlrn/tcl/community-procs.xql	24 Nov 2020 15:26:17 -0000	1.100.2.1
@@ -52,15 +52,6 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="dotlrn_community::check_community_key_valid_p.collision_check">
-        <querytext>
-          select 1 from dual where exists (
-            select 1 from dotlrn_communities_all
-             where (:parent_community_id is null or parent_community_id = :parent_community_id)
-               and community_key = :community_key)
-        </querytext>
-    </fullquery>
-
     <fullquery name="dotlrn_community::new.update_portal_ids">
         <querytext>
             update dotlrn_communities_all