Index: openacs-4/packages/forums/forums.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/forums.info,v diff -u -N -r1.25.2.14 -r1.25.2.15 --- openacs-4/packages/forums/forums.info 9 Apr 2005 10:28:10 -0000 1.25.2.14 +++ openacs-4/packages/forums/forums.info 11 Apr 2005 10:38:58 -0000 1.25.2.15 @@ -7,14 +7,14 @@ f f - + OpenACS Online discussion forums. 2003-11-10 OpenACS This online discussion board software is the successor of the original bboard package. The biggest improvement is a scalable datamodel. Forums supports threaded and flat view, moderation, a stand alone search function as well as integration with the OpenACS search package and integration with the notifications package for email alerts. It also supports reply via email. - + 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.23.2.2 -r1.23.2.3 --- openacs-4/packages/forums/catalog/forums.en_US.ISO-8859-1.xml 8 Apr 2005 18:41:57 -0000 1.23.2.2 +++ openacs-4/packages/forums/catalog/forums.en_US.ISO-8859-1.xml 11 Apr 2005 10:38:58 -0000 1.23.2.3 @@ -1,11 +1,13 @@ - + Administer Administration Anonymous approve Are you sure you want to delete this message and <strong>all replies to it</strong>? + Are you sure you want to move this message and obviously all of its descendents? + Are you sure you want to move this thread and obviously all of its descendents? Attach? Attachments: Author @@ -18,6 +20,7 @@ closed Confirm? Confirm Delete: + Confirm Move to Confirm Post to Forum: Create a New Forum Create New Forum @@ -50,13 +53,16 @@ Forum Posting ForumID Forums + Forums history + Forums History Forums: Posting history for Forward Fwd: HTML If checked, create users that don't exist: Last Post Last post in subject + List of users that wrote in the forum: Email a copy of the following message: First post in subject Forums Administration @@ -74,15 +80,32 @@ Manage Forum: Manage/Moderate Message ID + Subject Moderate moderated + Move message + Move message to forum: + Move message to the message + Move thread + Move thread to forum + Move message to other message + Move thread to other forum + Move thread to other thread + Move thread to thread + Move thread to other thread + Move to + Move to other thread Name + Name + Forum Name New Forum No No Forums No Messages No Postings. None + Number of Posts + of forum One Message One Thread open @@ -114,14 +137,23 @@ Search Search: Search Forums + Selected + Sorry. You can not move this message. There are no other threads in this forum. + Sorry. You can not move this thread. There are no other threads. + Sorry. You can not move this thread. There are no other forums. + Statistics Subject Subscribe? Number of subscriptions to this forum: Subscribe others + Summary + Summary of posting history Plain text This forum is Threaded Threads + User + Users that wrote in the forum View Yes You may 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.10.2.3 -r1.10.2.4 --- openacs-4/packages/forums/catalog/forums.es_ES.ISO-8859-1.xml 8 Feb 2005 14:17:24 -0000 1.10.2.3 +++ openacs-4/packages/forums/catalog/forums.es_ES.ISO-8859-1.xml 11 Apr 2005 10:38:58 -0000 1.10.2.4 @@ -1,11 +1,14 @@ - + Administrar Administraci�n An�nimo Aprobar �Est� seguro que quiere borrar este mensaje y sus respuestas? + �Est� seguro de que quiere mover este mensaje y todas sus respuestas? + �Est�s seguro que quieres mover este hilo y todos sus hijos? + �Adjuntar archivo(s)? Archivos adjuntos: Autor @@ -18,6 +21,7 @@ cerrado �Es correcto? Confirmaci�n para eliminar: + Confirmar mover mensaje Confirmaci�n de su mensaje para el foro de discusi�n: Crear nuevo foro de discusi�n Crear nuevo foro de discusi�n @@ -49,12 +53,15 @@ Enviando mensaje al foro de discusi�n ForoID Foros de Discusi�n + Foros historia + Foros historia Foros de Discusi�n: Historia de mensajes de Reenviar Re-enviar: html �ltimo Mensaje �ltimos mensajes del hilo + Usuarios que escribieron en el foro: Enviar una copia del siguiente mensaje: Primer mensaje del hilo Administraci�n de Foros de Discusi�n @@ -72,15 +79,32 @@ Administrar Foro de Discusi�n: Administrar/Moderar Mensaje ID + T�tulo Moderar moderado + Mover mensaje + Mover mensaje al foro: + Mover mensaje a otro mensaje + Mover hilo + Mover hilo a otro foro + Mover mensaje al mensaje: + Mover hilo a otro foro + Mover hilo a otro hilo + Mover hilo al hilo + Mover hilo a otro hilo + Mover + Mover a otro hilo Nombre + Nombre del foro + Nombre del foro Nuevo Foro de Discusi�n No No existen foro de discusi�n No existen mensajes No existen mensajes enviados. Ninguno + N�mero de mensajes + del foro Un Mensaje Un hilo abierto @@ -112,12 +136,21 @@ Buscar Buscar: Buscar en Foros de Discusi�n + Seleccionado + Lo sentimos. No puedes mover este mensaje a otro hilo. No hay otros hilos en este foro. + Lo sentimos. No puedes mover este hilo a otro hilo porque solo existe �ste. + Lo sentimos. No puedes mover este hilo a otro foro porque no hay m�s foros. + Estad�sticas T�tulo �Suscribir? + Resumen de mensajes enviados + Resumen de mensajes enviados texto Este Foro de Discusi�n es Con hilos Hilos + Usuario + Usuarios que escribieron en el foro Ver S� Puedes Index: openacs-4/packages/forums/lib/forums/forums-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/forums/forums-chunk.tcl,v diff -u -N -r1.3.2.1 -r1.3.2.2 --- openacs-4/packages/forums/lib/forums/forums-chunk.tcl 22 Feb 2005 23:36:06 -0000 1.3.2.1 +++ openacs-4/packages/forums/lib/forums/forums-chunk.tcl 11 Apr 2005 10:38:59 -0000 1.3.2.2 @@ -55,12 +55,19 @@ label {\#forums.Last_Post\#} display_col last_modified_pretty } + statistic { + label {\#forums.Statistics\#} + link_url_col forum_view_statistic + display_col statistic + } } -db_multirow -extend { forum_view_url last_modified_pretty n_threads_pretty } forums select_forums {} { +db_multirow -extend { forum_view_url last_modified_pretty n_threads_pretty forum_view_statistic statistic} forums select_forums {} { set last_modified_pretty [lc_time_fmt $last_post_ansi "%x %X"] set forum_view_url [export_vars -base forum-view { forum_id }] set n_threads_pretty [lc_numeric $n_threads] + set forum_view_statistic [export_vars -base forum-view-statistic { forum_id }] + set statistic "[_ forums.Statistics]" } if {[exists_and_not_null alt_template]} { Index: openacs-4/packages/forums/lib/message/row.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/row.adp,v diff -u -N -r1.1.2.2 -r1.1.2.3 --- openacs-4/packages/forums/lib/message/row.adp 7 Jan 2005 21:02:09 -0000 1.1.2.2 +++ openacs-4/packages/forums/lib/message/row.adp 11 Apr 2005 10:38:59 -0000 1.1.2.3 @@ -35,12 +35,19 @@ #forums.reply# | - #forums.forward# + #forums.forward# ]
[ #forums.edit# | #forums.delete# + + | #forums.Move_thread_to_other_forum# + | #forums.Move_thread_to_other_thread# + + + | #forums.Move_to_other_thread# + Index: openacs-4/packages/forums/lib/user/post-history-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/user/post-history-chunk.adp,v diff -u -N -r1.1 -r1.1.2.1 --- openacs-4/packages/forums/lib/user/post-history-chunk.adp 17 Dec 2003 15:45:30 -0000 1.1 +++ openacs-4/packages/forums/lib/user/post-history-chunk.adp 11 Apr 2005 10:38:59 -0000 1.1.2.1 @@ -56,9 +56,47 @@ +

+
+

#forums.Summary_Posting_history_for#

+

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#forums.Forum##forums.Number_of_Posts##forums.Posted#
@posts.name@@posts.num_msg@@posts.last_post@
+ #forums.No_Postings# +
+ + + Index: openacs-4/packages/forums/lib/user/post-history-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/user/post-history-chunk.tcl,v diff -u -N -r1.1 -r1.1.2.1 --- openacs-4/packages/forums/lib/user/post-history-chunk.tcl 17 Dec 2003 15:45:30 -0000 1.1 +++ openacs-4/packages/forums/lib/user/post-history-chunk.tcl 11 Apr 2005 10:38:59 -0000 1.1.2.1 @@ -35,6 +35,9 @@ set posting_date_pretty [lc_time_fmt $posting_date_ansi "%x %X"] } +# select number of post from this user +db_multirow posts select_num_post {} + set dimensional_chunk [ad_dimensional $dimensional_list] if {[exists_and_not_null alt_template]} { Index: openacs-4/packages/forums/lib/user/post-history-chunk.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/user/post-history-chunk.xql,v diff -u -N -r1.1 -r1.1.2.1 --- openacs-4/packages/forums/lib/user/post-history-chunk.xql 17 Dec 2003 15:45:30 -0000 1.1 +++ openacs-4/packages/forums/lib/user/post-history-chunk.xql 11 Apr 2005 10:38:59 -0000 1.1.2.1 @@ -34,5 +34,15 @@ forums_messages.posting_date desc + + + + select count(user_id) as num_msg, to_char(max(last_child_post), 'YYYY-MM-DD HH24:MI:SS') as last_post, forums_forums.name, forums_forums.forum_id + from forums_messages, forums_forums + where forums_messages.user_id = :user_id and forums_forums.forum_id = forums_messages.forum_id and package_id = :package_id + group by forums_forums.name, forums_forums.forum_id + order by forums_forums.name asc + + Index: openacs-4/packages/forums/www/moderate/move-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/move-oracle.xql,v diff -u -N -r1.1 -r1.1.2.1 --- openacs-4/packages/forums/www/moderate/move-oracle.xql 8 Apr 2005 08:28:09 -0000 1.1 +++ openacs-4/packages/forums/www/moderate/move-oracle.xql 11 Apr 2005 10:38:59 -0000 1.1.2.1 @@ -18,8 +18,7 @@ select message_id, substr(tree_sortkey, 7, length(tree_sortkey)) as child_tree_sortkey from forums_messages - where forum_id = $message(forum_id) - and tree_sortkey between tree.left('$message(tree_sortkey)') and tree.right ('$message(tree_sortkey)') + where forum_id = $message(forum_id) and tree_sortkey between tree.left('$message(tree_sortkey)') and tree.right ('$message(tree_sortkey)') order by tree_sortkey desc @@ -41,6 +40,6 @@ set forum_id = :forum_id, tree_sortkey = '000000' where message_id = $message(message_id) - + Index: openacs-4/packages/forums/www/moderate/move-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/move-postgresql.xql,v diff -u -N -r1.1 -r1.1.2.1 --- openacs-4/packages/forums/www/moderate/move-postgresql.xql 8 Apr 2005 08:28:09 -0000 1.1 +++ openacs-4/packages/forums/www/moderate/move-postgresql.xql 11 Apr 2005 10:38:59 -0000 1.1.2.1 @@ -31,7 +31,7 @@ where forum_id = :forum_id) where forum_id = :forum_id - + Index: openacs-4/packages/forums/www/moderate/move-thread-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/move-thread-oracle.xql,v diff -u -N -r1.1 -r1.1.2.1 --- openacs-4/packages/forums/www/moderate/move-thread-oracle.xql 8 Apr 2005 08:28:09 -0000 1.1 +++ openacs-4/packages/forums/www/moderate/move-thread-oracle.xql 11 Apr 2005 10:38:59 -0000 1.1.2.1 @@ -29,8 +29,7 @@ where message_id = $message(message_id) - - + update forums_messages @@ -52,7 +51,5 @@ where message_id = :message_id - - Index: openacs-4/packages/forums/www/moderate/move-thread-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/move-thread-postgresql.xql,v diff -u -N -r1.1 -r1.1.2.1 --- openacs-4/packages/forums/www/moderate/move-thread-postgresql.xql 8 Apr 2005 08:28:09 -0000 1.1 +++ openacs-4/packages/forums/www/moderate/move-thread-postgresql.xql 11 Apr 2005 10:38:59 -0000 1.1.2.1 @@ -28,7 +28,7 @@ from forums_messages where message_id = $message(message_id) - + @@ -50,6 +50,6 @@ ) where message_id = :message_id - + Index: openacs-4/packages/forums/www/moderate/move-thread-thread-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/move-thread-thread-oracle.xql,v diff -u -N -r1.1 -r1.1.2.1 --- openacs-4/packages/forums/www/moderate/move-thread-thread-oracle.xql 8 Apr 2005 08:28:09 -0000 1.1 +++ openacs-4/packages/forums/www/moderate/move-thread-thread-oracle.xql 11 Apr 2005 10:38:59 -0000 1.1.2.1 @@ -21,7 +21,6 @@ - update forums_messages @@ -31,5 +30,6 @@ where message_id = :message_id + Index: openacs-4/packages/forums/www/moderate/move-thread-thread.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/move-thread-thread.tcl,v diff -u -N -r1.1 -r1.1.2.1 --- openacs-4/packages/forums/www/moderate/move-thread-thread.tcl 8 Apr 2005 08:28:09 -0000 1.1 +++ openacs-4/packages/forums/www/moderate/move-thread-thread.tcl 11 Apr 2005 10:38:59 -0000 1.1.2.1 @@ -54,8 +54,8 @@ db_dml forums::move_thread_thread::update_child_thread_father {} #update the final message: increase reply_count and approved_reply_count db_dml forums::move_thread_thread::update_final_reply_count {} - } - + } + #update the initial message set join_tree_sortkey $father_tree_sortkey append join_tree_sortkey $father_max_child_sortkey Index: openacs-4/packages/forums/www/moderate/move-thread-thread.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/move-thread-thread.xql,v diff -u -N -r1.1 -r1.1.2.1 --- openacs-4/packages/forums/www/moderate/move-thread-thread.xql 8 Apr 2005 08:28:09 -0000 1.1 +++ openacs-4/packages/forums/www/moderate/move-thread-thread.xql 11 Apr 2005 10:38:59 -0000 1.1.2.1 @@ -54,13 +54,13 @@ - + update forums_forums - set thread_count = :thread_count - 1, approved_thread_count = :approved_thread_count - 1, last_post = (select max(fm.last_child_post) - from forums_messages fm - where fm.forum_id = $message(forum_id)) + set thread_count = :thread_count - 1, approved_thread_count = :approved_thread_count - 1, last_post = (select max(fm.last_child_post) + from forums_messages fm + where fm.forum_id = $message(forum_id)) where forum_id = $message(forum_id) @@ -69,7 +69,7 @@ update forums_forums - set last_post = (select max(last_child_post) + set last_post = (select max(last_child_post) from forums_messages where forum_id = :forum_id) where forum_id = :forum_id Index: openacs-4/packages/forums/www/moderate/move-thread.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/move-thread.tcl,v diff -u -N -r1.1 -r1.1.2.1 --- openacs-4/packages/forums/www/moderate/move-thread.tcl 8 Apr 2005 08:28:09 -0000 1.1 +++ openacs-4/packages/forums/www/moderate/move-thread.tcl 11 Apr 2005 10:38:59 -0000 1.1.2.1 @@ -50,7 +50,7 @@ db_0or1row forums::move_thread::get_final_tree_sortkey {} #update the initial father message: decreasing reply_count and approved_reply_count - db_0or1row forums::move_thread::get_father_message_id {} + db_0or1row forums::move_thread::get_father_message_id {} db_dml forums::move_thread::update_father_reply_count {} #get all descendents Index: openacs-4/packages/forums/www/moderate/move-thread.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/move-thread.xql,v diff -u -N -r1.1 -r1.1.2.1 --- openacs-4/packages/forums/www/moderate/move-thread.xql 8 Apr 2005 08:28:09 -0000 1.1 +++ openacs-4/packages/forums/www/moderate/move-thread.xql 11 Apr 2005 10:38:59 -0000 1.1.2.1 @@ -12,7 +12,7 @@ - select tree_sortkey as father_tree_sortkey, max_child_sortkey as father_max_child_sortkey + select tree_sortkey as father_tree_sortkey, max_child_sortkey as father_max_child_sortkey from forums_messages where message_id= :message_id Index: openacs-4/packages/forums/www/moderate/move.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/move.xql,v diff -u -N -r1.1 -r1.1.2.1 --- openacs-4/packages/forums/www/moderate/move.xql 8 Apr 2005 08:28:09 -0000 1.1 +++ openacs-4/packages/forums/www/moderate/move.xql 11 Apr 2005 10:38:59 -0000 1.1.2.1 @@ -51,7 +51,6 @@ - update forums_forums @@ -62,5 +61,4 @@ -