Index: openacs-4/packages/forums/forums.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/forums.info,v diff -u -N -r1.56.2.4 -r1.56.2.5 --- openacs-4/packages/forums/forums.info 18 Jun 2019 18:38:05 -0000 1.56.2.4 +++ openacs-4/packages/forums/forums.info 19 Jun 2019 16:41:38 -0000 1.56.2.5 @@ -9,7 +9,7 @@ f t - + OpenACS Online discussion forums. 2017-08-06 @@ -19,7 +19,7 @@ 2 #forums.Forums# - + Index: openacs-4/packages/forums/catalog/forums.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/catalog/forums.de_DE.ISO-8859-1.xml,v diff -u -N -r1.24.2.1 -r1.24.2.2 --- openacs-4/packages/forums/catalog/forums.de_DE.ISO-8859-1.xml 21 Mar 2019 15:58:18 -0000 1.24.2.1 +++ openacs-4/packages/forums/catalog/forums.de_DE.ISO-8859-1.xml 19 Jun 2019 16:41:38 -0000 1.24.2.2 @@ -97,7 +97,8 @@ Bitte best�tigen Sie folgenden Beitrag: Bitte geben Sie einen Text ein. Bitte geben Sie einen Betreff ein. - Benutzer d�rfen ein neues Diskussionsthema beginnen + Benutzer/-innen d�rfen ein neues Diskussionsthema beginnen + Benutzer/-innen d�rfen Dateien hochladen M�chten Sie dem Beitrag einen Anhang hinzuf�gen? M�chten Sie �ber Antworten benachrichtigt werden? Sie k�nnen eine Nachricht entweder als eigenst�ndigen Forumsbeitrag posten oder als Antwort auf einen anderen Beitrag. Index: openacs-4/packages/forums/catalog/forums.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/catalog/forums.en_US.ISO-8859-1.xml,v diff -u -N -r1.48.2.1 -r1.48.2.2 --- openacs-4/packages/forums/catalog/forums.en_US.ISO-8859-1.xml 21 Mar 2019 15:58:18 -0000 1.48.2.1 +++ openacs-4/packages/forums/catalog/forums.en_US.ISO-8859-1.xml 19 Jun 2019 16:41:38 -0000 1.48.2.2 @@ -95,6 +95,7 @@ Please enter a message Please enter a subject Users Can Create New Threads + Users can add attachments to messages Would you like to attach a file to this message? Would you like to subscribe to responses? You either have to post to a forum or in reply to another message Index: openacs-4/packages/forums/catalog/forums.es_ES.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/catalog/forums.es_ES.ISO-8859-1.xml,v diff -u -N -r1.26 -r1.26.2.1 --- openacs-4/packages/forums/catalog/forums.es_ES.ISO-8859-1.xml 25 Jun 2018 12:44:28 -0000 1.26 +++ openacs-4/packages/forums/catalog/forums.es_ES.ISO-8859-1.xml 19 Jun 2019 16:41:38 -0000 1.26.2.1 @@ -96,6 +96,7 @@ Por favor, entre su mensaje Por favor, ingrese t�tulo de mensaje Los usuarios pueden crear nuevos hilos + Los usuarios pueden a�adir adjuntos a los mensajes �Desea adjuntar archivo a este mensaje? �Desea suscribirse para recibir respuestas? Debe enviar un mensaje al foro de discusi�n o contestar a otro mensaje Index: openacs-4/packages/forums/lib/forums/edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/forums/edit.tcl,v diff -u -N -r1.7 -r1.7.2.1 --- openacs-4/packages/forums/lib/forums/edit.tcl 8 Nov 2017 12:05:55 -0000 1.7 +++ openacs-4/packages/forums/lib/forums/edit.tcl 19 Jun 2019 16:41:38 -0000 1.7.2.1 @@ -21,7 +21,7 @@ if {[form is_valid forum]} { template::form get_values forum return_url forum_id \ - name charter presentation_type posting_policy new_threads_p anonymous_allowed_p + name charter presentation_type posting_policy new_threads_p anonymous_allowed_p attachments_allowed_p # Users can create new threads? set new_questions_allowed_p [expr { $new_threads_p && $posting_policy ne "closed" ? t : f}] @@ -33,7 +33,8 @@ -presentation_type $presentation_type \ -posting_policy $posting_policy \ -new_questions_allowed_p $new_questions_allowed_p \ - -anonymous_allowed_p $anonymous_allowed_p + -anonymous_allowed_p $anonymous_allowed_p \ + -attachments_allowed_p $attachments_allowed_p } ad_returnredirect $return_url @@ -57,6 +58,8 @@ -value $forum(new_questions_allowed_p) element set_properties forum anonymous_allowed_p \ -value $forum(anonymous_allowed_p) + element set_properties forum attachments_allowed_p \ + -value $forum(attachments_allowed_p) } if {[info exists alt_template] && $alt_template ne ""} { Index: openacs-4/packages/forums/lib/forums/new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/forums/new.tcl,v diff -u -N -r1.9 -r1.9.2.1 --- openacs-4/packages/forums/lib/forums/new.tcl 8 Nov 2017 12:05:55 -0000 1.9 +++ openacs-4/packages/forums/lib/forums/new.tcl 19 Jun 2019 16:41:38 -0000 1.9.2.1 @@ -26,7 +26,7 @@ if {[form is_valid forum]} { template::form get_values forum \ - forum_id name charter presentation_type posting_policy new_threads_p anonymous_allowed_p + forum_id name charter presentation_type posting_policy new_threads_p anonymous_allowed_p attachments_allowed_p # Users can create new threads? set new_questions_allowed_p [expr {$new_threads_p && $posting_policy ne "closed" ? t : f}] @@ -39,7 +39,8 @@ -posting_policy $posting_policy \ -package_id $package_id \ -new_questions_allowed_p $new_questions_allowed_p \ - -anonymous_allowed_p $anonymous_allowed_p] + -anonymous_allowed_p $anonymous_allowed_p \ + -attachments_allowed_p $attachments_allowed_p] } ad_returnredirect $return_url @@ -52,6 +53,7 @@ element set_properties forum forum_id -value $forum_id element set_value forum new_threads_p t element set_value forum anonymous_allowed_p f + element set_value forum attachments_allowed_p t element set_value forum name $name } Index: openacs-4/packages/forums/tcl/form-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/form-procs.tcl,v diff -u -N -r1.13.2.1 -r1.13.2.2 --- openacs-4/packages/forums/tcl/form-procs.tcl 1 Mar 2019 10:13:19 -0000 1.13.2.1 +++ openacs-4/packages/forums/tcl/form-procs.tcl 19 Jun 2019 16:41:38 -0000 1.13.2.2 @@ -185,6 +185,12 @@ -widget radio \ -help_text [_ forums.help_new_threads] \ -options [list [list [_ forums.Yes] t] [list [_ forums.No] f] ] + + template::element create $form_name ${prefix}attachments_allowed_p \ + -label [_ forums.lt_Users_Can_Add_Attachments] \ + -datatype text \ + -widget radio \ + -options [list [list [_ forums.Yes] t] [list [_ forums.No] f] ] } # Local variables: Index: openacs-4/packages/forums/tcl/forums-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/forums-procs.tcl,v diff -u -N -r1.38.2.1 -r1.38.2.2 --- openacs-4/packages/forums/tcl/forums-procs.tcl 19 Jun 2019 15:59:27 -0000 1.38.2.1 +++ openacs-4/packages/forums/tcl/forums-procs.tcl 19 Jun 2019 16:41:38 -0000 1.38.2.2 @@ -20,6 +20,7 @@ {-package_id:required} {-new_questions_allowed_p t} {-anonymous_allowed_p f} + {-attachments_allowed_p t} -no_callback:boolean } { create a new forum @@ -37,7 +38,8 @@ db_dml update_extra_cols { update forums_forums set new_questions_allowed_p = :new_questions_allowed_p, - anonymous_allowed_p = :anonymous_allowed_p + anonymous_allowed_p = :anonymous_allowed_p, + attachments_allowed_p = :attachments_allowed_p where forum_id = :forum_id } @@ -67,14 +69,15 @@ -posting_policy -new_questions_allowed_p -anonymous_allowed_p + -attachments_allowed_p -no_callback:boolean } { Edit a forum } { forum::get -forum_id $forum_id -array forum foreach var { name charter presentation_type posting_policy - new_questions_allowed_p anonymous_allowed_p} { + new_questions_allowed_p anonymous_allowed_p attachments_allowed_p} { if {![info exists $var]} { set $var $forum($var) } Index: openacs-4/packages/forums/tcl/forums-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/forums-procs.xql,v diff -u -N -r1.8 -r1.8.2.1 --- openacs-4/packages/forums/tcl/forums-procs.xql 8 Nov 2017 12:05:55 -0000 1.8 +++ openacs-4/packages/forums/tcl/forums-procs.xql 19 Jun 2019 16:41:38 -0000 1.8.2.1 @@ -9,8 +9,9 @@ presentation_type = :presentation_type, posting_policy = :posting_policy, new_questions_allowed_p = :new_questions_allowed_p, - anonymous_allowed_p = :anonymous_allowed_p - where forum_id = :forum_id + anonymous_allowed_p = :anonymous_allowed_p, + attachments_allowed_p = :attachments_allowed_p + where forum_id = :forum_id