Index: openacs-4/packages/dotlrn/tcl/community-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.tcl,v
diff -u -r1.183.2.3.4.8 -r1.183.2.3.4.9
--- openacs-4/packages/dotlrn/tcl/community-procs.tcl	19 Jul 2004 18:39:39 -0000	1.183.2.3.4.8
+++ openacs-4/packages/dotlrn/tcl/community-procs.tcl	6 Aug 2004 14:39:01 -0000	1.183.2.3.4.9
@@ -1835,11 +1835,22 @@
     ad_proc -public unarchive {
         {-community_id:required}
     } {
-        Unarchives a community. ** not done yet **
+        Unarchives a community.
+        08/10-2003 CK looks like its done now
     } {
-        error
-        ad_script_abort
+        # 19/06-2003 CK Activated the code for unarchive
         db_dml update_archive_p {}
+
+        rel_segments_grant_permission -community_id $community_id
+
+        # 08/10-2003 CK Must also execute AddUserToCommunity
+        foreach user [list_users $community_id] {
+            set user_id [ns_set get $user user_id]
+            applets_dispatch \
+                -community_id $community_id \
+                -op AddUserToCommunity \
+                -list_args [list $community_id $user_id]
+        }
     }
 
     ad_proc -public nuke {
Index: openacs-4/packages/dotlrn/tcl/community-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.xql,v
diff -u -r1.81.2.1.4.5 -r1.81.2.1.4.6
--- openacs-4/packages/dotlrn/tcl/community-procs.xql	18 Jun 2004 16:09:34 -0000	1.81.2.1.4.5
+++ openacs-4/packages/dotlrn/tcl/community-procs.xql	6 Aug 2004 14:39:01 -0000	1.81.2.1.4.6
@@ -436,6 +436,12 @@
       </querytext>
     </fullquery>
 
+    <fullquery name="dotlrn_community::unarchive.update_archive_p">
+      <querytext>
+        update dotlrn_communities_all set archived_p = 'f' where community_id = :community_id
+      </querytext>
+    </fullquery>
+
     <fullquery name="dotlrn_community::get_portal_id_not_cached.select_portal_id">
         <querytext>
             select portal_id
Index: openacs-4/packages/dotlrn/www/admin/archived-communities-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/archived-communities-oracle.xql,v
diff -u -r1.1.10.1 -r1.1.10.2
--- openacs-4/packages/dotlrn/www/admin/archived-communities-oracle.xql	22 Jun 2004 20:02:40 -0000	1.1.10.1
+++ openacs-4/packages/dotlrn/www/admin/archived-communities-oracle.xql	6 Aug 2004 14:39:01 -0000	1.1.10.2
@@ -16,7 +16,8 @@
     -->
     <fullquery name="select_archived_comms">
         <querytext>
-            select child.pretty_name, 
+            select child.community_id,
+                   child.pretty_name, 
                    child.description,
                    dotlrn_community.url(child.community_id) as url,
                    parent.community_id as parent_community_id,
Index: openacs-4/packages/dotlrn/www/admin/archived-communities-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/archived-communities-postgresql.xql,v
diff -u -r1.1.10.2 -r1.1.10.3
--- openacs-4/packages/dotlrn/www/admin/archived-communities-postgresql.xql	20 Jul 2004 18:53:11 -0000	1.1.10.2
+++ openacs-4/packages/dotlrn/www/admin/archived-communities-postgresql.xql	6 Aug 2004 14:39:01 -0000	1.1.10.3
@@ -16,7 +16,8 @@
     -->
     <fullquery name="select_archived_comms">
         <querytext>
-            select child.pretty_name, 
+            select child.community_id,
+            	   child.pretty_name, 
                    child.description,
                    dotlrn_community__url(child.community_id) as url,
                    parent.community_id as parent_community_id,
Index: openacs-4/packages/dotlrn/www/admin/archived-communities.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/archived-communities.adp,v
diff -u -r1.4.6.2 -r1.4.6.3
--- openacs-4/packages/dotlrn/www/admin/archived-communities.adp	14 Jul 2004 20:30:37 -0000	1.4.6.2
+++ openacs-4/packages/dotlrn/www/admin/archived-communities.adp	6 Aug 2004 14:39:01 -0000	1.4.6.3
@@ -28,8 +28,10 @@
   <tr>
     <th align="left" width="25%">#dotlrn.Parent#</th>
     <th align="left" width="50%">#dotlrn.Name#</th>
+    <th align="left">#dotlrn.Description#</th>
     <th align="left">#dotlrn.Term#</th>
     <th align="left">#dotlrn.Created#</th>
+    <th align="left">#dotlrn.Unarchive#</th>
   </tr>
 <multiple name="archived_comms">
 <if @archived_comms.rownum@ odd>
@@ -42,12 +44,14 @@
     </td>
     <td>
       <a href="@archived_comms.url@">@archived_comms.pretty_name@</a></td>
+    <td>@archived_comms.description@</td>
     <td>
         @archived_comms.term_name@ @archived_comms.term_year@
         <% # look for a parent term if no child term is found %>
         <if @archived_comms.term_name@ eq "">@archived_comms.parent_term_name@ @archived_comms.parent_term_year@</if>
     </td>
     <td><em>@archived_comms.creation_date@</em></td>
+    <td><em><a href="@archived_comms.unarchive_url@">#dotlrn.unarchive#</a></em></td>
   </tr>
 </multiple>
 </table>
Index: openacs-4/packages/dotlrn/www/admin/archived-communities.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/archived-communities.tcl,v
diff -u -r1.4.6.1 -r1.4.6.2
--- openacs-4/packages/dotlrn/www/admin/archived-communities.tcl	22 Jun 2004 20:02:40 -0000	1.4.6.1
+++ openacs-4/packages/dotlrn/www/admin/archived-communities.tcl	6 Aug 2004 14:39:01 -0000	1.4.6.2
@@ -31,6 +31,10 @@
 set title "[_ dotlrn.archived_groups]"
 set context_bar [list $title]
 
-db_multirow archived_comms select_archived_comms {}
+db_multirow -extend { unarchive_url } archived_comms select_archived_comms {} {
+    set description [ad_quotehtml $description]
+    set unarchive_url "unarchive?community_id=$community_id"
+}
 
+
 ad_return_template
Index: openacs-4/packages/dotlrn/www/admin/unarchive.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/unarchive.tcl,v
diff -u -r1.1 -r1.1.2.1
Binary files differ