Index: openacs-4/contrib/packages/general-comments/www/comment-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/general-comments/www/Attic/comment-add.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/general-comments/www/comment-add.tcl	2 May 2003 15:50:44 -0000	1.1
+++ openacs-4/contrib/packages/general-comments/www/comment-add.tcl	5 Jun 2003 00:50:43 -0000	1.2
@@ -9,9 +9,11 @@
     @cvs-id $Id$
 } { 
     object_id:integer,notnull
-    { object_name "[acs_object_name $object_id]" }
+    comment_id:integer,optional
     { context_id "$object_id" }
-    { category "" }
+    { title "" }
+    { content "" }
+    { object_name "" }
     { return_url "" }
 } -properties {
     page_title:onevalue
@@ -28,7 +30,20 @@
 }
 
 # check to see if the user can create comments on this object
-ad_require_permission $object_id general_comments_create
+set user_id [ad_conn user_id]
+set creation_ip [ad_conn peeraddr]
+# this works unless we allow the comment-add page to be included
+set package_id [ad_conn package_id]
+set is_live "t"
+# if {![ad_form_new_p -key comment_id]} {
+#     permission::require_permission -object_id $comment_id \
+# 	                           -party_id $user_id \
+# 	                           -privilege "write"
+# } else {
+#     permission::require_permission -object_id $object_id \
+# 	                           -party_id $user_id \
+# 	                           -privilege "general_comment_create"
+# }
 
 # ad_page_contract does not set object_name to
 # [acs_object_name $object_id] if object_name is passed
@@ -37,17 +52,78 @@
     set object_name [acs_object_name $object_id]
 }
 
-set page_title "[_ general-comments.Add_a_comment_to]: $object_name"
-set context "\"[_ general-comments.Add_comment]\""
-set target "comment-add-2"
-set title ""
-set content ""
-set comment_mime_type "text/plain"
+ad_form -name comment -export { object_id object_name context_id return_url} -confirm_template comment-confirm -form {
+    comment_id:key
+    {title:text
+	{label "[_ general_comments.Title]"}
+	{value $title}
+	{html {maxlength 200 size 50}}
+    }
+    {content:richtext
+	{label "[_ general_comments.Comment]"}
+	{value $content}
+	{html {cols 80 rows 20}}
+    }
+    {submit:text(submit)
+	{value "[_ general_comments.Proceed]"}
+    }
+} -new_data {
+    set comment_mime_type [template::util::richtext::get_property format $content]
+    set content [template::util::richtext::get_property contents $content]
+    general_comments::general_comment::create \
+	-object_id $object_id \
+        -comment_id $comment_id \
+	-title $title \
+        -content $content \
+	-comment_mime_type $comment_mime_type \
+	-context_id $context_id \
+	-package_id $package_id \
+	-is_live $is_live \
+	-user_id $user_id \
+	-creation_ip $creation_ip
+    if {[exists_and_not_null return_url]} {
+	ad_returnredirect $return_url
+    } else {
+	ad_returnredirect "comment?[export_vars $object_id]"
+    }
+    ad_script_abort
+} -edit_data {
+    general_comments::general_comment::set
+    general_comments::general_comment::create \
+	-object_id $object_id \
+        -comment_id $comment_id \
+	-title $title \
+	-content $content \
+	-comment_mime_type $comment_mime_type \
+	-context_id $context_id \
+	-package_id $package_id \
+	-is_live $is_live \
+	-creation_user $user_id \
+	-creation_ip $peer_addr
+        if {[exists_and_not_null return_url]} {
+	ad_returnredirect $return_url
+    } else {
+	ad_returnredirect "comment?[export_vars $object_id]"
+    }
+    ad_script_abort
+}
 
-ad_return_template "comment-ae"
+if {[ad_form_new_p -key comment_id]} {
+    set page_title "[_ general-comments.Add_a_comment_to]: $object_name"
+    set context "\"[_ general-comments.Add_comment]\""
+} else {
+    set page_title "[_ general-comments.Edit_a_comment_to]: $object_name"
+    set context "\"[_ general-comments.Edit_comment]\""
+}
 
+#set title ""
+#set content ""
 
 
+ad_return_template
 
 
 
+
+
+