Index: openacs-4/packages/faq/www/admin/one-faq.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/one-faq.adp,v diff -u -N -r1.18 -r1.18.2.1 --- openacs-4/packages/faq/www/admin/one-faq.adp 7 Aug 2017 23:48:10 -0000 1.18 +++ openacs-4/packages/faq/www/admin/one-faq.adp 27 Jul 2021 09:32:54 -0000 1.18.2.1 @@ -17,7 +17,7 @@ ( #faq.edit# | #faq.preview# | - #faq.delete# | + #faq.delete# | #faq.insert_after# | #faq.swap_with_next# Index: openacs-4/packages/faq/www/admin/one-question.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/one-question.tcl,v diff -u -N -r1.9 -r1.9.2.1 --- openacs-4/packages/faq/www/admin/one-question.tcl 4 Oct 2017 13:11:08 -0000 1.9 +++ openacs-4/packages/faq/www/admin/one-question.tcl 27 Jul 2021 09:32:54 -0000 1.9.2.1 @@ -31,7 +31,7 @@ set context [list [list "one-faq?faq_id=$faq_id" "$faq_name"] "[_ faq.One_Question]"] set edit_url [export_vars -base q-and-a-add-edit { entry_id faq_id }] -set delete_url [export_vars -base q_and_a-delete { entry_id faq_id }] +set delete_url [export_vars -base q-and-a-delete { entry_id faq_id }] set create_url [export_vars -base q-and-a-add-edit { faq_id } ] ad_return_template Index: openacs-4/packages/faq/www/admin/q-and-a-delete-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/Attic/q-and-a-delete-oracle.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/faq/www/admin/q-and-a-delete-oracle.xql 27 Jul 2021 09:32:55 -0000 1.1.2.1 @@ -0,0 +1,17 @@ + + + + oracle + 8.1.6 + + + + + begin; + select acs_object.delete(entry_id) + from faq_q_and_as where entry_id = :entry_id; + end; + + + + Index: openacs-4/packages/faq/www/admin/q-and-a-delete-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/Attic/q-and-a-delete-postgresql.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/faq/www/admin/q-and-a-delete-postgresql.xql 27 Jul 2021 09:32:55 -0000 1.1.2.1 @@ -0,0 +1,15 @@ + + + + postgresql + 7.1 + + + + + select acs_object__delete(entry_id) + from faq_q_and_as where entry_id = :entry_id; + + + + Index: openacs-4/packages/faq/www/admin/q-and-a-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/Attic/q-and-a-delete.tcl,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/faq/www/admin/q-and-a-delete.tcl 27 Jul 2021 09:32:55 -0000 1.1.2.1 @@ -0,0 +1,28 @@ +#faq/www/admin/q-and-a-delete.tcl + +ad_page_contract { + + delete a QandA + @author peterv@ybos.net + @creation-date 2000-10-25 + +} { + entry_id:naturalnum,notnull +} + +# We need to rethink the q-and-a permissioning. + +permission::require_permission -object_id [ad_conn package_id] -privilege faq_delete_faq + +db_1row get_faq_id "select faq_id from faq_q_and_as where entry_id=:entry_id" + +db_exec_plsql delete_entry {} + +ad_returnredirect "one-faq?faq_id=$faq_id" +ad_script_abort + +# Local variables: +# mode: tcl +# tcl-indent-level: 4 +# indent-tabs-mode: nil +# End: Index: openacs-4/packages/faq/www/admin/q-and-a-edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/Attic/q-and-a-edit-2.tcl,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/faq/www/admin/q-and-a-edit-2.tcl 27 Jul 2021 09:32:55 -0000 1.1.2.1 @@ -0,0 +1,35 @@ +#faq/www/admin/q-and-a-edit-2.tcl + +ad_page_contract { + + Edits a particular Q and A + + @author Peter Vessenes peterv@ybos.net + @creation-date 2000-10-25 +} { + entry_id:naturalnum,notnull + question:html + answer:html + +} + +permission::require_permission -object_id [ad_conn package_id] -privilege faq_modify_faq +# Don't forget to do the permissioning + +db_dml q_and_a_edit "update faq_q_and_as + set question = :question, + answer = :answer + where entry_id = :entry_id" + +set faq_id [db_string select_faq_id "select faq_id from + faq_q_and_as + where entry_id = :entry_id"] + +ad_returnredirect "one-faq?faq_id=$faq_id" +ad_script_abort + +# Local variables: +# mode: tcl +# tcl-indent-level: 4 +# indent-tabs-mode: nil +# End: Index: openacs-4/packages/faq/www/admin/q-and-a-edit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/Attic/q-and-a-edit.adp,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/faq/www/admin/q-and-a-edit.adp 27 Jul 2021 09:32:55 -0000 1.1.2.1 @@ -0,0 +1,32 @@ + +@context;literal@ +#faq.One_Question# + +
+ + + + + + + + + + + + + + + + + + +
#faq.Question# + +
#faq.Answer# + +
 
  #faq.Delete_This_QA#
+
+ + + Index: openacs-4/packages/faq/www/admin/q-and-a-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/Attic/q-and-a-edit.tcl,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/faq/www/admin/q-and-a-edit.tcl 27 Jul 2021 09:32:55 -0000 1.1.2.1 @@ -0,0 +1,41 @@ +#faq/www/admin/q-and-a-edit.tcl + +ad_page_contract { + + View contents of one Q&A + @author Elizabeth Wirth (wirth@ybos.net) + @author Jennie Housman (jennie@ybos.net) + @creation-date 2000-10-24 + +} { + + entry_id:naturalnum,notnull +} -properties { + entry_id:onevalue +} + +set package_id [ad_conn package_id] + +permission::require_permission -object_id $package_id -privilege faq_modify_faq + +set action "q-and-a-edit-2" +set submit_label [_ faq.Update_This_QA] + +set user_id [ad_conn user_id] + +db_1row q_and_a_info "select question, answer,faq_name,qa.faq_id + from faq_q_and_as qa, faqs f + where entry_id = :entry_id + and f.faq_id = qa.faq_id" + +set context [list [list "one-faq?faq_id=$faq_id" "$faq_name"] "One Q&A"] + +set delete_url [export_vars -base q-and-a-delete { entry_id faq_id }] + +ad_return_template + +# Local variables: +# mode: tcl +# tcl-indent-level: 4 +# indent-tabs-mode: nil +# End: Index: openacs-4/packages/faq/www/admin/q-and-a-new-2-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/Attic/q-and-a-new-2-postgresql.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/faq/www/admin/q-and-a-new-2-postgresql.xql 27 Jul 2021 09:32:56 -0000 1.1.2.1 @@ -0,0 +1,24 @@ + + + + postgresql7.1 + + + + select faq__new_q_and_a ( + :entry_id, + :faq_id, + :question, + :answer, + :sort_key, + 'faq_q_and_a', + now(), + :user_id, + :creation_ip, + :faq_id + ); + + + + + Index: openacs-4/packages/faq/www/admin/q-and-a-new-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/Attic/q-and-a-new-2.tcl,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/faq/www/admin/q-and-a-new-2.tcl 27 Jul 2021 09:32:56 -0000 1.1.2.1 @@ -0,0 +1,84 @@ +#faq/www/admin/q-and-a-new-2.tcl + +ad_page_contract { + + Adds a new Q&A to a FAQ + + @author wirth@ybos.net + @creation-date 2000-10-25 + +} { + faq_id:naturalnum,notnull,trim + question:html,notnull,trim + answer:html,notnull,trim + entry_id:naturalnum,optional + insert_p:boolean,optional + +} + +set package_id [ad_conn package_id] + +permission::require_permission -object_id $package_id -privilege faq_create_faq + +set user_id [ad_conn user_id] +set creation_ip [ad_conn host] + +if {$insert_p == "t" } { + + + + # this q+a being added after an existing question + # make room - then do the insert + set last_entry_id $entry_id + + db_transaction { + set old_sort_key [db_string faq_sortkey_get "select sort_key + from faq_q_and_as + where entry_id = :last_entry_id"] + + set sql_update_q_and_as " + update faq_q_and_as + set sort_key = sort_key + 1 + where sort_key > :old_sort_key" + + db_dml faq_update $sql_update_q_and_as + + set sort_key [expr {$old_sort_key + 1}] + + set entry_id [db_nextval acs_object_id_seq] + } + +} else { + + db_transaction { + set entry_id [db_nextval acs_object_id_seq] + set sort_key $entry_id + } +} + + +db_transaction { + db_exec_plsql create_q_and_a { + begin + :1 := faq.new_q_and_a ( + entry_id => :entry_id, + context_id => :faq_id, + faq_id=> :faq_id, + question => :question, + answer => :answer, + sort_key => :sort_key, + creation_user => :user_id, + creation_ip => :creation_ip + ); + end; + } +} + +ad_returnredirect [export_vars -base one-faq {faq_id}] +ad_script_abort + +# Local variables: +# mode: tcl +# tcl-indent-level: 4 +# indent-tabs-mode: nil +# End: Index: openacs-4/packages/faq/www/admin/q-and-a-new.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/Attic/q-and-a-new.adp,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/faq/www/admin/q-and-a-new.adp 27 Jul 2021 09:32:56 -0000 1.1.2.1 @@ -0,0 +1,33 @@ + +@page_title;literal@ +@context;literal@ +question.question + +
+
+ + +
+ + + + + + + + + + + + + + + + + + +

#faq.Question# +

#faq.Answer# +
+
+ Index: openacs-4/packages/faq/www/admin/q-and-a-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/Attic/q-and-a-new.tcl,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/faq/www/admin/q-and-a-new.tcl 27 Jul 2021 09:32:56 -0000 1.1.2.1 @@ -0,0 +1,54 @@ +#faq/www/admin/q-and-a-new.tcl + +ad_page_contract { + + Displays a form for creating a new Q&A. + + @author Elizabeth Wirth (wirth@ybos.net) + @author Jennie Housman (jennie@ybos.net) + @creation-date 2000-10-24 +} { + + entry_id:naturalnum,optional + faq_id:naturalnum,notnull + +} -properties { + context:onevalue + entry_id:onevalue + title:onevalue + action:onevalue + submit_label:onevalue + question:onevalue + question_q:onevalue + answer:onevalue + answer_q:onevalue +} + +permission::require_permission -object_id [ad_conn package_id] -privilege faq_create_faq + +db_1row get_name "select faq_name from faqs where faq_id=:faq_id" + +set page_title [_ faq.Add_QA_for_faq_name] +set context [list [list "one-faq?faq_id=$faq_id" "$faq_name"] [_ faq.Create_new_QA]] +set title [_ faq.Create_new_QA] +set target "q-and-a-new-2" +set submit_label [_ faq.Create_QA] +set question "" +set answer "" +set insert_p "f" + +if { [info exists entry_id]} { + set insert_p "t" +} + +set question_q [ns_quotehtml $question] +set answer_q [ns_quotehtml $answer] + +ad_return_template + + +# Local variables: +# mode: tcl +# tcl-indent-level: 4 +# indent-tabs-mode: nil +# End: Index: openacs-4/packages/faq/www/admin/q_and_a-delete-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/q_and_a-delete-oracle.xql,v diff -u -N --- openacs-4/packages/faq/www/admin/q_and_a-delete-oracle.xql 31 Jan 2019 10:02:04 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,17 +0,0 @@ - - - - oracle - 8.1.6 - - - - - begin; - select acs_object.delete(entry_id) - from faq_q_and_as where entry_id = :entry_id; - end; - - - - Index: openacs-4/packages/faq/www/admin/q_and_a-delete-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/q_and_a-delete-postgresql.xql,v diff -u -N --- openacs-4/packages/faq/www/admin/q_and_a-delete-postgresql.xql 14 Feb 2019 16:15:01 -0000 1.1.26.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ - - - - postgresql - 7.1 - - - - - select acs_object__delete(entry_id) - from faq_q_and_as where entry_id = :entry_id; - - - - Index: openacs-4/packages/faq/www/admin/q_and_a-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/q_and_a-delete.tcl,v diff -u -N --- openacs-4/packages/faq/www/admin/q_and_a-delete.tcl 14 Feb 2019 16:15:01 -0000 1.6.2.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,28 +0,0 @@ -#faq/www/admin/q_and_a-delete.tcl - -ad_page_contract { - - delete a QandA - @author peterv@ybos.net - @creation-date 2000-10-25 - -} { - entry_id:naturalnum,notnull -} - -# We need to rethink the q-and-a permissioning. - -permission::require_permission -object_id [ad_conn package_id] -privilege faq_delete_faq - -db_1row get_faq_id "select faq_id from faq_q_and_as where entry_id=:entry_id" - -db_exec_plsql delete_entry {} - -ad_returnredirect "one-faq?faq_id=$faq_id" -ad_script_abort - -# Local variables: -# mode: tcl -# tcl-indent-level: 4 -# indent-tabs-mode: nil -# End: Index: openacs-4/packages/faq/www/admin/q_and_a-edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/q_and_a-edit-2.tcl,v diff -u -N --- openacs-4/packages/faq/www/admin/q_and_a-edit-2.tcl 19 Jan 2018 14:44:17 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,35 +0,0 @@ -#faq/www/admin/q_and_a-edit-2.tcl - -ad_page_contract { - - Edits a particular Q and A - - @author Peter Vessenes peterv@ybos.net - @creation-date 2000-10-25 -} { - entry_id:naturalnum,notnull - question:html - answer:html - -} - -permission::require_permission -object_id [ad_conn package_id] -privilege faq_modify_faq -# Don't forget to do the permissioning - -db_dml q_and_a_edit "update faq_q_and_as - set question = :question, - answer = :answer - where entry_id = :entry_id" - -set faq_id [db_string select_faq_id "select faq_id from - faq_q_and_as - where entry_id = :entry_id"] - -ad_returnredirect "one-faq?faq_id=$faq_id" -ad_script_abort - -# Local variables: -# mode: tcl -# tcl-indent-level: 4 -# indent-tabs-mode: nil -# End: Index: openacs-4/packages/faq/www/admin/q_and_a-edit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/q_and_a-edit.adp,v diff -u -N --- openacs-4/packages/faq/www/admin/q_and_a-edit.adp 3 Jul 2015 10:47:35 -0000 1.12 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,32 +0,0 @@ - -@context;literal@ -#faq.One_Question# - -
- - - - - - - - - - - - - - - - - - -
#faq.Question# - -
#faq.Answer# - -
 
  #faq.Delete_This_QA#
-
- - - Index: openacs-4/packages/faq/www/admin/q_and_a-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/q_and_a-edit.tcl,v diff -u -N --- openacs-4/packages/faq/www/admin/q_and_a-edit.tcl 7 Aug 2017 23:48:10 -0000 1.8 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,41 +0,0 @@ -#faq/www/admin/q_and_a-edit.tcl - -ad_page_contract { - - View contents of one Q&A - @author Elizabeth Wirth (wirth@ybos.net) - @author Jennie Housman (jennie@ybos.net) - @creation-date 2000-10-24 - -} { - - entry_id:naturalnum,notnull -} -properties { - entry_id:onevalue -} - -set package_id [ad_conn package_id] - -permission::require_permission -object_id $package_id -privilege faq_modify_faq - -set action "q_and_a-edit-2" -set submit_label [_ faq.Update_This_QA] - -set user_id [ad_conn user_id] - -db_1row q_and_a_info "select question, answer,faq_name,qa.faq_id - from faq_q_and_as qa, faqs f - where entry_id = :entry_id - and f.faq_id = qa.faq_id" - -set context [list [list "one-faq?faq_id=$faq_id" "$faq_name"] "One Q&A"] - -set delete_url [export_vars -base q_and_a-delete { entry_id faq_id }] - -ad_return_template - -# Local variables: -# mode: tcl -# tcl-indent-level: 4 -# indent-tabs-mode: nil -# End: Index: openacs-4/packages/faq/www/admin/q_and_a-new-2-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/q_and_a-new-2-postgresql.xql,v diff -u -N --- openacs-4/packages/faq/www/admin/q_and_a-new-2-postgresql.xql 17 Jul 2002 20:20:17 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,24 +0,0 @@ - - - - postgresql7.1 - - - - select faq__new_q_and_a ( - :entry_id, - :faq_id, - :question, - :answer, - :sort_key, - 'faq_q_and_a', - now(), - :user_id, - :creation_ip, - :faq_id - ); - - - - - Index: openacs-4/packages/faq/www/admin/q_and_a-new-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/q_and_a-new-2.tcl,v diff -u -N --- openacs-4/packages/faq/www/admin/q_and_a-new-2.tcl 19 Jan 2018 14:44:17 -0000 1.10 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,84 +0,0 @@ -#faq/www/admin/q_and_a-new-2.tcl - -ad_page_contract { - - Adds a new Q&A to a FAQ - - @author wirth@ybos.net - @creation-date 2000-10-25 - -} { - faq_id:naturalnum,notnull,trim - question:html,notnull,trim - answer:html,notnull,trim - entry_id:naturalnum,optional - insert_p:boolean,optional - -} - -set package_id [ad_conn package_id] - -permission::require_permission -object_id $package_id -privilege faq_create_faq - -set user_id [ad_conn user_id] -set creation_ip [ad_conn host] - -if {$insert_p == "t" } { - - - - # this q+a being added after an existing question - # make room - then do the insert - set last_entry_id $entry_id - - db_transaction { - set old_sort_key [db_string faq_sortkey_get "select sort_key - from faq_q_and_as - where entry_id = :last_entry_id"] - - set sql_update_q_and_as " - update faq_q_and_as - set sort_key = sort_key + 1 - where sort_key > :old_sort_key" - - db_dml faq_update $sql_update_q_and_as - - set sort_key [expr {$old_sort_key + 1}] - - set entry_id [db_nextval acs_object_id_seq] - } - -} else { - - db_transaction { - set entry_id [db_nextval acs_object_id_seq] - set sort_key $entry_id - } -} - - -db_transaction { - db_exec_plsql create_q_and_a { - begin - :1 := faq.new_q_and_a ( - entry_id => :entry_id, - context_id => :faq_id, - faq_id=> :faq_id, - question => :question, - answer => :answer, - sort_key => :sort_key, - creation_user => :user_id, - creation_ip => :creation_ip - ); - end; - } -} - -ad_returnredirect [export_vars -base one-faq {faq_id}] -ad_script_abort - -# Local variables: -# mode: tcl -# tcl-indent-level: 4 -# indent-tabs-mode: nil -# End: Index: openacs-4/packages/faq/www/admin/q_and_a-new.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/q_and_a-new.adp,v diff -u -N --- openacs-4/packages/faq/www/admin/q_and_a-new.adp 7 Aug 2017 23:48:10 -0000 1.14 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,33 +0,0 @@ - -@page_title;literal@ -@context;literal@ -question.question - -
-
- - -
- - - - - - - - - - - - - - - - - - -

#faq.Question# -

#faq.Answer# -
-
- Index: openacs-4/packages/faq/www/admin/q_and_a-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/q_and_a-new.tcl,v diff -u -N --- openacs-4/packages/faq/www/admin/q_and_a-new.tcl 7 Aug 2017 23:48:10 -0000 1.9 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,54 +0,0 @@ -#faq/www/admin/q_and_a-new.tcl - -ad_page_contract { - - Displays a form for creating a new Q&A. - - @author Elizabeth Wirth (wirth@ybos.net) - @author Jennie Housman (jennie@ybos.net) - @creation-date 2000-10-24 -} { - - entry_id:naturalnum,optional - faq_id:naturalnum,notnull - -} -properties { - context:onevalue - entry_id:onevalue - title:onevalue - action:onevalue - submit_label:onevalue - question:onevalue - question_q:onevalue - answer:onevalue - answer_q:onevalue -} - -permission::require_permission -object_id [ad_conn package_id] -privilege faq_create_faq - -db_1row get_name "select faq_name from faqs where faq_id=:faq_id" - -set page_title [_ faq.Add_QA_for_faq_name] -set context [list [list "one-faq?faq_id=$faq_id" "$faq_name"] [_ faq.Create_new_QA]] -set title [_ faq.Create_new_QA] -set target "q_and_a-new-2" -set submit_label [_ faq.Create_QA] -set question "" -set answer "" -set insert_p "f" - -if { [info exists entry_id]} { - set insert_p "t" -} - -set question_q [ns_quotehtml $question] -set answer_q [ns_quotehtml $answer] - -ad_return_template - - -# Local variables: -# mode: tcl -# tcl-indent-level: 4 -# indent-tabs-mode: nil -# End: