Index: openacs-4/packages/forums/lib/message/choose-forum-move.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/choose-forum-move.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums/lib/message/choose-forum-move.adp	15 Apr 2005 08:05:34 -0000	1.1
@@ -0,0 +1,17 @@
+<property name="title">@title;noquote@</property>
+<property name="context">@context;noquote@</property>
+  
+<p> #forums.Move_thread_to_forum#</p>
+  
+<form name="input" action="move"  method="get">
+<input type="hidden" name="message_id" value="@message_id@">
+<input type="hidden" name="confirm_p" value="@confirm_p@">
+<if @forums:rowcount@ eq 0>
+  <p>#forums.Sorry_you_can_not_move_this_thread_There_are_no_other_forums#
+</if>
+<else>
+<listtemplate name="available_forums"></listtemplate>
+<p></p>
+<input type="submit" value="#forums.Move_thread#">
+</else>
+</form>
\ No newline at end of file
Index: openacs-4/packages/forums/lib/message/choose-forum-move.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/choose-forum-move.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums/lib/message/choose-forum-move.tcl	15 Apr 2005 08:05:34 -0000	1.1
@@ -0,0 +1,49 @@
+# packages/forums/admin/moderate/choose_forum_move.tcl
+
+ad_page_contract {
+
+	Show a list of available forums so that user can choose one.
+
+	@author Natalia Perez (nperper@it.uc3m.es)
+	@creation-date 2005-03-15	
+} {
+    {return_url "../message-view"}
+} -properties {
+	context:onevalue
+} -validate {
+} -errors {
+}
+
+
+ template::list::create \
+    -name available_forums \
+    -multirow forums \
+    -key forum_id \
+    -elements {
+        selected {
+	    label #forums.Selected#
+	    display_template {
+	        <input name="selected_forum" value="@forums.forum_id@" type="radio">
+	    }
+	}
+	forum_id {
+	    hide_p 1
+	}
+	forum_name {
+	    label #forums.Forum_Name#
+	    display_col name
+	}
+	}
+
+db_0or1row get_package_id "select distinct(package_id) from forums_forums where forum_id = $message(forum_id)"
+db_multirow forums get_forums "
+    select forum_id, name from forums_forums where forum_id <> $message(forum_id) and package_id = :package_id and enabled_p = 't'
+"
+
+set message_id $message(message_id)
+
+# set context & title
+set context [list "[_ forums.Available_Forums]"]
+set title "[_ forums.Available_Forums]"
+
+		
Index: openacs-4/packages/forums/lib/message/choose-message-move-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/choose-message-move-oracle.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums/lib/message/choose-message-move-oracle.xql	15 Apr 2005 08:05:34 -0000	1.1
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+
+<queryset>
+    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+    
+    <fullquery name="get_tree_sortkey">
+        <querytext>
+            select substr(tree_sortkey, 0, 6) as father_tree_sortkey 
+	    from forums_messages 
+	    where message_id=$message(message_id)
+
+        </querytext>
+    </fullquery>
+    
+
+    <fullquery name="get_parent_id">
+        <querytext>
+            select parent_id
+	    from forums_messages
+	    where forum_id = $message(forum_id) and tree_sortkey between tree.left('$father_tree_sortkey') and tree.right('$father_tree_sortkey') 
+	    order by tree_sortkey desc
+
+        </querytext>
+    </fullquery>
+
+</queryset>
Index: openacs-4/packages/forums/lib/message/choose-message-move-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/choose-message-move-postgresql.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums/lib/message/choose-message-move-postgresql.xql	15 Apr 2005 08:05:34 -0000	1.1
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+
+<queryset>
+    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+    
+    <fullquery name="get_tree_sortkey">
+        <querytext>
+            select substring(tree_sortkey, 0, 9) as father_tree_sortkey 
+	    from forums_messages 
+	    where message_id=$message(message_id)
+
+        </querytext>
+    </fullquery>
+    
+
+    <fullquery name="get_parent_id">
+        <querytext>
+            select parent_id
+            from forums_messages
+            where forum_id = $message(forum_id) and tree_sortkey between tree_left('$father_tree_sortkey') and tree_right('$father_tree_sortkey') 
+	    order by tree_sortkey desc
+
+        </querytext>
+    </fullquery>
+
+</queryset>
Index: openacs-4/packages/forums/lib/message/choose-message-move.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/choose-message-move.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums/lib/message/choose-message-move.adp	15 Apr 2005 08:05:34 -0000	1.1
@@ -0,0 +1,17 @@
+<property name="title">@title;noquote@</property>
+<property name="context">@context;noquote@</property>
+  
+<p> #forums.Move_message_to_message#</p>
+  
+<form name="input" action="move-thread" method="get">
+<input type="hidden" name="msg_id" value="@msg_id@">
+<input type="hidden" name="confirm_p" value="@confirm_p@">
+<if @messages:rowcount@ eq 0 >
+    <p>#forums.Sorry_you_can_not_move_this_message_There_are_no_other_threads#</p>    
+</if>
+<else>
+<listtemplate name="available_messages"></listtemplate>
+<p></p>
+<input type="submit" value="#forums.Move_message#">
+</else>
+</form>
\ No newline at end of file
Index: openacs-4/packages/forums/lib/message/choose-message-move.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/choose-message-move.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums/lib/message/choose-message-move.tcl	15 Apr 2005 08:05:34 -0000	1.1
@@ -0,0 +1,51 @@
+# packages/forums/admin/moderate/choose_message_move.tcl
+
+ad_page_contract {
+
+	Show a list of available messages so that user can choose one.
+
+	@author Natalia Perez (nperper@it.uc3m.es)
+	@creation-date 2005-03-17	
+} {
+    {return_url "../message-view"}
+} -properties {
+	context:onevalue
+} -validate {
+} -errors {
+}
+
+ template::list::create \
+    -name available_messages \
+    -multirow messages \
+    -key message_id \
+    -elements {
+        selected {
+	    label #forums.Selected#
+	    display_template {
+	        <input name="selected_message" value="@messages.message_id@" type="radio">
+	    }
+	}
+	message_id {
+	    hide_p 1
+	}
+	message_subject {
+	    label #forums.Message_Subject#
+	    display_col subject
+	}
+    }
+
+db_0or1row get_tree_sortkey { }
+        
+db_foreach get_parent_id { } {    
+    db_multirow messages get_messages "
+        select message_id, subject from forums_messages where forum_id = $message(forum_id) and message_id <> $message(message_id) and parent_id is null and message_id <> :parent_id
+    "
+}
+
+set msg_id $message(message_id)
+
+# set context & title
+set context [list "[_ forums.Available_Messages]"]
+set title "[_ forums.Available_Messages]"
+
+		
Index: openacs-4/packages/forums/lib/message/choose-thread-move.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/choose-thread-move.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums/lib/message/choose-thread-move.adp	15 Apr 2005 08:05:34 -0000	1.1
@@ -0,0 +1,17 @@
+<property name="title">@title;noquote@</property>
+<property name="context">@context;noquote@</property>
+  
+<p> #forums.Move_thread_to_thread#</p>
+  
+<form name="input" action="move-thread-thread" method="get">
+<input type="hidden" name="msg_id" value="@msg_id@">
+<input type="hidden" name="confirm_p" value="@confirm_p@">
+<if @messages:rowcount@ eq 0>
+    #forums.Sorry_you_can_not_move_this_thread_There_are_no_more_threads#
+</if>
+<else>
+<listtemplate name="available_messages"></listtemplate>
+<p></p>
+<input type="submit" value="#forums.Move_thread#">
+</else>
+</form>
\ No newline at end of file
Index: openacs-4/packages/forums/lib/message/choose-thread-move.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/choose-thread-move.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums/lib/message/choose-thread-move.tcl	15 Apr 2005 08:05:34 -0000	1.1
@@ -0,0 +1,58 @@
+# packages/forums/admin/moderate/choose_message_move.tcl
+
+ad_page_contract {
+
+	Show a list of available messages so that user can choose one.
+
+	@author Natalia Perez (nperper@it.uc3m.es)
+	@creation-date 2005-03-17	
+} {
+    {return_url "../message-view"}
+} -properties {
+	context:onevalue
+} -validate {
+} -errors {
+}
+
+ template::list::create \
+    -name available_messages \
+    -multirow messages \
+    -key message_id \
+    -elements {
+        selected {
+	    label #forums.Selected#
+	    display_template {
+	        <input name="selected_message" value="@messages.message_id@" type="radio">		
+	    }
+	}
+	message_id {
+	    hide_p 1
+	}
+	forum_id {
+	    label #forums.Name_of_forum#
+	    display_col name
+	}
+	message_subject {
+	    label #forums.Message_Subject#
+	    display_col subject
+	}
+    }
+
+
+db_0or1row get_package_id "select distinct(package_id) from forums_forums where forum_id = $message(forum_id)"        
+db_multirow messages get_messages "
+    select fm.forum_id, fm.message_id, fm.subject, ff.name 
+    from forums_messages fm, forums_forums ff
+    where ff.package_id = :package_id and ff.enabled_p='t' and fm.message_id <> $message(message_id) and fm.parent_id is null
+    and fm.forum_id = ff.forum_id
+    order by fm.forum_id
+"
+
+
+set msg_id $message(message_id)
+
+# set context & title
+set context [list "[_ forums.Available_Messages]"]
+set title "[_ forums.Available_Messages]"
+
+		
Index: openacs-4/packages/forums/www/moderate/message-move.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/message-move.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/forums/www/moderate/message-move.adp	8 Apr 2005 08:28:09 -0000	1.1
+++ openacs-4/packages/forums/www/moderate/message-move.adp	15 Apr 2005 08:05:35 -0000	1.2
@@ -2,4 +2,4 @@
 <property name="title">#forums.Confirm_Move_to# @message.subject;noquote@</property>
 <property name="context">#forums.Move_to#</property>
 
-<include src="/packages/forums/lib/message/choose_message_move" &message="message" confirm_p="@confirm_p@" return_url="@return_url@">
+<include src="/packages/forums/lib/message/choose-message-move" &message="message" confirm_p="@confirm_p@" return_url="@return_url@">
Index: openacs-4/packages/forums/www/moderate/thread-move-thread.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/thread-move-thread.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/forums/www/moderate/thread-move-thread.adp	8 Apr 2005 08:28:09 -0000	1.1
+++ openacs-4/packages/forums/www/moderate/thread-move-thread.adp	15 Apr 2005 08:05:35 -0000	1.2
@@ -2,4 +2,4 @@
 <property name="title">#forums.Confirm_Move_to# @message.subject;noquote@</property>
 <property name="context">#forums.Move_to#</property>
 
-<include src="/packages/forums/lib/message/choose_thread_move" &message="message" confirm_p="@confirm_p@" return_url="@return_url@">
+<include src="/packages/forums/lib/message/choose-thread-move" &message="message" confirm_p="@confirm_p@" return_url="@return_url@">
Index: openacs-4/packages/forums/www/moderate/thread-move.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/thread-move.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/forums/www/moderate/thread-move.adp	8 Apr 2005 08:28:09 -0000	1.1
+++ openacs-4/packages/forums/www/moderate/thread-move.adp	15 Apr 2005 08:05:35 -0000	1.2
@@ -2,4 +2,4 @@
 <property name="title">#forums.Confirm_Move_to# @message.subject;noquote@</property>
 <property name="context">#forums.Move_to#</property>
 
-<include src="/packages/forums/lib/message/choose_forum_move" &message="message" confirm_p="@confirm_p@" return_url="@return_url@">
+<include src="/packages/forums/lib/message/choose-forum-move" &message="message" confirm_p="@confirm_p@" return_url="@return_url@">