Index: openacs-4/packages/general-comments/www/comment-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/comment-add-2.tcl,v
diff -u -r1.8.2.4 -r1.8.2.5
--- openacs-4/packages/general-comments/www/comment-add-2.tcl	29 Apr 2022 08:02:11 -0000	1.8.2.4
+++ openacs-4/packages/general-comments/www/comment-add-2.tcl	3 Oct 2022 12:20:37 -0000	1.8.2.5
@@ -12,7 +12,7 @@
     { object_name "[acs_object_name $object_id]" }
     title:notnull,printable,string_length(max|200)
     content:html,notnull
-    comment_mime_type:notnull,printable
+    comment_mime_type:oneof(text/plain|text/html),notnull
     { context_id:naturalnum "$object_id" }
     { category {} }
     { return_url:localurl {} }
@@ -27,13 +27,6 @@
     object_name:onevalue
     category:onevalue
     return_url:onevalue
-} -validate {
-    comment_mime_type_allowed -requires {comment_mime_type:notnull comment_mime_type:printable} {
-        if {$comment_mime_type ni {"text/plain" "text/html"}} {
-            ad_complain [_ acs-tcl.lt_name_is_not_valid [list name comment_mime_type]]
-            return
-        }
-    }
 }
 
 # check to see if the user can create comments on this object
Index: openacs-4/packages/general-comments/www/comment-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/comment-edit-2.tcl,v
diff -u -r1.8.2.2 -r1.8.2.3
--- openacs-4/packages/general-comments/www/comment-edit-2.tcl	29 Apr 2022 08:02:11 -0000	1.8.2.2
+++ openacs-4/packages/general-comments/www/comment-edit-2.tcl	3 Oct 2022 12:20:37 -0000	1.8.2.3
@@ -18,7 +18,7 @@
     object_id:naturalnum,notnull
     title:notnull,printable,string_length(max|200)
     content:notnull,html
-    comment_mime_type:notnull,printable
+    comment_mime_type:oneof(text/plain|text/html),notnull
     { return_url:localurl {} }
 } -properties {
     page_title:onevalue
@@ -27,13 +27,6 @@
     title:onevalue
     content:onevalue
     target:onevalue
-} -validate {
-    comment_mime_type_allowed -requires comment_mime_type:notnull,printable {
-        if {$comment_mime_type ni {"text/plain" "text/html"}} {
-            ad_complain [_ acs-tcl.lt_name_is_not_valid [list name comment_mime_type]]
-            return
-        }
-    }
 }
 
 
Index: openacs-4/packages/general-comments/www/comment-edit-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/comment-edit-3.tcl,v
diff -u -r1.7.2.2 -r1.7.2.3
--- openacs-4/packages/general-comments/www/comment-edit-3.tcl	29 Apr 2022 08:02:11 -0000	1.7.2.2
+++ openacs-4/packages/general-comments/www/comment-edit-3.tcl	3 Oct 2022 12:20:37 -0000	1.7.2.3
@@ -11,15 +11,8 @@
     comment_id:naturalnum,notnull
     title:notnull,printable,string_length(max|200)
     content:notnull,html
-    comment_mime_type:notnull,printable
+    comment_mime_type:oneof(text/plain|text/html),notnull
     { return_url:localurl {} }
-} -validate {
-   comment_mime_type_allowed -requires comment_mime_type:notnull,printable {
-       if {$comment_mime_type ni {"text/plain" "text/html"}} {
-           ad_complain [_ acs-tcl.lt_name_is_not_valid [list name comment_mime_type]]
-           return
-       }
-   }
 }
 
 # check to see if the user can edit this comment