Index: openacs-4/contrib/packages/project-manager/project-manager.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/Attic/project-manager.info,v
diff -u -r1.33 -r1.34
--- openacs-4/contrib/packages/project-manager/project-manager.info	14 Jul 2004 17:51:02 -0000	1.33
+++ openacs-4/contrib/packages/project-manager/project-manager.info	24 Jul 2004 08:33:49 -0000	1.34
@@ -7,14 +7,14 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="2.1" url="http://openacs.org/repository/download/apm/project-manager-2.1.apm">
+    <version name="2.13b3" url="http://openacs.org/repository/download/apm/project-manager-2.13b3.apm">
         <owner url="mailto:jader@bread.com">Jade Rubick</owner>
         <summary>Project management tool for OpenACS</summary>
-        <release-date>2004-07-09</release-date>
+        <release-date>2004-07-19</release-date>
         <vendor url="mailto:jader@bread.com">Integrated Bakery Resources</vendor>
         <description format="text/plain">Track tasks, estimates and actual progress for a project.  See the &lt;a href=&quot;http://openacs.org/projects/dotwrk/project_management/&quot;&gt;project page&lt;/a&gt; for more information.</description>
 
-        <provides url="project-manager" version="2.1"/>
+        <provides url="project-manager" version="2.13b3"/>
         <requires url="acs-datetime" version="4.0"/>
         <requires url="acs-templating" version="4.6.4"/>
         <requires url="categories" version="1.0d3"/>
Index: openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-table-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/sql/postgresql/Attic/project-manager-table-create.sql,v
diff -u -r1.21 -r1.22
--- openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-table-create.sql	25 Jun 2004 00:04:42 -0000	1.21
+++ openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-table-create.sql	24 Jul 2004 08:33:53 -0000	1.22
@@ -191,10 +191,17 @@
         task_number                     integer,
         status                          integer
                                         constraint pm_tasks_task_status_fk
-                                        references pm_task_status
+                                        references pm_task_status,
+        deleted_p                       char(1) default 'f'
+                                        constraint pm_tasks_deleted_p_ck
+                                        check (deleted_p in ('t','f'))
 );
 
+CREATE OR REPLACE view 
+pm_tasks_active as 
+  SELECT task_id, task_number, status FROM pm_tasks where deleted_p = 'f';
 
+
 create table pm_tasks_revisions (
         task_revision_id                integer
                                         constraint pm_task_revs_id_fk
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/contrib/packages/project-manager/sql/postgresql/upgrade/upgrade-2.12-2.13b1.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/contrib/packages/project-manager/sql/postgresql/upgrade/upgrade-2.13b1-2.13b2.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/contrib/packages/project-manager/tcl/project-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/project-procs-postgresql.xql,v
diff -u -r1.6 -r1.7
--- openacs-4/contrib/packages/project-manager/tcl/project-procs-postgresql.xql	14 Jul 2004 17:51:07 -0000	1.6
+++ openacs-4/contrib/packages/project-manager/tcl/project-procs-postgresql.xql	24 Jul 2004 08:33:54 -0000	1.7
@@ -72,12 +72,15 @@
 
   <fullquery name="pm::project::compute_status.select_project_children">
     <querytext>
-        select
-        item_id, 
-        content_type 
-        from 
-        cr_items 
-        where parent_id = :project_item_id
+        SELECT
+        i.item_id, 
+        i.content_type 
+        FROM
+        cr_items i,
+        pm_tasks_active t
+        WHERE
+        i.item_id   = t.task_id and
+        i.parent_id = :project_item_id
     </querytext>
   </fullquery>
 
@@ -88,8 +91,11 @@
         sum(t.estimated_hours_work) as estimated_hours_total,
         to_char(current_timestamp,'J') as today_j
         from
-        pm_tasks_revisionsx t, cr_items i
+        pm_tasks_revisionsx t, 
+        cr_items i,
+        pm_tasks_active a
         where
+        i.item_id = a.task_id and
         t.item_id in ([join $task_list ", "]) and
         i.live_revision = t.revision_id
     </querytext>
@@ -112,7 +118,7 @@
         from
         pm_tasks_revisionsx t, 
         cr_items i,
-        pm_tasks ti,
+        pm_tasks_active ti,
         pm_task_status s
         where
         t.item_id in ([join $task_list ", "]) and
Index: openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/task-procs.tcl,v
diff -u -r1.17 -r1.18
--- openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl	14 Jul 2004 17:51:08 -0000	1.17
+++ openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl	24 Jul 2004 08:33:54 -0000	1.18
@@ -84,7 +84,7 @@
 	FROM
         pm_tasks_revisionsx r, 
         cr_items i,
-        pm_tasks t
+        pm_tasks_active t
         WHERE
         r.parent_id = :project_item_id and
         r.revision_id = i.live_revision and
@@ -577,7 +577,7 @@
 ad_proc -public pm::task::delete {
     -task_item_id:required
 } {
-    Deletes a given task
+    Marks a task deleted
     
     @author Jade Rubick (jader@bread.com)
     @creation-date 2004-03-10
@@ -588,12 +588,33 @@
     
     @error No error thrown if there is no such task.
 } {
-    db_exec_plsql delete_task "select pm_task__delete_task_item(:task_item_id)"
+    db_dml mark_delete "update pm_tasks set deleted_p = 't' where task_id = :task_item_id"
 
+    pm::project::compute_status [pm::task::project_item_id -task_item_id $task_item_id]
+
     return 1
 }
 
 
+ad_proc -public pm::task::project_item_id {
+    -task_item_id:required
+} {
+    Returns the project item id for a given task
+    
+    @author Jade Rubick (jader@bread.com)
+    @creation-date 2004-07-16
+    
+    @param task_item_id
+
+    @return -1 if there is an error.
+    
+    @error 
+} {
+    return [db_string get_project_id "select parent_id from cr_items where item_id = :task_item_id" -default -1]
+}
+
+
+
 ad_proc -public pm::task::get_url {
     object_id
 } {
@@ -1185,7 +1206,7 @@
         p.party_id,
         (select one_line from pm_roles r where ta.role_id = r.role_id) as role
         FROM
-        pm_tasks ts, 
+        pm_tasks_active ts, 
         pm_tasks_revisionsx t, 
         pm_task_assignment ta,
         acs_users_all p,
@@ -1653,24 +1674,71 @@
 } {
     set use_uncertain_completion_times_p [parameter::get -parameter "UseUncertainCompletionTimesP" -default "1"]
 
-    if {[string equal $use_uncertain_completion_times_p 1]} {
+    if {[string equal $percent_complete 100]} {
+        return 0
+    }
 
-        set display_value1 [expr round($hours_work_min * $percent_complete / 100)]
-        set display_value2 [expr round($hours_work_max * $percent_complete / 100)]
+    if {[string equal $percent_complete 0]} {
+        return [pm::task::estimated_hours_work \
+                    -hours_work $hours_work \
+                    -hours_work_min $hours_work_min \
+                    -hours_work_max $hours_work_max]
+    }
 
+    if {[string is true $use_uncertain_completion_times_p]} {
+
+        set display_value1 [expr round($hours_work_min * [expr 100 - $percent_complete] / double(100))]
+        set display_value2 [expr round($hours_work_max * [expr 100 - $percent_complete] / double(100))]
+
         if {[string equal $display_value1 $display_value2]} {
             set display_value "$display_value1"
         } else {
             set display_value "$display_value1 - $display_value2"
         }
     } else {
-        set display_value [expr round($hours_work * $percent_complete / 100)]
+        set display_value [expr round($hours_work * [expr 100 - $percent_complete] / double(100))]
     }
 
     return $display_value
 }
 
 
+ad_proc -public pm::task::estimated_hours_work {
+    -hours_work:required
+    -hours_work_min:required
+    -hours_work_max:required
+} {
+    Displays the total estimated hours work in a consistent format
+    
+    @author Jade Rubick (jader@bread.com)
+    @creation-date 2004-06-02
+    
+    @param hours_work
+
+    @param hours_work_min
+
+    @param hours_work_max
+
+    @return 
+    
+    @error 
+} {
+    set use_uncertain_completion_times_p [parameter::get -parameter "UseUncertainCompletionTimesP" -default "1"]
+
+    if {[string equal $use_uncertain_completion_times_p 1]} {
+        if {[string equal $hours_work_min $hours_work_max]} {
+            set display_value "$hours_work_min"
+        } else {
+            set display_value "$hours_work_min - $hours_work_max"
+        }
+    } else {
+        set display_value "$estimated_hours_work"
+    }
+    
+    return $display_value
+}
+
+
 ad_proc -public pm::task::assignee_email_list {
     -task_item_id:required
 } {
@@ -1743,7 +1811,7 @@
                 FROM
                 persons u, 
                 pm_task_assignment a,
-                pm_tasks ts
+                pm_tasks_active ts
                 WHERE 
                 u.person_id = a.party_id and
                 ts.task_id = a.task_id and
Index: openacs-4/contrib/packages/project-manager/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/index.adp,v
diff -u -r1.20 -r1.21
--- openacs-4/contrib/packages/project-manager/www/index.adp	12 Mar 2004 13:44:44 -0000	1.20
+++ openacs-4/contrib/packages/project-manager/www/index.adp	24 Jul 2004 08:33:55 -0000	1.21
@@ -1,31 +1,38 @@
 <master src="lib/master">
 
-<link rel="stylesheet" href="style.css" type="text/css">
-
-<property name="title">@project_term@s</property>
-<property name="context">@context;noquote@</property>
-
-<table cellpadding="3" cellspacing="3">
-
-  <tr>
-
-    <td class="list-filter-pane" valign="top">
-
+  <link rel="stylesheet" href="style.css" type="text/css" />
+    
+  <property name="title">@project_term@s</property>
+  <property name="context">@context;noquote@</property>
+  
+  <table cellpadding="3" cellspacing="3">
+    
+    <tr>
+      
+      <td class="list-filter-pane" valign="top">
+        
+        <form method=post name=search action=index>
+          Search:<br />
+          <input type=text name=searchterm value="@searchterm@" size="15" />
+          @hidden_vars;noquote@
+          <input type="submit" value="Go" />
+        </form>
+        
         @category_select;noquote@
-
+        
         <listfilters name="projects"></listfilters>
-
-    </td>
-
-    <td class="list-list-pane" valign="top">
-
+        
+      </td>
+      
+      <td class="list-list-pane" valign="top">
+        
         <listtemplate name="projects"></listtemplate>
+        
+      </td>
+      
+    </tr>
+    
+  </table>
 
-    </td>
 
-  </tr>
 
-</table>
-
-
-
Index: openacs-4/contrib/packages/project-manager/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/index.tcl,v
diff -u -r1.19 -r1.20
--- openacs-4/contrib/packages/project-manager/www/index.tcl	14 Jul 2004 17:51:08 -0000	1.19
+++ openacs-4/contrib/packages/project-manager/www/index.tcl	24 Jul 2004 08:33:55 -0000	1.20
@@ -18,6 +18,7 @@
 } {
     orderby_project:optional
     {status_id:integer,optional}
+    {searchterm ""}
     category_id:multiple,optional
     {format "normal"}
     {assignee_id:integer,optional}
@@ -42,6 +43,10 @@
 set project_term    [parameter::get -parameter "ProjectName" -default "Project"]
 set project_term_lower [parameter::get -parameter "projectname" -default "project"]
 
+set exporting_vars { status_id category_id assignee_id orderby_project format }
+set hidden_vars [export_vars -form $exporting_vars]
+
+
 # set up context bar
 set context [list]
 
@@ -85,22 +90,35 @@
 
 set assignees_filter [pm::project::assignee_filter_select -status_id $status_id]
 
+if {![empty_string_p $searchterm]} {
+
+    if {[regexp {([0-9]+)} $searchterm match query_digits]} {
+        set search_term_where " (upper(p.title) like upper('%$searchterm%')
+ or p.item_id = :query_digits) "
+    } else {
+        set search_term_where " upper(p.title) like upper('%$searchterm%')"
+    }
+} else {
+    set search_term_where ""
+}
+
+
 template::list::create \
     -name projects \
     -multirow projects \
     -key project_item_id \
     -elements {
-        customer_name {
-            label "Customer"
-            display_template "
-<if @projects.organization_id@ not nil><a href=\"[site_node::get_package_url -package_key organizations]one?organization_id=@projects.organization_id@\">@projects.customer_name@</a></if><else>@projects.customer_name@</else>
-"
-        }
         project_name {
             label "Project name"
             link_url_col item_url
             link_html { title "View this project version" }
         }
+        customer_name {
+            label "Customer"
+            display_template "
+<if @projects.customer_id@ not nil><a href=\"[util_memoize [list site_node::get_package_url -package_key organizations]]one?organization_id=@projects.customer_id@\">@projects.customer_name@</a></if><else>@projects.customer_name@</else>
+"
+        }
         earliest_finish_date {
             label "Earliest finish"
             display_template "<if @projects.days_to_earliest_finish@ gt 1>@projects.earliest_finish_date@</if><else><font color=\"green\">@projects.earliest_finish_date@</font></else>"
@@ -123,6 +141,10 @@
         narrow
     } \
     -filters {
+        searchterm {
+            label "Search"
+            where_clause {$search_term_where}
+        }
         status_id {
             label "Status" 
             values {[pm::status::project_status_select]}
Index: openacs-4/contrib/packages/project-manager/www/one-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/one-postgresql.xql,v
diff -u -r1.27 -r1.28
--- openacs-4/contrib/packages/project-manager/www/one-postgresql.xql	30 Jun 2004 16:43:29 -0000	1.27
+++ openacs-4/contrib/packages/project-manager/www/one-postgresql.xql	24 Jul 2004 08:33:55 -0000	1.28
@@ -56,7 +56,9 @@
         t.estimated_hours_work,
         t.estimated_hours_work_min,
         t.estimated_hours_work_max,
-        t.actual_hours_worked
+        t.actual_hours_worked,
+        s.status_type,
+        s.description as status_description
 	FROM
 	(select * from pm_tasks_revisionsx 
          LEFT JOIN
@@ -70,14 +72,13 @@
            pm_task_dependency d 
            ON 
            i.item_id = d.task_id,
-        pm_tasks ti,
+        pm_tasks_active ti,
         pm_task_status s
 	WHERE
         t.parent_id = :project_item_id and
         t.revision_id = i.live_revision and
         t.item_id     = ti.task_id and
-        ti.status     = s.status_id and
-        s.status_type = :status_type
+        ti.status     = s.status_id
         [template::list::orderby_clause -name tasks -orderby]
     </querytext>
   </fullquery>
Index: openacs-4/contrib/packages/project-manager/www/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/one.adp,v
diff -u -r1.36 -r1.37
--- openacs-4/contrib/packages/project-manager/www/one.adp	11 Jun 2004 20:58:19 -0000	1.36
+++ openacs-4/contrib/packages/project-manager/www/one.adp	24 Jul 2004 08:33:55 -0000	1.37
@@ -265,9 +265,6 @@
               </li>
             </ul>
             
-            <listfilters name="tasks"></listfilters>
-            
-            
           </td>
         </tr>
         
Index: openacs-4/contrib/packages/project-manager/www/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/one.tcl,v
diff -u -r1.38 -r1.39
--- openacs-4/contrib/packages/project-manager/www/one.tcl	30 Jun 2004 21:29:30 -0000	1.38
+++ openacs-4/contrib/packages/project-manager/www/one.tcl	24 Jul 2004 08:33:55 -0000	1.39
@@ -28,7 +28,6 @@
     project_id:integer,optional
     {orderby_subproject ""}
     {orderby_tasks ""}
-    {status_type "o"}
     {logger_variable_id:integer ""}
     {logger_days:integer "30"}
 
@@ -76,11 +75,6 @@
                                 -project_item_id $project_item_id]
         }
     }
-    status_type_exists {
-        if {![string equal $status_type "o"] && ![string equal $status_type "c"]} {
-            set status_type "o"
-        }
-    }
     logger_days_positive {
         if {$logger_days < 1} {
             set logger_days 1
@@ -195,12 +189,6 @@
 
 # Tasks, using list-builder ---------------------------------
 
-if {$use_uncertain_completion_times_p} {
-    set work_display_template "@tasks.estimated_hours_work_min@ - @tasks.estimated_hours_work_max@ h"
-} else {
-    set work_display_template "@tasks.estimated_hours_work@ h"
-}
-
 set process_link "process-use?project_item_id=$project_item_id"
 
 template::list::create \
@@ -213,10 +201,7 @@
         }
         title {
             label "Subject"
-            display_col title
-            display_template {
-                <a href="@tasks.item_url@">@tasks.title@</a>
-            }
+            display_template "<if @tasks.status_type@ eq o><b><a href=\"@tasks.item_url@\">@tasks.title@</a></b></if><else><a href=\"@tasks.item_url@\">@tasks.title@</a> -- closed</else>"
         } 
         parent_task_id {
             label "Dep"
@@ -266,11 +251,6 @@
         narrow
     } \
     -filters {
-        status_type {
-            label "Status" 
-            values {{"Open" "o"} {"Closed" "c"}}
-            where_clause {s.status_type = :status_type}
-        }
         project_item_id {
             hide_p 1
         }
@@ -284,34 +264,32 @@
     -orderby {
         default_value latest_start,asc
         title {
-            orderby_asc "title asc, task_id asc"
-            orderby_desc "title desc, task_id desc"
+            orderby_asc "status_type desc, title asc, task_id asc"
+            orderby_desc "status_type asc, title desc, task_id desc"
             default_direction asc
         }
         earliest_start {
-            orderby_asc "earliest_start, task_id asc, u.first_names, u.last_name"
-            orderby_desc "earliest_start desc, task_id desc, u.first_names, u.last_name"
+            orderby_asc "status_type desc, earliest_start, task_id asc, u.first_names, u.last_name"
+            orderby_desc "status_type asc, earliest_start desc, task_id desc, u.first_names, u.last_name"
             default_direction asc
         }
         earliest_finish {
-            orderby_asc "earliest_finish, task_id asc, u.first_names, u.last_name"
-            orderby_desc "earliest_finish desc, task_id desc, u.first_names, u.last_name"
+            orderby_asc "status_type desc, earliest_finish, task_id asc, u.first_names, u.last_name"
+            orderby_desc "status_type asc, earliest_finish desc, task_id desc, u.first_names, u.last_name"
             default_direction asc
         }
         latest_start {
-            orderby_asc "latest_start, task_id asc, u.first_names, u.last_name"
-            orderby_desc "latest_start desc, task_id desc, u.first_names, u.last_name"
+            orderby_asc "status_type desc, latest_start, task_id asc, u.first_names, u.last_name"
+            orderby_desc "status_type asc, latest_start desc, task_id desc, u.first_names, u.last_name"
             default_direction asc
         }
         latest_finish {
-            orderby_asc "latest_finish, task_id asc, u.first_names, u.last_name"
-            orderby_desc "latest_finish desc, task_id desc, u.first_names, u.last_name"
+            orderby_asc "status_type desc, latest_finish, task_id asc, u.first_names, u.last_name"
+            orderby_desc "status_type asc, latest_finish desc, task_id desc, u.first_names, u.last_name"
             default_direction asc
         }
     } \
-    -orderby_name orderby_tasks \
-    -html {
-    }
+    -orderby_name orderby_tasks
 
 
 db_multirow -extend { item_url earliest_start_pretty earliest_finish_pretty latest_start_pretty latest_finish_pretty slack_time} tasks project_tasks_query {
Index: openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-add-edit.tcl,v
diff -u -r1.40 -r1.41
--- openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl	28 Jun 2004 21:12:22 -0000	1.40
+++ openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl	24 Jul 2004 08:33:56 -0000	1.41
@@ -99,9 +99,13 @@
             ad_complain
         }
     }
-    percent_is_in_range -requires {percent_complete:integer} {
-        if {$percent_complete < 0 || $percent_complete > 100} {
-            ad_complain
+    percent_is_in_range {
+        for {set i 1} {$i <= $number} {incr i} {
+            if {[exists_and_not_null percent_complete($i)]} {
+                if {$percent_complete($i) < 0 || $percent_complete($i) > 100} {
+                    ad_complain
+                }
+            }
         }
     }
 } -errors {
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/contrib/packages/project-manager/www/task-delete-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/contrib/packages/project-manager/www/task-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-delete.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/project-manager/www/task-delete.adp	27 Apr 2004 00:49:29 -0000	1.1
+++ openacs-4/contrib/packages/project-manager/www/task-delete.adp	24 Jul 2004 08:33:56 -0000	1.2
@@ -1,5 +1,5 @@
 <master>
   <property name="title">@title@</property>
   <property name="context">@context@</property>
-  
-Currently, deletion of a task is not working.
+
+<formtemplate id="delete_task"></formtemplate>
Index: openacs-4/contrib/packages/project-manager/www/task-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-delete.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/project-manager/www/task-delete.tcl	27 Apr 2004 00:49:29 -0000	1.1
+++ openacs-4/contrib/packages/project-manager/www/task-delete.tcl	24 Jul 2004 08:33:56 -0000	1.2
@@ -4,6 +4,7 @@
     
     Deletes a task
     
+    @author Chris Davis (mcd@daviesinc.com)
     @author Jade Rubick (jader@bread.com)
     @creation-date 2004-03-31
     @arch-tag: af0efc2f-cf78-4f80-a484-1f52f3db6a48
@@ -15,5 +16,71 @@
 } -errors {
 }
 
+set package_id [ad_conn package_id]
+
+permission::require_permission -privilege "delete" -object_id $package_id
+
 set title "Delete task"
 set context [list "Delete task"]
+
+
+set action [template::form get_action delete_task]
+
+if {[string equal $action delete]} {
+
+  pm::task::delete -task_item_id $task_item_id
+  ad_returnredirect -message "Task $task_item_id Deleted" "index"
+
+} else {
+
+    set use_uncertain_completion_times_p [parameter::get -parameter "UseUncertainCompletionTimesP" -default "1"]
+
+    if {[string is true $use_uncertain_completion_times_p]} {
+        set hours_work {
+            {estimated_hours_work_min:text
+                {label "Estimated Hours (Min)"}
+            }
+            {estimated_hours_work_max:text
+                {label "Estimated Hours (Max)"}
+            }
+        }
+    } else {
+        set hours_work {
+            {estimated_hours_work:text
+                {label "Estimated Hours"}
+            }
+        }
+    }
+
+
+    set form "
+        task_item_id:key
+        {task_title:text
+            {label \"Title\"}
+        }
+        {description:richtext
+            {label \"Description\"}
+        }
+        $hours_work
+        {percent_complete:text
+            {label \"Percent Complete\"}
+        }
+    "
+    
+    ad_form -name delete_task \
+        -edit_request {
+
+            db_1row task_query { }
+
+            set description [list $description $mime_type]
+
+        } \
+        -mode display \
+        -has_submit 1 \
+        -has_edit 1 \
+        -actions {{"Delete this task?" delete} {"Cancel" cancel}} \
+        -cancel_url "task-one?task_id=$task_item_id" \
+        -form $form 
+
+}
+
Index: openacs-4/contrib/packages/project-manager/www/task-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-one.adp,v
diff -u -r1.32 -r1.33
--- openacs-4/contrib/packages/project-manager/www/task-one.adp	14 Jul 2004 17:51:08 -0000	1.32
+++ openacs-4/contrib/packages/project-manager/www/task-one.adp	24 Jul 2004 08:33:56 -0000	1.33
@@ -163,8 +163,10 @@
               <else>
                 Slack: @task_info.slack_time@<br />
               </else>
+
+              Complete: @task_info.percent_complete@%
             </td>
-            
+
           </tr>
           
           <tr class="list-filter-header">
Index: openacs-4/contrib/packages/project-manager/www/tasks-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/tasks-postgresql.xql,v
diff -u -r1.7 -r1.8
--- openacs-4/contrib/packages/project-manager/www/tasks-postgresql.xql	3 Jun 2004 21:32:13 -0000	1.7
+++ openacs-4/contrib/packages/project-manager/www/tasks-postgresql.xql	24 Jul 2004 08:33:56 -0000	1.8
@@ -32,7 +32,7 @@
         p.first_names || ' ' || p.last_name as full_name,
         (select one_line from pm_roles r where ta.role_id = r.role_id) as role
         FROM
-        pm_tasks ts, 
+        pm_tasks_active ts, 
         cr_items i,
         pm_tasks_revisionsx t 
           LEFT JOIN pm_task_assignment ta
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/contrib/packages/room-reservation/sql/postgresql/upgrade/upgrade-0.1d-0.2d.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/etc/daemontools/run
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/etc/daemontools/run,v
diff -u -r1.6 -r1.7
--- openacs-4/etc/daemontools/run	26 Apr 2004 16:18:16 -0000	1.6
+++ openacs-4/etc/daemontools/run	24 Jul 2004 08:34:02 -0000	1.7
@@ -1,9 +1,10 @@
 #!/bin/sh 
 
+# give time for Postgres to come up
 # see http://openacs.org/forums/message-view?message_id=176100
 sleep 4
 
 exec /usr/local/aolserver/bin/nsd-postgres -it /var/lib/aolserver/service0/etc/config.tcl -u service0 -g web
 
 # For AOLserver 4 using privileged ports (usually < 1024), add the flag
-# -b youraddress:yourport
+# -b youraddress:yourport to the nsd command
Index: openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl,v
diff -u -r1.67 -r1.68
--- openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl	12 Jul 2004 14:49:34 -0000	1.67
+++ openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl	24 Jul 2004 08:34:03 -0000	1.68
@@ -74,12 +74,14 @@
 }
 
 ad_proc -public auth::self_registration {} {
-   #Check AllowSelfRegister parameter
+    #Check AllowSelfRegister parameter
 
-    if { ![parameter::get_from_package_key -package_key acs-authentication  -parameter AllowS\elfRegister] } {
-         ad_maybe_redirect_for_registration
+    if { ![parameter::get_from_package_key \
+                      -package_key acs-authentication \
+	              -parameter AllowSelfRegister] } {
+          ad_maybe_redirect_for_registration
     }
-}
+}          
 
 
 ad_proc -public auth::get_user_id {
Index: openacs-4/packages/acs-content-repository/sql/oracle/content-item.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/content-item.sql,v
diff -u -r1.26 -r1.27
--- openacs-4/packages/acs-content-repository/sql/oracle/content-item.sql	29 Jun 2004 10:17:35 -0000	1.26
+++ openacs-4/packages/acs-content-repository/sql/oracle/content-item.sql	24 Jul 2004 08:34:03 -0000	1.27
@@ -11,6 +11,10 @@
 -- http://www.fsf.org/copyleft/gpl.html
 set serveroutput on size 1000000 format wrapped
 
+create or replace view content_item_globals as
+    select -100 as c_root_folder_id
+    from dual;
+
 create or replace package body content_item
 as
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-content-repository/sql/oracle/upgrade/upgrade-5.1.2d3-5.1.2d4.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-type.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-type.sql,v
diff -u -r1.37 -r1.38
--- openacs-4/packages/acs-content-repository/sql/postgresql/content-type.sql	1 Jul 2004 16:33:38 -0000	1.37
+++ openacs-4/packages/acs-content-repository/sql/postgresql/content-type.sql	24 Jul 2004 08:34:04 -0000	1.38
@@ -310,7 +310,7 @@
   -- Drop the column if neccessary
   if drop_attribute__drop_column then
       execute ''alter table '' || v_table || '' drop column '' ||
-	drop_attribute__attribute_name || '' '' || ''cascade'';
+	drop_attribute__attribute_name || '' cascade'';
 
 --    exception when others then
 --      raise_application_error(-20000, ''Unable to drop column '' || 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.1.2d1-5.1.2d2.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.1.2d2-5.1.2d3.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-lang/tcl/locale-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/locale-procs.tcl,v
diff -u -r1.28 -r1.29
--- openacs-4/packages/acs-lang/tcl/locale-procs.tcl	29 Jun 2004 10:17:40 -0000	1.28
+++ openacs-4/packages/acs-lang/tcl/locale-procs.tcl	24 Jul 2004 08:34:05 -0000	1.29
@@ -287,6 +287,11 @@
         set user_id [ad_conn untrusted_user_id]
     }
 
+    # For all the users with a user_id of 0 don't cache.
+    if { $user_id == 0} {
+	return [lang::user::site_wide_locale_not_cached $user_id]
+    }
+
     # Cache for the lifetime of sessions (7 days)
     return [util_memoize [list lang::user::site_wide_locale_not_cached $user_id] [sec_session_timeout]]
 }
Index: openacs-4/packages/acs-subsite/lib/login.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/login.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/lib/login.adp	10 Jun 2004 17:06:47 -0000	1.6
+++ openacs-4/packages/acs-subsite/lib/login.adp	24 Jul 2004 08:34:06 -0000	1.7
@@ -8,9 +8,8 @@
 
 <if @self_registration@ true>
 
-   <if @register_url@ not nil>
-      <a href="@register_url@">#acs-subsite.Register#</a>
-   </if>
-
+<if @register_url@ not nil>
+  <a href="@register_url@">#acs-subsite.Register#</a>
 </if>
 
+</if>
Index: openacs-4/packages/acs-subsite/lib/login.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/login.tcl,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/acs-subsite/lib/login.tcl	10 Jun 2004 17:06:47 -0000	1.22
+++ openacs-4/packages/acs-subsite/lib/login.tcl	24 Jul 2004 08:34:06 -0000	1.23
@@ -14,12 +14,11 @@
     security::require_secure_conn
 }
 
-
 set self_registration [parameter::get_from_package_key \
                                   -package_key acs-authentication \
-                                -parameter AllowSelfRegister]   
+			          -parameter AllowSelfRegister \
+			          -default 1]   
 
-
 if { ![exists_and_not_null package_id] } {
     set subsite_id [subsite::get_element -element object_id]
 }
Index: openacs-4/packages/acs-subsite/lib/user-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/user-new.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/lib/user-new.tcl	10 Jun 2004 17:06:47 -0000	1.7
+++ openacs-4/packages/acs-subsite/lib/user-new.tcl	24 Jul 2004 08:34:06 -0000	1.8
@@ -63,7 +63,6 @@
     }
 }
 
-
 ad_form -extend -name register -on_request {
     # Populate elements from local variables
 
@@ -92,7 +91,6 @@
         }
     }
 
-
     # Handle registration problems
     
     switch $creation_info(creation_status) {
@@ -131,10 +129,6 @@
     if { ![empty_string_p $next_url] } {
         # Add user_id and account_message to the URL
         
-        if { $creation_info(generated_pwd_p) } {
-            set password $creation_info(password)
-        }
-        
         ad_returnredirect [export_vars -base $next_url {user_id password {account_message $creation_info(account_message)}}]
         ad_script_abort
     } 
Index: openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl,v
diff -u -r1.25 -r1.26
--- openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl	29 Jun 2004 10:17:43 -0000	1.25
+++ openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl	24 Jul 2004 08:34:06 -0000	1.26
@@ -289,7 +289,26 @@
     return $result
 }
 
+ad_proc -public subsite::upload_allowed {} {
+    Verifies SolicitPortraitP parameter to ensure upload portrait
+    security.
 
+    @author Hector Amado (hr_amado@galileo.edu)
+    @creation-date 2004-06-16
+} {
+
+    if { ![parameter::get_from_package_key -package_key acs-subsite -parameter SolicitPortraitP]  } {
+        if { ![acs_user::site_wide_admin_p] } {
+             ns_log notice "user is tried to see user/portrait/upload  without permission"
+        ad_return_forbidden \
+               "Permission Denied" \
+               "<blockquote>
+                You don't have permission to see this page.
+               </blockquote>"
+	}
+    }
+}
+
 ad_proc subsite::util::sub_type_exists_p {
     object_type
 } {
Index: openacs-4/packages/acs-subsite/www/resources/core.js
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/resources/core.js,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/resources/core.js	4 Mar 2004 18:33:22 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/resources/core.js	24 Jul 2004 08:34:06 -0000	1.6
@@ -113,9 +113,8 @@
 /* HTMLArea (part of Richtext Widget) Support */
 
 function acs_initHtmlArea(editor_var, elementid) {
-    var config         = new HTMLArea.Config();
+    var config         = editor_var.config;
     config.editorURL   = "/resources/acs-templating/htmlarea/";
-    editor_var = new HTMLArea(elementid, config);
     editor_var.generate();
     return false;
 }
Index: openacs-4/packages/acs-subsite/www/user/portrait/upload-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/Attic/upload-2.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-subsite/www/user/portrait/upload-2.tcl	2 Jul 2004 11:49:05 -0000	1.9
+++ openacs-4/packages/acs-subsite/www/user/portrait/upload-2.tcl	24 Jul 2004 08:34:07 -0000	1.10
@@ -12,6 +12,7 @@
     {title ""}
 }
 
+subsite::upload_allowed
 set current_user_id [auth::require_login]
 
 if [empty_string_p $user_id] {
Index: openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl	15 Aug 2003 21:18:13 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl	24 Jul 2004 08:34:07 -0000	1.4
@@ -16,6 +16,7 @@
 set current_user_id [ad_verify_and_get_user_id]
 
 if [empty_string_p $user_id] {
+    subsite::upload_allowed
     set user_id $current_user_id
     set admin_p 0
 } else {
Index: openacs-4/packages/acs-tcl/tcl/admin-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/admin-procs.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/acs-tcl/tcl/admin-procs.tcl	26 Jan 2004 15:39:46 -0000	1.15
+++ openacs-4/packages/acs-tcl/tcl/admin-procs.tcl	24 Jul 2004 08:34:07 -0000	1.16
@@ -25,7 +25,7 @@
     if { [security::secure_conn_p] } {
         return "filter_ok"
     }
-    
+
     ad_returnredirect [security::get_secure_qualified_url [ad_return_url]]
     # No abort since in filter
     
Index: openacs-4/packages/acs-tcl/tcl/html-email-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/html-email-procs.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-tcl/tcl/html-email-procs.tcl	12 Jul 2004 14:49:49 -0000	1.5
+++ openacs-4/packages/acs-tcl/tcl/html-email-procs.tcl	24 Jul 2004 08:34:07 -0000	1.6
@@ -33,8 +33,11 @@
     #source $r_dir/md5.tcl
     #source $r_dir/mime.tcl
 
-    package require mime
+    # Files are included, therefore there is no need for the mime
+    # package anymore.
 
+    # package require mime
+
     # convert text to charset
     set encoding [ns_encodingforcharset $charset]
     if {[lsearch [encoding names] $encoding] != -1} {
Index: openacs-4/packages/acs-tcl/tcl/security-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs.tcl,v
diff -u -r1.33 -r1.34
--- openacs-4/packages/acs-tcl/tcl/security-procs.tcl	29 Jun 2004 10:17:44 -0000	1.33
+++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl	24 Jul 2004 08:34:07 -0000	1.34
@@ -1503,6 +1503,9 @@
         # Prefix with https
         regsub {^(?:http://)?} $secure_location {https://} secure_location
 
+	# remove port number if using nonstandard port
+        regexp {^(.*):(.*)?} $secure_location match secure_location port
+
         # Add port number if non-standard
         set https_port [get_https_port]
         if { ![string equal $https_port 443] } {
Index: openacs-4/packages/dotlrn/dotlrn.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/dotlrn.info,v
diff -u -r1.120 -r1.121
--- openacs-4/packages/dotlrn/dotlrn.info	29 Apr 2004 15:42:50 -0000	1.120
+++ openacs-4/packages/dotlrn/dotlrn.info	24 Jul 2004 08:34:09 -0000	1.121
@@ -22,6 +22,10 @@
         <requires url="user-profile" version="0.1d"/>
 
         <callbacks>
+            <callback type="after-install"  proc="dotlrn::apm::after_install"/>
+            <callback type="after-instantiate"  proc="dotlrn::apm::after_instantiate"/>
+            <callback type="after-upgrade"  proc="dotlrn::apm::after_upgrade"/>
+            <callback type="before-uninstall"  proc="dotlrn::apm::before_uninstall"/>
         </callbacks>
         <parameters>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="AutoAddAuthorities"  default="*" description="A comma-separated list of short-names of authorities for which users should be automatically added to .LRN, or '*' for all. In order for users to be auto-added, AutoAddUsersP needs to be set to 1, and this needs to be set to * or include the relevant authority short_names. Example: 'local,ldap'." section_name="Auto-Adding Users to .LRN"/>
@@ -44,10 +48,10 @@
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="clubs_pretty_plural"  default="#dotlrn.clubs_pretty_plural#" description="used everywhere in the ui"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="community_level_p"  description="Whether this is a Class Instance Level instantiation of the package"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="community_type_level_p"  description="Whether this is a Class Level instance of the package"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="default_class_instance_applets"  default="dotlrn_dotlrn,dotlrn_fs,dotlrn_forums,dotlrn_calendar,dotlrn_faq,dotlrn_news,dotlrn_research,dotlrn_static,dotlrn_bm,dotlrn_syllabus,dotlrn_homework_applet" description="dotLRN applets to add by default to each new community"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="default_club_applets"  default="dotlrn_dotlrn,dotlrn_fs,dotlrn_forums,dotlrn_calendar,dotlrn_faq,dotlrn_news,dotlrn_static,dotlrn_bm" description="the applets to add when making a new club"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="default_subcomm_applets"  default="dotlrn_dotlrn,dotlrn_fs,dotlrn_forums,dotlrn_calendar,dotlrn_faq,dotlrn_news,dotlrn_static,dotlrn_bm" description="see above"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="default_user_portal_applets"  default="dotlrn_dotlrn,dotlrn_calendar,dotlrn_forums,dotlrn_faq,dotlrn_fs,dotlrn_news" description="a csv list of the applets to call when creating the user portal template"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="default_class_instance_applets"  default="dotlrn_dotlrn,dotlrn_fs,dotlrn_forums,dotlrn_calendar,dotlrn_faq,dotlrn_news,dotlrn_research,dotlrn_static,dotlrn_bm,dotlrn_syllabus,dotlrn_homework_applet,dotlrn_survey" description="dotLRN applets to add by default to each new community"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="default_club_applets"  default="dotlrn_dotlrn,dotlrn_fs,dotlrn_forums,dotlrn_calendar,dotlrn_faq,dotlrn_news,dotlrn_static,dotlrn_bm,dotlrn_survey" description="the applets to add when making a new club"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="default_subcomm_applets"  default="dotlrn_dotlrn,dotlrn_fs,dotlrn_forums,dotlrn_calendar,dotlrn_faq,dotlrn_news,dotlrn_static,dotlrn_bm,dotlrn_survey" description="see above"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="default_user_portal_applets"  default="dotlrn_dotlrn,dotlrn_calendar,dotlrn_forums,dotlrn_faq,dotlrn_fs,dotlrn_news,dotlrn_survey" description="a csv list of the applets to call when creating the user portal template"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="departments_pretty_name"  default="#dotlrn.departments_pretty_name#" description="used everywhere in the ui"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="departments_pretty_plural"  default="#dotlrn.departments_pretty_plural#" description="used everywhere in the ui"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="dotlrn_admin_pretty_name"  default="#dotlrn.dotlrn_admin_pretty_name#" description="What is dotlrn administration displayed as? Some might want 'Site Wide Administration' and some might with 'dotLRN Administration'"/>
Index: openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml,v
diff -u -r1.36 -r1.37
--- openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml	29 Jun 2004 10:17:53 -0000	1.36
+++ openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml	24 Jul 2004 08:34:10 -0000	1.37
@@ -162,6 +162,7 @@
   <msg key="Edit">Edit</msg>
   <msg key="Edit_a_User">Edit a User</msg>
   <msg key="edit_approved_email_servers">Edit Pre-approved Email Servers</msg>
+  <msg key="edit_community_parameters">Edit community parameters</msg>
   <msg key="edit_message_and_hit_send">Edit the message below and hit &quot;Send Email&quot; to
 notify this user.</msg>
   <msg key="edit_parameters">Edit parameters</msg>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/tcl/apm-callback-procs.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
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.186 -r1.187
--- openacs-4/packages/dotlrn/tcl/community-procs.tcl	29 Jun 2004 10:17:54 -0000	1.186
+++ openacs-4/packages/dotlrn/tcl/community-procs.tcl	24 Jul 2004 08:34:10 -0000	1.187
@@ -312,6 +312,21 @@
         # it's children)
         permission::set_not_inherit -object_id $community_id
 
+
+        # Grant permission to dotlrn-admin group
+
+        set dotlrn_admin_group_id [db_string group_id_from_name "
+             select group_id from groups where group_name='dotlrn-admin'" -default ""]
+        if {![empty_string_p $dotlrn_admin_group_id] } {
+
+             permission::grant \
+                  -party_id $dotlrn_admin_group_id  \
+                  -object_id $community_id \
+                  -privilege "admin"
+
+        }
+
+
         # Grant read_private_data permission to "non guest" users.
         dotlrn_privacy::grant_read_private_data_to_non_guests -object_id $community_id
         
Index: openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl,v
diff -u -r1.56 -r1.57
--- openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl	12 Jul 2004 14:49:56 -0000	1.56
+++ openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl	24 Jul 2004 08:34:10 -0000	1.57
@@ -105,16 +105,19 @@
         ns_set put $extra_vars user_id $user_id
         ns_set put $extra_vars id $id
 
-        set portal_id [dotlrn::get_portal_id_from_type -type user]
+        set template_id [dotlrn::get_portal_id_from_type -type user]
 
         db_transaction {
             set_can_browse -user_id $user_id -can_browse\=$can_browse_p
 
-	    # The user will start with a the default portal.
-	    # A new one will be created when they go to configure
+	    set portal_id [portal::create \
+		    -template_id $template_id \
+		    -name "[_ dotlrn.lt_Your_dotLRN_Workspace]" \
+		    $user_id] 
 
-            ns_set put $extra_vars portal_id $portal_id
 
+	    ns_set put $extra_vars portal_id $portal_id
+
             # Add the relation (no need to feed in anything for object_id_one,
             # or two for that matter).
             set rel_id [relation_add \
@@ -124,7 +127,7 @@
                 "" \
                 $user_id \
             ]
-
+	    
             dotlrn_applet::dispatch -op AddUser -list_args [list $user_id]
 
             # if the user is a member of communities (from some previous
Index: openacs-4/packages/dotlrn/www/applet-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/applet-add.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/applet-add.tcl	23 Oct 2002 12:38:39 -0000	1.7
+++ openacs-4/packages/dotlrn/www/applet-add.tcl	24 Jul 2004 08:34:10 -0000	1.8
@@ -26,6 +26,10 @@
     {referer "applets"}
 }
 
+#prevent this page from being called when it is not allowed
+# i.e.   AllowManageApplets 0
+dotlrn_portlet::is_allowed -parameter manageapplets
+
 set community_id [dotlrn_community::get_community_id]
 
 # Check access
Index: openacs-4/packages/dotlrn/www/applets.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/applets.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/dotlrn/www/applets.tcl	21 Oct 2003 21:53:23 -0000	1.14
+++ openacs-4/packages/dotlrn/www/applets.tcl	24 Jul 2004 08:34:10 -0000	1.15
@@ -23,6 +23,10 @@
 } -query {
 }
 
+#prevent this page from being called when it is not allowed
+# i.e.   AllowManageApplets 0
+dotlrn_portlet::is_allowed -parameter manageapplets
+
 set community_id [dotlrn_community::get_community_id]
 set user_id [ad_get_user_id]
 set portal_id [dotlrn_community::get_portal_id -community_id $community_id]
Index: openacs-4/packages/dotlrn/www/configure.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/configure.tcl,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/dotlrn/www/configure.tcl	12 Jul 2004 14:49:56 -0000	1.19
+++ openacs-4/packages/dotlrn/www/configure.tcl	24 Jul 2004 08:34:10 -0000	1.20
@@ -56,34 +56,6 @@
 
     set portal_id [dotlrn::get_portal_id -user_id $user_id]
 
-    # check if the portal_id is the default_portal_id
- 
-    set default_portal_p [db_string default_portal_p {
-	select count(*) from dotlrn_portal_types_map where portal_id = :portal_id
-    }]
-
-
-    if {$default_portal_p  == 1} {
-	# user is set as the default portal
-	# give the user their own portal
-
-
-	set portal_id    [portal::create \
-                -template_id $portal_id \
-                -name "[_ dotlrn.lt_Your_dotLRN_Workspace]" \
-                $user_id]
-
-	db_exec_plsql update_user_portal_id {
-	    update dotlrn_user_profile_rels set portal_id = :portal_id 
-	    where dotlrn_user_profile_rels.rel_id = 
-	    (select rel_id from acs_rels, dotlrn_user_types 
-	     where acs_rels.object_id_two = :user_id
-	     and acs_rels.object_id_one = dotlrn_user_types.group_id)
-	}
-
-	util_memoize_flush "dotlrn::get_portal_id_not_cached -user_id $user_id"
-    }
-
     
     set name [portal::get_name $portal_id]
     set rendered_page [portal::configure -allow_theme_change_p 0 $portal_id "index"]
Index: openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp,v
diff -u -r1.38 -r1.39
--- openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp	29 Jun 2004 10:18:00 -0000	1.38
+++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp	24 Jul 2004 08:34:10 -0000	1.39
@@ -70,9 +70,11 @@
           <a href="@communities.url@">@communities.pretty_name@</a>
 	<if @communities.archived_p@><font color=red>Archived</font></if>
 	<if @show_buttons_p@ eq 1>
+           <if @show_drop_button_p@ eq 1>
 		&nbsp; <small> 
                         <a href="@communities.url@deregister?referer=@referer@">#dotlrn.drop_membership_link#</a>
                       </small>
+           </if>
 		<if @communities.admin_p@ eq 1>
                   &nbsp; <small>
                            <a href="@communities.url@one-community-admin">#dotlrn.administer_link#</a>
Index: openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl	29 Jun 2004 10:18:00 -0000	1.12
+++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl	24 Jul 2004 08:34:10 -0000	1.13
@@ -35,6 +35,10 @@
 set user_id [ad_conn user_id]
 set user_can_browse_p [dotlrn::user_can_browse_p -user_id $user_id]
 
+set show_drop_button_p [parameter::get_from_package_key \
+                               -package_key dotlrn-portlet \
+			       -parameter AllowMembersDropGroups]
+
 if { $show_archived_p } {
     set archived_clause ""
 } else {
Index: openacs-4/packages/dotlrn/www/dotlrn-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master.adp,v
diff -u -r1.36 -r1.37
--- openacs-4/packages/dotlrn/www/dotlrn-master.adp	12 Jul 2004 14:49:56 -0000	1.36
+++ openacs-4/packages/dotlrn/www/dotlrn-master.adp	24 Jul 2004 08:34:10 -0000	1.37
@@ -1,29 +1,117 @@
-<master src="/www/site-master">
-  <property name="header_stuff">
-    <link rel="stylesheet" type="text/css" href="/resources/dotlrn/dotlrn-master.css" media="all">
-    <link rel="stylesheet" type="text/css" href="/resources/calendar/calendar.css" media="all">
-    @header_stuff;noquote@
-  </property>
-  <if @context@ not nil><property name="context">@context;noquote@</property></if>
-    <else><if @context_bar@ not nil><property name="context_bar">@context_bar;noquote@</property></if></else>
-  <if @focus@ not nil><property name="focus">@focus;noquote@</property></if>
-  <if @doc_type@ not nil><property name="doc_type">@doc_type;noquote@</property></if>
-  <if @title@ not nil><property name="title">@title;noquote@</property></if>
+<master src="/www/blank-master">
+<%
 
-<if @navbar@ not nil>@navbar;noquote@</if>
+    #  Copyright (C) 2001, 2002 MIT
+    #
+    #  This file is part of dotLRN.
+    #
+    #  dotLRN is free software; you can redistribute it and/or modify it under the
+    #  terms of the GNU General Public License as published by the Free Software
+    #  Foundation; either version 2 of the License, or (at your option) any later
+    #  version.
+    #
+    #  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
+    #  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    #  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+    #  details.
 
-<div id="page-body">
-  <if @title@ not nil>
-    <h1 class="page-title">@title;noquote@</h1>
+
+    # /www/dotlrn-default-master.adp
+    #
+    # This is the 'default-master' template for dotlrn sites. 
+    # 
+    # Author: Arjun Sanyal (arjun@openforce.net), yon@openforce.net
+    #
+    # $Id$
+
+
+%>    
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+
+<title>@title@</title>
+<link rel="stylesheet" type="text/css" href="/resources/acs-templating/lists.css" media="all">
+<link rel="stylesheet" type="text/css" href="/resources/acs-templating/forms.css" media="all">
+<link rel="stylesheet" type="text/css" href="/resources/dotlrn/dotlrn-master.css" media="all">
+@header_stuff;noquote@
+</head>
+<body<multiple name=attribute> @attribute.key@="@attribute.value@"</multiple>>
+
+  <!-- Header Begin -->
+
+  <table width="100%" cellpadding=0 cellspacing=0> 
+   <tr>
+      <td class="header-logo">
+        <a href="@dotlrn_url@/?">
+        <img class="header-img" border="0" src="@header_img_url@" alt="@header_img_alt_text@"></a>
+      </td>
+
+      <td>@text;noquote@</td>
+
+      <td align="right" class="header-text">
+        @user_name@
+      </td>
+    </tr>
+    <tr>
+
+      <td colspan=3 class="header-buttons" align="right" valign="bottom">
+        <a href="@dotlrn_url@/?">#dotlrn.user_portal_page_home_title#</a>
+        <img class="header-img" src="/resources/dotlrn/spacer.gif" height="1" width="10">
+        <a href="@help_url@">#dotlrn.help#</a>
+        <img class="header-img" src="/resources/dotlrn/spacer.gif" height="1" width="10">
+        <a href="/register/logout">#dotlrn.logout#</a>
+      </td>
+  
+    </tr>
+
+  <tr><td colspan=3 class="dark-line" height="1"><img src="/resources/dotlrn/spacer.gif"></td></tr>
+
+  <if @in_dotlrn_p@ true>  
+      <!-- navbars on every page -->
+    <tr><td colspan=3 valign=top>@navbar;noquote@</td></tr>
+    </table>
+    <p>
+    <p>
   </if>
+  <else>
+    </table>
+    <h1>@title@</h1>
+    <if @context_bar@ not nil>
+      <p>@context_bar;noquote@</p>
+    </if>
+  </else>
 
+    <!-- Header End -->
+
   <slave>
-  <div style="clear: both;"></div>
-</div>
 
-<if @navbar@ not nil>@navbar;noquote@</if>
+  <if @curriculum_bar_p@ true>
+    <p><include src="/packages/curriculum/lib/bar" />
+  </if>
 
-<div class="footer">
-  <a href="http://www.dotlrn.org">.LRN Home</a> |
-  <a href="http://www.openacs.org/projects/dotlrn">.LRN Project Central</a>
-</div>
+  <!-- Footer Begin: dotLRN info links -->
+
+  <table width="100%" border="0" cellpadding="0" cellspacing="0" style="clear: both;">
+    <tr><td><small>@navbar;noquote@</small></td></tr>
+    <tr><td colspan=3 class="dark-line" height="1"><img src="/resources/dotlrn/spacer.gif"></td></tr>
+  </table>
+
+  <!-- Footer End -->
+
+  <p>
+    <div class="footer">
+      <a href="http://www.dotlrn.org">dotLRN Home</a> | 
+      <a href="http://www.openacs.org/projects/dotlrn">dotLRN Project Central</a> | 
+      <a href="@change_locale_url@">#dotlrn.Change_Locale#</a>
+      <if @lang_admin_p@ true>| <a href="@toggle_translator_mode_url@">Toggle translator mode</a></if>
+    </div>
+    <div class="footer">@ds_link;noquote@</div>
+  </p>
+
+  <p>
+    <include src="/packages/acs-lang/lib/messages-to-translate">
+  </p>
+</body>
+</html>
Index: openacs-4/packages/dotlrn/www/dotlrn-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master.tcl,v
diff -u -r1.32 -r1.33
--- openacs-4/packages/dotlrn/www/dotlrn-master.tcl	12 Jul 2004 14:49:56 -0000	1.32
+++ openacs-4/packages/dotlrn/www/dotlrn-master.tcl	24 Jul 2004 08:34:10 -0000	1.33
@@ -65,6 +65,7 @@
 set header_img_file "[acs_root_dir]/packages/dotlrn/www/resources/logo"
 set header_img_alt_text "Header Logo"
 
+set extra_spaces "<img src=\"/resources/dotlrn/spacer.gif\" border=0 width=15>"
 set td_align "align=\"center\" valign=\"top\""
 
 if {[dotlrn::user_p -user_id $user_id]} {
@@ -300,18 +301,33 @@
 }
 
 if { $make_navbar_p } {
+    if {$link_control_panel} {
+	set link_control_panel 1
+    } else {
+	set link_control_panel 0
+    }
+    set extra_spaces "<img src=\"/resources/dotlrn/spacer.gif\" border=0 width=15>"    
     set navbar [dotlrn::portal_navbar \
-                    -user_id $user_id \
-                    -link_control_panel [template::util::is_true $link_control_panel] \
-                    -control_panel_text $control_panel_text \
-                    -link_all $link_all]
+        -user_id $user_id \
+        -link_control_panel $link_control_panel \
+        -control_panel_text $control_panel_text \
+	-pre_html "$extra_spaces" \
+	-post_html $extra_spaces \
+        -link_all $link_all
+    ]
+} else {
+    set navbar "<br>"
 }
 
 
 if { ![info exists header_stuff] } {
     set header_stuff ""
 }
 
+if { [info exists text] } {
+    set text [lang::util::localize $text]
+}
+
 # This style sheet should be moved over to an external file for performance
 append header_stuff "
 <STYLE TYPE=\"text/css\">
@@ -338,6 +354,7 @@
 .header-text {
     FONT-SIZE: $header_font_size; 
     BACKGROUND: white; 
+    WIDTH: 100px; 
     COLOR: $header_font_color; 
     FONT-FAMILY: $header_font;
     WHITE-SPACE: nowrap;
@@ -489,3 +506,61 @@
 
 "
 
+# Focus
+multirow create attribute key value
+
+if { ![template::util::is_nil focus] } {
+    # Handle elements wohse name contains a dot
+    if { [regexp {^([^.]*)\.(.*)$} $focus match form_name element_name] } {
+
+        # Add safety code to test that the element exists '
+        set header_stuff "$header_stuff
+          <script language=\"JavaScript\">
+            function acs_focus( form_name, element_name ){
+                if (document.forms == null) return;
+                if (document.forms\[form_name\] == null) return;
+                if (document.forms\[form_name\].elements\[element_name\] == null) return;
+                if (document.forms\[form_name\].elements\[element_name\].type == 'hidden') return;
+
+                document.forms\[form_name\].elements\[element_name\].focus();
+            }
+          </script>
+        "
+        
+        template::multirow append \
+                attribute onload "javascript:acs_focus('${form_name}', '${element_name}')"
+    }
+}
+
+# Developer-support support
+set ds_enabled_p [parameter::get_from_package_key \
+    -package_key acs-developer-support \
+    -parameter EnabledOnStartupP \
+    -default 0
+]
+
+if {$ds_enabled_p} {
+    set ds_link [ds_link]
+} else {
+    set ds_link {}
+}
+
+set change_locale_url "/acs-lang/?[export_vars { { package_id "[ad_conn package_id]" } }]"
+
+# Hack for title and context bar outside of dotlrn
+
+set in_dotlrn_p [expr [string match "[dotlrn::get_url]/*" [ad_conn url]]]
+
+if { [info exists context] } {
+    set context_bar [eval ad_context_bar $context]
+}
+
+set acs_lang_url [apm_package_url_from_key "acs-lang"]
+set lang_admin_p [permission::permission_p \
+                      -object_id [site_node::get_element -url $acs_lang_url -element object_id] \
+                      -privilege admin \
+                      -party_id [ad_conn untrusted_user_id]]
+set toggle_translator_mode_url [export_vars -base "${acs_lang_url}admin/translator-mode-toggle" { { return_url [ad_return_url] } }]
+
+# Curriculum bar
+set curriculum_bar_p [llength [site_node::get_children -all -filters { package_key "curriculum" } -node_id $community_id]]
Index: openacs-4/packages/dotlrn/www/join-policy-toggle.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/join-policy-toggle.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/join-policy-toggle.tcl	4 Dec 2002 09:51:04 -0000	1.7
+++ openacs-4/packages/dotlrn/www/join-policy-toggle.tcl	24 Jul 2004 08:34:10 -0000	1.8
@@ -36,6 +36,10 @@
     }
 }
 
+#prevent this page from being called when is not allowed
+# i.e. AllowChangeEnrollmentPolicy
+dotlrn_portlet::is_allowed -parameter cenrollment
+
 if {[empty_string_p $community_id]} {
     set community_id [dotlrn_community::get_community_id]
 }
Index: openacs-4/packages/dotlrn/www/manage-memberships-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/manage-memberships-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/manage-memberships-postgresql.xql	15 Jul 2002 20:12:46 -0000	1.1
+++ openacs-4/packages/dotlrn/www/manage-memberships-postgresql.xql	24 Jul 2004 08:34:10 -0000	1.2
@@ -180,4 +180,15 @@
         </querytext>
     </fullquery>
 
+    <fullquery name="select_non_member_club_ids">
+        <querytext>
+                select f.club_id
+                from dotlrn_clubs_full f
+                where f.join_policy <> 'closed'
+                  and f.club_id not in (select dotlrn_member_rels_full.community_id as club_id
+                                          from dotlrn_member_rels_full
+                                         where dotlrn_member_rels_full.user_id = :user_id)
+        </querytext>
+    </fullquery>
+
 </queryset>
Index: openacs-4/packages/dotlrn/www/member-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-add-2.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/dotlrn/www/member-add-2.tcl	4 Dec 2002 09:51:04 -0000	1.11
+++ openacs-4/packages/dotlrn/www/member-add-2.tcl	24 Jul 2004 08:34:10 -0000	1.12
@@ -28,6 +28,10 @@
     roles:multirow
 }
 
+#prevent this page from being called when it is not allowed
+# i.e.   AllowManageMembership 0
+dotlrn_portlet::is_allowed -parameter managemembership
+
 set community_id [dotlrn_community::get_community_id]
 
 dotlrn::require_user_admin_community -community_id $community_id
Index: openacs-4/packages/dotlrn/www/member-add-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-add-3.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/member-add-3.tcl	4 Dec 2002 09:51:04 -0000	1.7
+++ openacs-4/packages/dotlrn/www/member-add-3.tcl	24 Jul 2004 08:34:10 -0000	1.8
@@ -27,6 +27,10 @@
     {referer "one-community-admin"}
 }
 
+#prevent this page from being called when it is not allowed
+# i.e.   AllowManageMembership 0
+dotlrn_portlet::is_allowed -parameter managemembership
+
 set community_id [dotlrn_community::get_community_id]
 # See if the user is already in the group
 set member_p [dotlrn_community::member_p $community_id $user_id]
Index: openacs-4/packages/dotlrn/www/member-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-add.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn/www/member-add.tcl	4 Dec 2002 09:51:04 -0000	1.9
+++ openacs-4/packages/dotlrn/www/member-add.tcl	24 Jul 2004 08:34:10 -0000	1.10
@@ -26,6 +26,10 @@
     {referer "one-community-admin"}
 }
 
+#prevent this page from being called when it is not allowed
+# i.e.   AllowManageMembership 0
+dotlrn_portlet::is_allowed -parameter managemembership
+
 set search_text [string trim $search_text]
 set community_id [dotlrn_community::get_community_id]
 
Index: openacs-4/packages/dotlrn/www/members.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members.tcl,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/dotlrn/www/members.tcl	12 Jul 2004 14:49:56 -0000	1.20
+++ openacs-4/packages/dotlrn/www/members.tcl	24 Jul 2004 08:34:10 -0000	1.21
@@ -30,6 +30,10 @@
     ad_returnredirect "[dotlrn::get_url]"
 }
 
+#prevent this page from being called when it is not allowed
+# i.e.   AllowManageMembership 0
+dotlrn_portlet::is_allowed -parameter managemembership
+
 set context [list [list "one-community-admin" [_ dotlrn.Admin]] [_ dotlrn.Manage_Members]]
 set community_id [dotlrn_community::get_community_id]
 set portal_id [dotlrn_community::get_portal_id -community_id $community_id]
Index: openacs-4/packages/dotlrn/www/one-community-portal-configure.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-portal-configure.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/one-community-portal-configure.tcl	12 Jul 2004 14:49:56 -0000	1.7
+++ openacs-4/packages/dotlrn/www/one-community-portal-configure.tcl	24 Jul 2004 08:34:10 -0000	1.8
@@ -27,6 +27,10 @@
     {referer "one-community-admin"}
 }
 
+#prevent this page from being called when it is not allowed
+# i.e.   AllowCustomizePortalLayout 0
+dotlrn_portlet::is_allowed -parameter cplayout
+
 set community_id [dotlrn_community::get_community_id]
 
 dotlrn::require_user_admin_community \
@@ -38,30 +42,6 @@
 # we are in a community
 set community_name [dotlrn_community::get_community_name $community_id]
 
-set default_portal_p [db_string default_portal_p {
-    select count(*) from dotlrn_portal_types_map where portal_id = :portal_id
-}]
-
-
-if {$default_portal_p == 1} {
-    # Create comm's portal page
-    set portal_id [portal::create \
-		       -template_id $portal_id \
-		       -name "$community_name Portal" \
-		       -context_id $community_id \
-		       [ad_conn user_id] \
-		      ]
-    
-    db_exec_plsql update_commuity_portal_id {
-	update dotlrn_communities_all 
-	set portal_id = :portal_id
-	where community_id = :community_id
-    }
-    
-    util_memoize_flush "dotlrn_community::get_portal_id_not_cached -community_id $community_id"    
-}
-
-
 set rendered_page [portal::configure \
     -allow_theme_change_p 1 \
     [dotlrn_community::get_portal_id] \
Index: openacs-4/packages/dotlrn/www/spam-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam-2.adp,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/dotlrn/www/spam-2.adp	13 Nov 2003 22:25:51 -0000	1.14
+++ openacs-4/packages/dotlrn/www/spam-2.adp	24 Jul 2004 08:34:10 -0000	1.15
@@ -21,18 +21,18 @@
 <property name="context_bar">@context_bar@</property>
 
 <p>
- #dotlrn.lt_Are_you_sure_you_want_1#?
+ #dotlrn.lt_Are_you_sure_you_want_to_send#?
 </p>
 
-<if @message_type@ eq "html">
+<if @format@ eq "text/html">
   <table class="z_dark" bgcolor="#eeeeee" width="95%" cellpadding="3" cellspacing="3">
     <tr>
       <td width="10%">#dotlrn.Subject#</td>
       <td><pre>@subject@</pre></td>
     </tr>
     <tr>
       <td>#dotlrn.Message#</td>
-      <td>@preview_message;noquote@ </td>
+      <td>@preview_message;noquote@</td>
     </tr>
   </table>
 </if>
@@ -44,7 +44,7 @@
     </tr>
     <tr>
       <td>#dotlrn.Message#</td>
-      <td><%=[ad_text_to_html -no_quote "$preview_message"]%></td>
+      <td>@preview_message;noquote@</td>
     </tr>
   </table>
 </else>
Index: openacs-4/packages/dotlrn/www/spam-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam-2.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/spam-2.tcl	4 Dec 2002 09:51:04 -0000	1.6
+++ openacs-4/packages/dotlrn/www/spam-2.tcl	24 Jul 2004 08:34:10 -0000	1.7
@@ -24,25 +24,29 @@
 } -properties {
     subject:onevalue
     message:onevalue
+    format:onevalue
     spam_name:onevalue
     context_bar:onevalue
     community_id:onevalue
     portal_id:onevalue
 }
 
-form get_values spam_message subject message message_type
+form get_values spam_message subject message
 
+set content [string trimright [template::util::richtext::get_property contents $message]]
+set format [string trimright [template::util::richtext::get_property format $message]]
+
 # the following is just to make sure the previewing works ok.
 # in case the user types a html message and chooses the messsage 
 # to be a plain text type or vice-versa.
-if {$message_type == "html"} {
-	if [ad_looks_like_html_p $message] {
-	     set preview_message "<pre>$message</pre>"
+if {$format == "text/html"} {
+	if [ad_looks_like_html_p $content] {
+	     set preview_message "<pre>$content</pre>"
            } else {
-	     set preview_message "$message"
+	     set preview_message "$content"
         }
 } else {
-	set preview_message [ad_quotehtml $message]
+	set preview_message [ad_quotehtml $content]
 }
 
 set context_bar [list [list $referer Admin] "[_ dotlrn.Spam_Community]"]
Index: openacs-4/packages/dotlrn/www/spam-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/spam-oracle.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/spam-oracle.xql	29 Jun 2004 10:18:03 -0000	1.3
+++ openacs-4/packages/dotlrn/www/spam-oracle.xql	24 Jul 2004 08:34:10 -0000	1.4
@@ -31,22 +31,22 @@
                       '') as last_name,
                '$safe_community_name' as community_name,
                '$community_url' as community_url
-            from party_approved_member_map,
+            from acs_rels,
                  parties,
                  acs_objects
-            where party_approved_member_map.party_id = $segment_id
-            and party_approved_member_map.member_id <> $segment_id
-            and party_approved_member_map.member_id = parties.party_id
-            and parties.party_id = acs_objects.object_id
+            where (acs_rels.object_id_one = $community_id
+            and acs_rels.object_id_two = parties.party_id
+            and (acs_rels.rel_type in ('$rel_types_str')
+	         or acs_rels.object_id_two in ($recipients_str))
+	    and parties.party_id = acs_objects.object_id
             and parties.party_id in (select acs_rels.object_id_two  
                                      from acs_rels, membership_rels
                                      where acs_rels.object_id_one = 
                                         acs.magic_object_id('registered_users')
                                      and acs_rels.rel_id = 
                                         membership_rels.rel_id
                                      and membership_rels.member_state 
-                                        = 'approved')
-            $extra_where_clause
+                                        = 'approved')) 
         </querytext>
     </fullquery>
 
Index: openacs-4/packages/dotlrn/www/spam-recipients.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam-recipients.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/spam-recipients.adp	29 Jun 2004 10:18:03 -0000	1.2
+++ openacs-4/packages/dotlrn/www/spam-recipients.adp	24 Jul 2004 08:34:10 -0000	1.3
@@ -27,8 +27,15 @@
 
 <form method="post" action="spam">
 <p>
+
+Send to the following roles: <p>
+
+@rel_types_html;noquote@
 <input type=checkbox name=spam_all> #dotlrn.Send_to_all#
 <p>
+
+In addition, send to the following people:<p>
+
 <table  width="85%" class="table-display" cellpadding="5" cellspacing="0">
     <tr class="table-header">
       <td>&nbsp;</td>
Index: openacs-4/packages/dotlrn/www/spam-recipients.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam-recipients.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/spam-recipients.tcl	29 Jun 2004 10:18:03 -0000	1.2
+++ openacs-4/packages/dotlrn/www/spam-recipients.tcl	24 Jul 2004 08:34:10 -0000	1.3
@@ -29,7 +29,27 @@
     set read_private_data_p 1
 }
 
+
 set community_id [dotlrn_community::get_community_id]
+
+#element create spam_message rel_type \
+#    -label [_ dotlrn.To] \
+#    -datatype text \
+ #   -widget select \
+ #   -options [list [list [_ dotlrn.Members] dotlrn_member_rel] [list [_ dotlrn.Administrators] dotlrn_admin_rel]] \
+ #   -value $rel_type
+
+
+# SET THE PROPERTIES RIGHT
+
+set roles [dotlrn_community::get_roles -community_id $community_id]
+set rel_types_html ""
+
+foreach {rel_type role pretty_name pretty_plural} [eval concat $roles] {
+    append rel_types_html "<input type=checkbox value=$rel_type name=rel_types>  [lang::util::localize $pretty_plural] <br>"
+
+}
+
 db_multirow current_members select_current_members {}
 
 set exported_vars [export_vars -form { referer }]
Index: openacs-4/packages/dotlrn/www/spam-recipients.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam-recipients.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/spam-recipients.xql	29 Jun 2004 10:18:03 -0000	1.2
+++ openacs-4/packages/dotlrn/www/spam-recipients.xql	24 Jul 2004 08:34:10 -0000	1.3
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 
 <queryset>
-    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
     <fullquery name="select_current_members">
         <querytext>
Index: openacs-4/packages/dotlrn/www/spam.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam.tcl,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/dotlrn/www/spam.tcl	29 Jun 2004 10:18:03 -0000	1.22
+++ openacs-4/packages/dotlrn/www/spam.tcl	24 Jul 2004 08:34:10 -0000	1.23
@@ -22,7 +22,8 @@
     {recipients:integer,multiple ""}
     {recipients_str ""}
     {community_id ""}
-    {rel_type "dotlrn_member_rel"}
+    {rel_types:multiple "" }
+    {rel_types_str ""}
     {referer "control-panel"}
     {spam_all 0}
 } -validate {
@@ -36,6 +37,11 @@
         set recipients [split $recipients_str]
       }
     }
+    rel_types_split {
+      if { [info exists rel_types_str] && ![info exists rel_types] } {
+        set rel_types [split $rel_types_str]
+      }
+  }
 } -properties {
     context_bar:onevalue
     portal_id:onevalue
@@ -61,7 +67,6 @@
 set sender_first_names [db_quote $sender_first_names]
 set sender_last_name [db_quote $sender_last_name]
 
-
 form create spam_message
 
 element create spam_message community_id \
@@ -77,13 +82,6 @@
     -html {size 60} \
     -value $sender_email
 
-element create spam_message rel_type \
-    -label [_ dotlrn.To] \
-    -datatype text \
-    -widget select \
-    -options [list [list [_ dotlrn.Members] dotlrn_member_rel] [list [_ dotlrn.Administrators] dotlrn_admin_rel]] \
-    -value $rel_type
-
 element create spam_message subject \
     -label [_ dotlrn.Subject] \
     -datatype text \
@@ -92,17 +90,10 @@
 
 element create spam_message message \
     -label [_ dotlrn.Message] \
-    -datatype text \
-    -widget textarea \
+    -datatype richtext \
+    -widget richtext \
     -html {rows 10 cols 80 wrap soft}
 
-element create spam_message message_type \
-    -label "[_ dotlrn.Message_Type]" \
-    -datatype text \
-    -widget select \
-    -options [list [list [_ dotlrn.Plain_Text] "text"] [list [_ dotlrn.HTML] "html"]] \
-    -value "text"
-
 element create spam_message send_date \
     -label [_ dotlrn.Send_Date] \
     -datatype date \
@@ -122,6 +113,12 @@
     -widget hidden \
     -value $recipients
 
+element create spam_message rel_types_str \
+    -label rel_types \
+    -datatype text \
+    -widget hidden \
+    -value $rel_types
+
 element create spam_message spam_all \
     -label spam \
     -datatype text \
@@ -130,32 +127,60 @@
 
 if {[ns_queryexists "form:confirm"]} {
     form get_values spam_message \
-        community_id from rel_type subject message message_type send_date referer recipients_str spam_all
+        community_id from rel_types_str subject message send_date referer recipients_str spam_all
 
-    set segment_id [db_string select_rel_segment_id {}]
+    set content [string trimright [template::util::richtext::get_property contents $message]]
+    set format [string trimright [template::util::richtext::get_property format $message]]
+
     set community_name [dotlrn_community::get_community_name $community_id]
     set community_url "[ad_parameter -package_id [ad_acs_kernel_id] SystemURL][dotlrn_community::get_community_url $community_id]"
+
     set recipients_str [join [split $recipients_str] ,]
+    set rel_types_str [join [split $rel_types_str] ',']
 
+
+
+# POSTGRES - change to plural
+# TODO - what if no rel_types
+
     set safe_community_name [db_quote $community_name]
 
+    set extra_where_clause ""
+
     if { $spam_all } {
-      set extra_where_clause ""
-    } else {
-      set extra_where_clause "and parties.party_id in ($recipients_str)"
+	# if there is a spam_all, choose all the rel_types!
+
+	set rel_types_str [join [db_list select_rel_segments "
+            select rel_segments.rel_type
+            from rel_segments
+            where rel_segments.group_id = :community_id"] ',']
+    } 
+
+    if {[empty_string_p $recipients_str]} {
+	set recipients_str ''
     }
+
+
     set query [db_map sender_info]
 
-ns_log notice "query: $query"
+    # TO DO CHANGE THE ORACLE QUERY
+    
+    ns_log notice "query: $query"
 
+    if {$format == "text/html"} {
+	set bulk_format "html"
+    } else {
+	set bulk_format "text"
+    }
+
     bulk_mail::new \
         -package_id [site_node_apm_integration::get_child_package_id -package_key [bulk_mail::package_key]] \
         -send_date [template::util::date::get_property linear_date $send_date] \
         -date_format "YYYY MM DD HH24 MI SS" \
         -from_addr $from \
         -subject "\[$community_name\] $subject" \
-        -message $message \
-        -message_type $message_type \
+        -message $content \
+        -message_type $bulk_format \
         -query $query
 
     ad_returnredirect $referer
Index: openacs-4/packages/dotlrn/www/spam.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam.xql,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/spam.xql	15 May 2002 22:13:57 -0000	1.7
+++ openacs-4/packages/dotlrn/www/spam.xql	24 Jul 2004 08:34:10 -0000	1.8
@@ -14,12 +14,12 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="select_rel_segment_id">
+    <fullquery name="select_rel_segment_ids">
         <querytext>
             select rel_segments.segment_id
             from rel_segments
             where rel_segments.group_id = :community_id
-            and rel_segments.rel_type = :rel_type
+            and rel_segments.rel_type in (:rel_types_str)
         </querytext>
     </fullquery>
 
Index: openacs-4/packages/dotlrn/www/user-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/user-add-2.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/dotlrn/www/user-add-2.tcl	29 Jun 2004 10:18:03 -0000	1.10
+++ openacs-4/packages/dotlrn/www/user-add-2.tcl	24 Jul 2004 08:34:10 -0000	1.11
@@ -42,6 +42,11 @@
     administration_name:onevalue
 }
 
+#prevent this page from being called when it is not allowed
+# i.e.   AllowCreateGuestUsersInCommunity 0
+dotlrn_portlet::is_allowed -parameter guestuser
+dotlrn_portlet::is_allowed -parameter limiteduser
+
 # Get user info
 acs_user::get -user_id $user_id -array user
 # easier to work with scalar vars than array
Index: openacs-4/packages/dotlrn/www/user-add-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/user-add-3.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/user-add-3.tcl	12 Nov 2002 08:44:05 -0000	1.6
+++ openacs-4/packages/dotlrn/www/user-add-3.tcl	24 Jul 2004 08:34:10 -0000	1.7
@@ -26,6 +26,11 @@
     {referer "/acs-admin/users"}
 }
 
+#prevent this page from being called when it is not allowed
+# i.e.   AllowCreateGuestUsersInCommunity 0
+dotlrn_portlet::is_allowed -parameter guestuser
+dotlrn_portlet::is_allowed -parameter limiteduser
+
 set admin_user_id [ad_verify_and_get_user_id]
 set admin_email [db_string select_admin_email {
     select email
Index: openacs-4/packages/dotlrn/www/user-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/user-add.tcl,v
diff -u -r1.30 -r1.31
--- openacs-4/packages/dotlrn/www/user-add.tcl	20 Apr 2004 21:13:20 -0000	1.30
+++ openacs-4/packages/dotlrn/www/user-add.tcl	24 Jul 2004 08:34:10 -0000	1.31
@@ -32,6 +32,12 @@
 } -properties {
     context_bar:onevalue
 }
+
+#prevent this page from being called when it is not allowed
+# i.e.   AllowCreateGuestUsersInCommunity 0
+dotlrn_portlet::is_allowed -parameter guestuser
+dotlrn_portlet::is_allowed -parameter limiteduser
+
 # Set read_private_data_p and can_browse_p to me the most restrictive defaults.
 
 set current_user_id [ad_maybe_redirect_for_registration]
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/admin-add-2.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/admin-add-2.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/admin-add-oracle.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/admin-add-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/admin-add.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/admin-add.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/admin-remove.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
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.2 -r1.3
--- openacs-4/packages/dotlrn/www/admin/archived-communities-postgresql.xql	29 Jun 2004 10:18:04 -0000	1.2
+++ openacs-4/packages/dotlrn/www/admin/archived-communities-postgresql.xql	24 Jul 2004 08:34:12 -0000	1.3
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+    <rdbms><type>postgres</type><version>7.2</version></rdbms>
 
     <!-- AEG: This query has gotten pretty nasty.  Basically we need
          to provide the site-wide admin more information about
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.5 -r1.6
--- openacs-4/packages/dotlrn/www/admin/archived-communities.adp	29 Jun 2004 10:18:04 -0000	1.5
+++ openacs-4/packages/dotlrn/www/admin/archived-communities.adp	24 Jul 2004 08:34:12 -0000	1.6
@@ -38,16 +38,14 @@
   <tr class="even">
 </else>
     <td>
-      <if @archived_comms.parent_community_id@ not eq ""><a href="@archived_comm
-s.parent_url@">@archived_comms.parent_pretty_name@</a></if>
+      <if @archived_comms.parent_community_id@ not eq ""><a href="@archived_comms.parent_url@">@archived_comms.parent_pretty_name@</a></if>
     </td>
     <td>
       <a href="@archived_comms.url@">@archived_comms.pretty_name@</a></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>
+        <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>
   </tr>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/dotlrn-admins.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/dotlrn-admins.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/dotlrn-admins.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/dotlrn/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/index.adp,v
diff -u -r1.24 -r1.25
--- openacs-4/packages/dotlrn/www/admin/index.adp	29 Oct 2003 14:23:52 -0000	1.24
+++ openacs-4/packages/dotlrn/www/admin/index.adp	24 Jul 2004 08:34:12 -0000	1.25
@@ -29,6 +29,7 @@
 <property name="context_bar">@context_bar@</property>
 
 <ul>
+  <li><a href="dotlrn-admins">#dotlrn.Administrators#</a></li> 
   <li><a href="users">#dotlrn.users#</a></li>
   <li><a href="terms">#dotlrn.terms#</a></li>
   <li><a href="departments"><%= [parameter::get -localize -parameter departments_pretty_plural] %></a></li>
@@ -39,8 +40,11 @@
   <li><a href="archived-communities">#dotlrn.archived_classes_and_communities#</a></li>
   <li><a href="edit-preapproved-emails">#dotlrn.edit_approved_email_servers#</a></li>
   <li><a href="@parameters_url@">#dotlrn.edit_parameters#</a></li>
+  <li><a href="@parameters_d_url@">#dotlrn.edit_community_parameters#</a></li>
   <p>
+  <if @oacs_site_wide_admin_p@ true>
     <li><a href="/acs-admin/">OpenACS Site-Wide Administration</a></li>
+  </if>
   </p>
 </ul>
 
Index: openacs-4/packages/dotlrn/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/index.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/dotlrn/www/admin/index.tcl	29 Oct 2003 14:23:52 -0000	1.15
+++ openacs-4/packages/dotlrn/www/admin/index.tcl	24 Jul 2004 08:34:12 -0000	1.16
@@ -21,6 +21,8 @@
     @creation-date 2001-11-04
 }
 
+set oacs_site_wide_admin_p [acs_user::site_wide_admin_p]
+
 set admin_pretty_name [parameter::get -localize -parameter dotlrn_admin_pretty_name]
 set context_bar {}
 
@@ -30,4 +32,6 @@
 
 set parameters_url [export_vars -base /shared/parameters { { package_id {[dotlrn::get_package_id]} } { return_url [ad_return_url] } }] 
 
+set parameters_d_url [export_vars -base /shared/parameters { { package_id {[apm_package_id_from_key dotlrn-portlet]} } { return_url [ad_return_url] } }]
+
 ad_return_template
Index: openacs-4/packages/dotlrn/www/admin/site-wide-admin-toggle.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/site-wide-admin-toggle.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/dotlrn/www/admin/site-wide-admin-toggle.tcl	29 May 2003 18:05:01 -0000	1.8
+++ openacs-4/packages/dotlrn/www/admin/site-wide-admin-toggle.tcl	24 Jul 2004 08:34:12 -0000	1.9
@@ -26,6 +26,15 @@
     {referer "users"}
 }
 
+if { ![acs_user::site_wide_admin_p] } {
+             ns_log notice "user has tried to site-wide-admin-toggle  without permission"
+        ad_return_forbidden \
+               "Permission Denied" \
+               "<blockquote>
+                You don't have permission to see this page.
+               </blockquote>"
+}
+
 if {[string equal $value "grant"] == 1} {
     ad_permission_grant $user_id [acs_magic_object "security_context_root"] "admin"
 } elseif {[string equal $value "revoke"] == 1} {
Index: openacs-4/packages/dotlrn/www/admin/user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user.adp,v
diff -u -r1.27 -r1.28
--- openacs-4/packages/dotlrn/www/admin/user.adp	29 Jun 2004 10:18:06 -0000	1.27
+++ openacs-4/packages/dotlrn/www/admin/user.adp	24 Jul 2004 08:34:12 -0000	1.28
@@ -29,19 +29,25 @@
   <li>
     #dotlrn.Person_name#
     @first_names@ @last_name@
+  <if @oacs_site_wide_admin_p@ true> 
     [<small> <a href="/user/basic-info-update?@export_edit_vars@">#dotlrn.Edit#</a> </small>]
+  </if>
   </li>
 
   <li>
     #dotlrn.Email#
     <a href="mailto:@email@">@email@</a>
+  <if @oacs_site_wide_admin_p@ true>
     [<small> <a href="/user/basic-info-update?@export_edit_vars@">#dotlrn.Edit#</a> </small>]
+  </if> 
   </li>
 
   <li>
     #dotlrn.Screen_name#
     @screen_name@
+  <if @oacs_site_wide_admin_p@ true>
     [<small> <a href="/user/basic-info-update?@export_edit_vars@">#dotlrn.Edit#</a> </small>]
+  </if>
   </li>
 
   <li>
@@ -70,7 +76,9 @@
   <li>
     #dotlrn.Member_state#
     @member_state@
+  <if @oacs_site_wide_admin_p@ true> 
     @change_state_links;noquote@
+  </if>
   </li>
 
 </ul>
@@ -181,16 +189,8 @@
   <if @portrait_p@>
     <li><a href="/user/portrait/index.tcl?@export_edit_vars@">#dotlrn.lt_Manage_this_users_por#</a></li>
   </if>
-  <li>    
-  <if @dotlrn_user_p@>
-    <if @site_wide_admin_p@>
-      #dotlrn.lt_This_user_is_a_site-w# 
-      (<a href="site-wide-admin-toggle?user_id=@user_id@&value=revoke&referer=@return_url@">#dotlrn.revoke#</a>)
-    </if>
-    <else>
-      <a href="site-wide-admin-toggle?user_id=@user_id@&value=grant&referer=@return_url@">
-      #dotlrn.lt_Make_this_user_a_site#</a>
-    </else>
-  </if>
+
+ <if @oacs_site_wide_admin_p@ true>
   <li><a href="/acs-admin/users/become?user_id=@user_id@">#dotlrn.Become_this_user#</a></li>
+ </if> 
 </ul>
Index: openacs-4/packages/dotlrn/www/admin/user.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user.tcl,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/dotlrn/www/admin/user.tcl	29 Jun 2004 10:18:06 -0000	1.17
+++ openacs-4/packages/dotlrn/www/admin/user.tcl	24 Jul 2004 08:34:12 -0000	1.18
@@ -41,6 +41,8 @@
     member_clubs:multirow
 }
 
+set oacs_site_wide_admin_p [acs_user::site_wide_admin_p]
+
 set return_url "[ad_parameter -package_id [ad_acs_kernel_id] CommunityMemberAdminURL]?user_id=$user_id"
 set export_edit_vars "user_id=$user_id&return_url=$return_url"
 
Index: openacs-4/packages/dotlrn/www/admin/users-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk.adp,v
diff -u -r1.23 -r1.24
--- openacs-4/packages/dotlrn/www/admin/users-chunk.adp	20 Apr 2004 21:13:22 -0000	1.23
+++ openacs-4/packages/dotlrn/www/admin/users-chunk.adp	24 Jul 2004 08:34:12 -0000	1.24
@@ -44,7 +44,9 @@
     <else>
     <th align="left">#dotlrn.Access#</th>
     <th align="left">#dotlrn.Guest#</th>
+    <if @oacs_site_wide_admin_p@ true>
     <th align="left">#dotlrn.Site-wide_Admin#</th>
+    </if>
     </else>
   </tr>
 
@@ -72,8 +74,11 @@
     </td>
 <if @type@ eq "pending">
     <td align="left">
+
+    <if @oacs_site_wide_admin_p@ true>
     <% # We had to escape to Tcl to get the desired behavior. AG %>
-    <small><a href="/acs-admin/users/member-state-change?user_id=@users.user_id@&member_state=approved&return_url=<%= [ns_urlencode [dotlrn::get_admin_url]/user-new-2?user_id=$users(user_id)&referer=$referer] %>">#dotlrn.lt_approve_and_add_to_do#</a> | <a href="user-nuke?user_id=@users.user_id@&referer=@referer@">#acs-kernel.common_delete#</small>
+    <small><a href="/acs-admin/users/member-state-change?user_id=@users.user_id@&member_state=approved&return_url=<%= [ns_urlencode [dotlrn::get_admin_url]/user-new-2?user_id=$users(user_id)&referer=$referer] %>">#dotlrn.lt_approve_and_add_to_do#</a> | </if>
+    <a href="user-nuke?user_id=@users.user_id@&referer=@referer@">#acs-kernel.common_delete#</small>
     </td>
 </if>
 <else>
@@ -86,7 +91,9 @@
      <if @users.guest_p@ eq t>#dotlrn.Yes#</if><else>#dotlrn.No#</else>
      </else>
     </td>
-    <td align="center">
+
+<if @oacs_site_wide_admin_p@ true>
+ <td align="center">
   <if @user_id@ ne @users.user_id@>
     <if @users.site_wide_admin_p@ true>
       <b>#dotlrn.Yes#</b> | <a href="site-wide-admin-toggle?user_id=@users.user_id@&value=revoke&referer=@referer@" title="#dotlrn.Revoke_site_wide_admin#">#dotlrn.No#</a>
@@ -97,6 +104,7 @@
   </if>
       <else>#dotlrn.Yes#</else>
     </td>
+</if>
 </else>
   </tr>
 
Index: openacs-4/packages/dotlrn/www/admin/users-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/dotlrn/www/admin/users-chunk.tcl	23 Oct 2002 12:38:40 -0000	1.8
+++ openacs-4/packages/dotlrn/www/admin/users-chunk.tcl	24 Jul 2004 08:34:12 -0000	1.9
@@ -24,6 +24,7 @@
     user_id:onevalue
 }
 
+set oacs_site_wide_admin_p [acs_user::site_wide_admin_p]
 set user_id [ad_conn user_id]
 
 if {![exists_and_not_null referer]} {
Index: openacs-4/packages/dotlrn-dotlrn/dotlrn-dotlrn.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-dotlrn/dotlrn-dotlrn.info,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/dotlrn-dotlrn/dotlrn-dotlrn.info	20 Apr 2004 21:13:26 -0000	1.12
+++ openacs-4/packages/dotlrn-dotlrn/dotlrn-dotlrn.info	24 Jul 2004 08:34:14 -0000	1.13
@@ -6,17 +6,20 @@
     <pretty-plural>dotLRN Applets</pretty-plural>
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
-
+    
     <version name="2.0.3" url="http://openacs.org/repository/download/apm/dotlrn-dotlrn-2.0.3.apm">
         <owner url="http://openasc.org">OpenACS</owner>
+        <summary>Helper routines for dotLRN applets</summary>
         <release-date>2004-03-10</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
-        <summary>Helper routines for dotLRN applets</summary>
 
         <provides url="dotlrn-dotlrn" version="2.0.3"/>
         <requires url="dotlrn" version="1.0"/>
         <requires url="dotlrn-portlet" version="0.1a"/>
 
+        <callbacks>
+            <callback type="after-install"  proc="dotlrn_dotlrn::apm::after_install"/>
+        </callbacks>
         <parameters>
         <!-- No version parameters -->
         </parameters>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn-dotlrn/tcl/apm-callback-procs.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl,v
diff -u -r1.88 -r1.89
--- openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl	29 Jun 2004 10:18:08 -0000	1.88
+++ openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl	24 Jul 2004 08:34:15 -0000	1.89
@@ -105,6 +105,7 @@
         set portal_id [dotlrn_community::get_portal_id -community_id $community_id]
         set package_id [dotlrn::instantiate_and_mount $community_id [package_key]]
         set community_name [dotlrn_community::get_community_name $community_id]
+
         set folder_id [fs::get_root_folder -package_id $package_id]
 
         fs::rename_folder -folder_id $folder_id -name "[_ dotlrn-fs.lt_community_names_Files]"
@@ -210,6 +211,17 @@
         #
         # portlet stuff
         #
+
+	# Add the admin portlet
+
+        set admin_portal_id [dotlrn_community::get_admin_portal_id \
+                                 -community_id $community_id
+        ]
+
+        fs_admin_portlet::add_self_to_page \
+            -portal_id $admin_portal_id \
+            -package_id $package_id
+
         
         set args [ns_set create]
         ns_set put $args package_id $package_id
Index: openacs-4/packages/dotlrn-portlet/dotlrn-portlet.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/dotlrn-portlet.info,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/dotlrn-portlet/dotlrn-portlet.info	20 Apr 2004 21:13:33 -0000	1.16
+++ openacs-4/packages/dotlrn-portlet/dotlrn-portlet.info	24 Jul 2004 08:34:16 -0000	1.17
@@ -16,7 +16,17 @@
         <requires url="dotlrn" version="1.0"/>
         <requires url="new-portal" version="0.1a"/>
 
+        <callbacks>
+            <callback type="before-uninstall"  proc="dotlrn_portlet::apm::before_uninstall"/>
+        </callbacks>
         <parameters>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="AllowChangeEnrollmentPolicy"  default="1" description="Does the community admin can change Enrollment Policy?" section_name="Group Administration"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="AllowCreateGuestUsersInCommunity"  default="1" description="Does the community admin can create Limited Guests?" section_name="Group Administration"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="AllowCreateLimitedUsersInCommunity"  default="1" description="Does the community admin can create Limited Users?" section_name="Group Administration"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="AllowCustomizePortalLayout"  default="1" description="Does the community admin can Customize Portal Layout?" section_name="Group Administration"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="AllowManageApplets"  default="1" description="Does the community admin can manage applets?" section_name="Group Administration"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="AllowManageMembership"  default="1" description="Does the community admin can Manage Membership?" section_name="Group Administration"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="AllowMembersDropGroups"  default="1" description="Does user can drop a Group?" section_name="Group Administration"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="dotlrn_admin_portlet_force_region"  default="1" description="the portal region to put the dotlrn admin portlet in"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="dotlrn_portlet_force_region"  default="2" description="the portal region to put the dotlrn portlet on"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="dotlrn_members_staff_portlet_force_region"  default="2" description="the portal region to put the dotlrn members staff portlet"/>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn-portlet/tcl/apm-callback-procs.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/dotlrn-portlet/tcl/dotlrn-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/tcl/dotlrn-portlet-procs.tcl,v
diff -u -r1.34 -r1.35
--- openacs-4/packages/dotlrn-portlet/tcl/dotlrn-portlet-procs.tcl	9 Aug 2002 18:39:29 -0000	1.34
+++ openacs-4/packages/dotlrn-portlet/tcl/dotlrn-portlet-procs.tcl	24 Jul 2004 08:34:16 -0000	1.35
@@ -98,4 +98,92 @@
             -config_list $cf
     }
 
+    ad_proc -public is_allowed {
+	{-parameter:required}
+    } {
+        This is the TCL proc that is called by some Group Administration pages
+        that need to verify a dotlrn-portlet parameter.
+        This prevents bad users to access protected pages.
+
+ 
+        @author Hector Amado (hr_amado@galileo.edu)
+        @creation-date 2004-06-22
+
+    } {
+
+        switch $parameter {
+            "cenrollment" {
+		if { ![parameter::get_from_package_key -package_key dotlrn-portlet -parameter AllowChangeEnrollmentPolicy] } {
+		    if { ![dotlrn::admin_p] } {  
+                ns_log notice "user has tried to see    without permission"
+                ad_return_forbidden \
+                   "Permission Denied"\
+                   "<blockquote>
+                     You don't have permission to see this page.
+                    </blockquote>"
+		    }
+                }
+	    }
+            "managemembership" {
+                if { ![parameter::get_from_package_key -package_key dotlrn-portlet -parameter AllowManageMembership] } {
+     	      if { ![dotlrn::admin_p] } {
+                ns_log notice "user has tried to see /dotlrn/www/members  without permission"
+                ad_return_forbidden \
+                   "Permission Denied"\
+                   "<blockquote>
+                     You don't have permission to see this page.
+                    </blockquote>"
+              }
+             }
+	    }
+            "cplayout" {
+                if { ![parameter::get_from_package_key -package_key dotlrn-portlet -parameter AllowCustomizePortalLayout] } {
+                	 if { ![dotlrn::admin_p] } {
+                ns_log notice "user has tried to see /dotlrn/www/one-community-portal-configure  without permission"
+                ad_return_forbidden \
+                   "Permission Denied"\
+                   "<blockquote>
+                     You don't have permission to see this page.
+                    </blockquote>"
+	       }
+             }
+	    }
+            "guestuser" { 
+                if { ![parameter::get_from_package_key -package_key dotlrn-portlet -parameter AllowCreateGuestUsersInCommunity] } {
+                	 if { ![dotlrn::admin_p] } {
+                ns_log notice "user has tried to see /dotlrn/www/user-add  without permission"
+                ad_return_forbidden \
+                   "Permission Denied"\
+                   "<blockquote>
+                     You don't have permission to see this page.
+                    </blockquote>"
+	       }
+             }
+	    }
+            "limiteduser" {
+                if { ![parameter::get_from_package_key -package_key dotlrn-portlet -parameter AllowCreateLimitedUsersInCommunity] } {
+     	                 if { ![dotlrn::admin_p] } {
+                ns_log notice "user has tried to see /dotlrn/www/user-add  without permission"
+                ad_return_forbidden \
+                   "Permission Denied"\
+                   "<blockquote>
+                     You don't have permission to see this page.
+                    </blockquote>"
+	       }
+             }
+           }
+	    "manageapplets" {
+              if { ![parameter::get_from_package_key -package_key dotlrn-portlet -parameter AllowManageApplets] } {
+     	                 if { ![dotlrn::admin_p] } {
+                ns_log notice "user has tried to see /dotlrn/www/applets  without permission"
+                ad_return_forbidden \
+                   "Permission Denied"\
+                   "<blockquote>
+                     You don't have permission to see this page.
+                    </blockquote>"
+	       }
+             }
+          }
+	}
+    }
 }
Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp,v
diff -u -r1.31 -r1.32
--- openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp	29 Jun 2004 10:18:15 -0000	1.31
+++ openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp	24 Jul 2004 08:34:16 -0000	1.32
@@ -25,7 +25,7 @@
   <li><a href="dotlrn-group-admin-faq">Administrator FAQ</a></li>
   <li><a href="clone">#dotlrn-portlet.Copy_this_group#</a></li>
   <if @archived_p@ eq t>
-  <li><a href="@dotlrn_admin_url@/archived-communities"><font color=red>#dotlrn-portlet.lt_This_group_is_archive#</font></a>
+  <li><a href="@dotlrn_admin_url@/archived-communities"><font color=red>#dotlrn-portlet.lt_This_group_is_archive#</font></a></li>
   </if>
   <else>
     <li><a href="subcommunity-archive">#dotlrn-portlet.Archive_this_group#</a></li>
@@ -36,16 +36,24 @@
   </li>
   <br>
 </if>
+
+<if @manage_membership_p@ eq 1 or @dotlrn_admin_p@ eq 1 >
      <li><a href="members">#dotlrn-portlet.Manage_Membership#</a> - #dotlrn-portlet.lt_AddRemove_pretty_name#</li>
+</if>
 
+<if @enrollment_policy_p@ eq 1 or @dotlrn_admin_p@ eq 1 >
       <li>
         #dotlrn-portlet.lt_Change_Enrollment_Pol# -
           <if @join_policy@ eq "open"><b>#dotlrn-portlet.Open#</b></if><else><a href="join-policy-toggle?policy=open">#dotlrn-portlet.Open#</a></else>
         | <if @join_policy@ eq "closed"><b>#dotlrn-portlet.Closed#</b></if><else><a href="join-policy-toggle?policy=closed">#dotlrn-portlet.Closed#</a></else>
         |&nbsp;<if @join_policy@ eq "needs approval"><b>#dotlrn-portlet.Needs_Approval#</b></if><else><a href="join-policy-toggle?policy=needs%20approval">#dotlrn-portlet.Needs_Approval#</a></else>
       </li>
+</if>
+
 <p>
+<if @customize_portal_layout_p@ eq 1 or @dotlrn_admin_p@ eq 1 >
   <li><a href="one-community-portal-configure">#dotlrn-portlet.lt_Customize_Portal_Layo#</a></li>
+</if>
       <li>
         #dotlrn-portlet.lt_Change_Bulk_Mail_Poli# -
           <if @members_can_spam_p@ true><b>#dotlrn-portlet.All_members#</b></if><else><a href="spam-policy-toggle?policy=all">#dotlrn-portlet.All_members#</a></else>
@@ -56,17 +64,25 @@
 
 <if @subcommunity_p@ eq 0>
 <p>
-<if @club_p@ eq 0>
-<li>
-        <a href="user-add?type=student&can_browse_p=0&read_private_data_p=t">#dotlrn-portlet.lt_Create_a_new_Limited_#</a> - #dotlrn-portlet.lt_Only_use_this_to_crea#
-</if>
-<li>        <a href="user-add?type=student&can_browse_p=0&read_private_data_p=f">#dotlrn-portlet.lt_Create_a_new_Limited__1#</a>
+
+  <ul>
+  <if @club_p@ eq 0>
+    <if @create_limited_user_p@ eq 1 or @dotlrn_admin_p@ eq 1 >
+      <li>
+        <a href="user-add?type=student&can_browse_p=0&read_private_data_p=t">#dotlrn-portlet.lt_Create_a_new_Limited_#</a> - #dotlrn-portlet.lt_Only_use_this_to_crea# </li>
+      </if>
+   </if>
+
+
+   <if @create_guest_user_p@ eq 1 or @dotlrn_admin_p@ eq 1 >
+      <li><a href="user-add?type=student&can_browse_p=0&read_private_data_p=f">#dotlrn-portlet.lt_Create_a_new_Limited__1#</a>
         - #dotlrn-portlet.lt_Only_use_this_to_crea_1#
-</li>
+     </li>
+   </if>
 </ul>
 </if>
-    </ul>
-  </li>
+</ul>
+
   <br>
 
   <li>@sub_pretty_plural@
@@ -86,7 +102,9 @@
     </ul>
   </li>
   <br>
-  
+
+<if @manage_applets_p@ eq 1 or @dotlrn_admin_p@ eq 1 >
   <li><a href="applets">#dotlrn-portlet.Manage_Applets#</a></li>
+</if>
 
 </ul>
Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.tcl	20 Apr 2004 21:13:34 -0000	1.15
+++ openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.tcl	24 Jul 2004 08:34:16 -0000	1.16
@@ -39,6 +39,31 @@
 #The community_type is dotlrn_club for "communties" and the subject name for classes.
 set comm_type [dotlrn_community::get_community_type_from_community_id $community_id]
 
+#Checking group admin parameters
+set manage_membership_p [parameter::get_from_package_key \
+                                    -package_key dotlrn-portlet \
+			            -parameter AllowManageMembership]
+
+set enrollment_policy_p [parameter::get_from_package_key \
+			            -package_key dotlrn-portlet \
+			            -parameter AllowChangeEnrollmentPolicy]
+
+set customize_portal_layout_p [parameter::get_from_package_key \
+                                    -package_key dotlrn-portlet \
+				    -parameter AllowCustomizePortalLayout]
+
+set create_limited_user_p [parameter::get_from_package_key \
+                                   -package_key dotlrn-portlet \
+			           -parameter AllowCreateLimitedUsersInCommunity]
+
+set create_guest_user_p [parameter::get_from_package_key \
+                                   -package_key dotlrn-portlet \
+			           -parameter AllowCreateGuestUsersInCommunity]  
+
+set manage_applets_p [parameter::get_from_package_key \
+                                   -package_key dotlrn-portlet \
+			           -parameter AllowManageApplets]
+
 if {$comm_type == "dotlrn_club"} {
     set club_p 1
 } else {
Index: openacs-4/packages/ecommerce/ecommerce.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/ecommerce.info,v
diff -u -r1.37 -r1.38
--- openacs-4/packages/ecommerce/ecommerce.info	11 Mar 2004 04:11:51 -0000	1.37
+++ openacs-4/packages/ecommerce/ecommerce.info	24 Jul 2004 08:34:17 -0000	1.38
@@ -72,6 +72,9 @@
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="WeightUnits"  default="lbs" description="weight units such as pounds, carats, ounces, etc." section_name="units"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="httpModule"  description="The AOLserver module that implements &quot;normal&quot; communications (usually nsunix or nssock) Typical behavior favors nsunix over nssock, if both are present.  You only need to set this parameter if your site supports both nsunix and nssock, but you prefer nssock." section_name="SSL"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="httpsModule"  default="nsopenssl" description="The preferred AOLserver module that implements SSL.  Typical behavior favors nsopenssl over nsssl.  This parameter is only important if your site, for some unusual reason supports both nsopenssl as well as nsssl and you prefer nsssl." section_name="SSL"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="FroogleFtpHostname"  default="hedwig.froogle.com" description="Hostname of the Froogle Ftp server to upload the data feed to" section_name="Froogle"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="FroogleAccountname"  default="7_sisters" description="Froogle account name" section_name="Froogle"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="FrooglePassword"  description="Froogle password" section_name="Froogle"/>
         </parameters>
 
     </version>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/tcl/froogle-procs.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/tcl/froogle-procs.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/doc/froogle.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/doc/froogle.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/ecommerce/www/doc/froogle_feed_instructions.pdf
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/froogle_feed_instructions.pdf,v
diff -u -r1.1 -r1.2
Binary files differ
Index: openacs-4/packages/ecommerce/www/doc/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/index.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/ecommerce/www/doc/index.adp	22 May 2003 14:49:34 -0000	1.6
+++ openacs-4/packages/ecommerce/www/doc/index.adp	24 Jul 2004 08:34:18 -0000	1.7
@@ -26,6 +26,7 @@
     <li><a href="ecommerce-customer-service">The @package_name@ Customer Service Module</a></li>
     <li><a href="ecommerce-technical">Technical details</a></li>
     <li><a href="audit">Auditing @package_name@</a></li>
+    <li><a href="froogle">Froogle data feed</a></li>
   </ol>
 
   <p>Notes from the transition from ACS 3.x to 4.x.</p>
Index: openacs-4/packages/edit-this-page/www/etp-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-edit.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/edit-this-page/www/etp-edit.adp	23 Sep 2003 19:13:20 -0000	1.5
+++ openacs-4/packages/edit-this-page/www/etp-edit.adp	24 Jul 2004 08:34:18 -0000	1.6
@@ -1,4 +1,4 @@
 <master src="etp-master">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
-<formtemplate id="etp-edit"></formtemplate>
+<formtemplate id="etp_edit"></formtemplate>
Index: openacs-4/packages/edit-this-page/www/etp-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-edit.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/edit-this-page/www/etp-edit.tcl	14 Feb 2004 16:31:52 -0000	1.11
+++ openacs-4/packages/edit-this-page/www/etp-edit.tcl	24 Jul 2004 08:34:18 -0000	1.12
@@ -1,4 +1,3 @@
-
 ad_page_contract {
     @author Luke Pond (dlpond@museatech.net)
     @creation-date 2001-06-10
@@ -72,7 +71,7 @@
 
 lappend form_list [list page_title:text(hidden)]
 
-ad_form -export { name attribute  widget} -form $form_list -edit_request {
+ad_form -name etp_edit -export { name attribute  widget} -form $form_list -edit_request {
 
 
     if { [lsearch -exact {title description content} $attribute] >= 0 } {
Index: openacs-4/packages/file-storage/file-storage.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/file-storage.info,v
diff -u -r1.34 -r1.35
--- openacs-4/packages/file-storage/file-storage.info	12 Jul 2004 14:49:58 -0000	1.34
+++ openacs-4/packages/file-storage/file-storage.info	24 Jul 2004 08:34:19 -0000	1.35
@@ -7,14 +7,14 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="5.1.0a4" url="http://openacs.org/repository/download/apm/file-storage-5.1.0a4.apm">
+    <version name="5.1.0a5" url="http://openacs.org/repository/download/apm/file-storage-5.1.0a5.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Collaborative document storage</summary>
-        <release-date>2004-04-03</release-date>
+        <release-date>2004-07-21</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
         <description format="text/plain">Provides a versioned document store with storage in the filesystem or database (depending on configuration).  Documents and folders can be permissioned and folders downloaded.</description>
 
-        <provides url="file-storage" version="5.1.0a4"/>
+        <provides url="file-storage" version="5.1.0a5"/>
         <requires url="acs-content-repository" version="5.1.0d1"/>
         <requires url="acs-kernel" version="5.1.0d1"/>
         <requires url="oacs-dav" version="0.2d"/>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/sql/oracle/upgrade/upgrade-5.1.0a4-5.1.0a5.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-5.1.0a4-5.1.0a5.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/file-storage/www/copy.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/copy.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/file-storage/www/copy.tcl	17 May 2004 15:15:14 -0000	1.2
+++ openacs-4/packages/file-storage/www/copy.tcl	24 Jul 2004 08:34:20 -0000	1.3
@@ -48,7 +48,14 @@
     # but the existing file-copy page checks for WRITE
       
     template::multirow foreach copy_objects {
+      db_transaction {
  	db_exec_plsql copy_item {}
+      } on_error {
+         set folder_name "[_ file-storage.folder]"
+         set folder_link "<a href=\"index?folder_id=$folder_id\">$folder_name</a>"
+         ad_return_complaint 1 "[_ file-storage.lt_The_folder_link_you_s]"
+         ad_script_abort
+         }
      }
 
      ad_returnredirect $return_url
Index: openacs-4/packages/file-storage/www/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/delete.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/file-storage/www/delete.tcl	17 May 2004 15:15:14 -0000	1.2
+++ openacs-4/packages/file-storage/www/delete.tcl	24 Jul 2004 08:34:20 -0000	1.3
@@ -28,7 +28,7 @@
 # make sure none of these items are root folders. There is no way to
 # click a checkbox, but who knows how the item_id might get in there
 
-set root_folders_count [db_string count_root_folder "" -default 0]
+set root_folders_count [db_string count_root_folders "" -default 0]
 if {$root_folders_count > 0} {
     ad_complain [_ file-storage.lt_You_may_not_delete_th]
     ad_script_abort
Index: openacs-4/packages/file-storage/www/delete.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/delete.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/file-storage/www/delete.xql	17 May 2004 15:15:14 -0000	1.2
+++ openacs-4/packages/file-storage/www/delete.xql	24 Jul 2004 08:34:20 -0000	1.3
@@ -11,8 +11,7 @@
     <querytext>
       select count(folder_id)
       from fs_root_folders
-      where folder_id in ([template::util::tcl_to_sql_list
-      $object_id])
+      where folder_id in ([template::util::tcl_to_sql_list $object_id])
     </querytext>
   </fullquery>
   
Index: openacs-4/packages/file-storage/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/index.tcl,v
diff -u -r1.25 -r1.26
--- openacs-4/packages/file-storage/www/index.tcl	19 Jun 2004 14:47:48 -0000	1.25
+++ openacs-4/packages/file-storage/www/index.tcl	24 Jul 2004 08:34:20 -0000	1.26
@@ -78,7 +78,7 @@
 
 
 set notification_chunk [notification::display::request_widget \
-    -type fs_fs_notif\
+    -type fs_fs_notif \
     -object_id $folder_id \
     -pretty_name $folder_name \
     -url [ad_conn url]?folder_id=$folder_id \
Index: openacs-4/packages/file-storage/www/move.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/move.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/file-storage/www/move.tcl	12 Jul 2004 14:49:58 -0000	1.3
+++ openacs-4/packages/file-storage/www/move.tcl	24 Jul 2004 08:34:20 -0000	1.4
@@ -14,6 +14,7 @@
     {show_items:boolean 0}
 }
 
+set objects_to_move $object_id
 set user_id [ad_conn user_id]
 
 set allowed_count 0
@@ -48,7 +49,14 @@
     # but the existing file-move page checks for WRITE
       
     template::multirow foreach move_objects {
+      db_transaction {
  	db_exec_plsql move_item {}
+      } on_error {
+         set folder_name "[_ file-storage.folder]"
+         set folder_link "<a href=\"index?folder_id=$folder_id\">$folder_name</a>"
+         ad_return_complaint 1 "[_ file-storage.lt_The_folder_link_you_s]"
+         ad_script_abort
+         }
      }
 
      ad_returnredirect $return_url
@@ -79,8 +87,10 @@
             }
         }
     set root_folder_id [fs::get_root_folder]
+    set object_id $objects_to_move
     db_multirow -extend {move_url} folder_tree get_folder_tree "" {
 	set move_url [export_vars -base "move" { object_id:multiple folder_id return_url }]
+
 	
     }
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/www/admin/upload-size-limit.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/www/admin/upload-size-limit.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/fs-portlet/sql/oracle/fs-admin-portlet-create.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/fs-portlet/sql/oracle/fs-admin-portlet-drop.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/fs-portlet/sql/oracle/fs-portlet-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/sql/oracle/fs-portlet-create.sql,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/fs-portlet/sql/oracle/fs-portlet-create.sql	30 Sep 2003 13:11:40 -0000	1.19
+++ openacs-4/packages/fs-portlet/sql/oracle/fs-portlet-create.sql	24 Jul 2004 08:34:22 -0000	1.20
@@ -23,6 +23,7 @@
 --
 
 @@ fs-contents-portlet-create.sql
+@@ fs-admin-portlet-create.sql
 
 declare
     ds_id portal_datasources.datasource_id%TYPE;
Index: openacs-4/packages/fs-portlet/sql/oracle/upgrade/upgrade-2.0.3-2.0.4.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/sql/oracle/upgrade/upgrade-2.0.3-2.0.4.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/fs-portlet/sql/oracle/upgrade/upgrade-2.0.3-2.0.4.sql	29 Jun 2004 10:18:33 -0000	1.2
+++ openacs-4/packages/fs-portlet/sql/oracle/upgrade/upgrade-2.0.3-2.0.4.sql	24 Jul 2004 08:34:22 -0000	1.3
@@ -31,3 +31,5 @@
 end fs_cont_port_fldr_rnme_tr;
 /
 show errors
+
+@ ../fs-admin-portlet-create.sql
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/fs-portlet/sql/postgresql/fs-admin-portlet-create.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/fs-portlet/sql/postgresql/fs-admin-portlet-drop.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/fs-portlet/sql/postgresql/fs-portlet-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/sql/postgresql/fs-portlet-create.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/fs-portlet/sql/postgresql/fs-portlet-create.sql	9 Aug 2002 18:39:32 -0000	1.2
+++ openacs-4/packages/fs-portlet/sql/postgresql/fs-portlet-create.sql	24 Jul 2004 08:34:22 -0000	1.3
@@ -25,6 +25,7 @@
 -- ported to postgres 2002-07-09
 
 \i fs-contents-portlet-create.sql
+\i fs-admin-portlet-create.sql
 
 create function inline_0()
 returns integer as '
Index: openacs-4/packages/fs-portlet/sql/postgresql/upgrade/upgrade-2.0.3-2.0.4.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/sql/postgresql/upgrade/upgrade-2.0.3-2.0.4.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/fs-portlet/sql/postgresql/upgrade/upgrade-2.0.3-2.0.4.sql	29 Jun 2004 10:18:33 -0000	1.2
+++ openacs-4/packages/fs-portlet/sql/postgresql/upgrade/upgrade-2.0.3-2.0.4.sql	24 Jul 2004 08:34:22 -0000	1.3
@@ -31,3 +31,5 @@
 end fs_cont_port_fldr_rnme_tr;
 /
 show errors
+
+\i ../fs-admin-portlet-create.sql
\ No newline at end of file
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/fs-portlet/tcl/fs-admin-portlet-procs.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/fs-portlet/www/fs-admin-portlet.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/fs-portlet/www/fs-admin-portlet.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp	29 Jun 2004 10:18:33 -0000	1.11
+++ openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp	24 Jul 2004 08:34:41 -0000	1.12
@@ -36,3 +36,4 @@
 </if>
 </table>
 <include src=@scope_fs_url@ folder_id=@folder_id@ root_folder_id=@folder_id@ viewing_user_id=@user_id@ n_past_days=@n_past_days@ fs_url="@url@">
+<p>@notification_chunk;noquote@</p>
Index: openacs-4/packages/fs-portlet/www/fs-contents-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-contents-portlet.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/fs-portlet/www/fs-contents-portlet.tcl	20 Apr 2004 21:13:45 -0000	1.6
+++ openacs-4/packages/fs-portlet/www/fs-contents-portlet.tcl	24 Jul 2004 08:34:41 -0000	1.7
@@ -64,4 +64,14 @@
     set delete_p [permission::permission_p -object_id $folder_id -privilege "delete"]
 }
 
+# Enable Notifications
+
+set folder_name [fs_get_folder_name $folder_id]
+set notification_chunk [notification::display::request_widget \
+    -type fs_fs_notif \
+    -object_id $folder_id \
+    -pretty_name $folder_name \
+    -url [ad_conn url]?folder_id=$folder_id \
+    ]
+
 ad_return_template 
Index: openacs-4/packages/fs-portlet/www/fs-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-portlet.adp,v
diff -u -r1.27 -r1.28
--- openacs-4/packages/fs-portlet/www/fs-portlet.adp	20 Apr 2004 21:13:45 -0000	1.27
+++ openacs-4/packages/fs-portlet/www/fs-portlet.adp	24 Jul 2004 08:34:41 -0000	1.28
@@ -116,5 +116,6 @@
   &nbsp;
 </else>
 
+<p>@notification_chunk;noquote@</p>
 
 
Index: openacs-4/packages/fs-portlet/www/fs-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-portlet.tcl,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/fs-portlet/www/fs-portlet.tcl	11 Dec 2002 14:10:39 -0000	1.17
+++ openacs-4/packages/fs-portlet/www/fs-portlet.tcl	24 Jul 2004 08:34:41 -0000	1.18
@@ -82,4 +82,14 @@
     }
 }
 
+# Enable Notifications
+
+set folder_name [fs_get_folder_name $folder_id]
+set notification_chunk [notification::display::request_widget \
+    -type fs_fs_notif \
+    -object_id $folder_id \
+    -pretty_name $folder_name \
+    -url [ad_conn url]?folder_id=$folder_id \
+    ]
+
 ad_return_template 
Index: openacs-4/packages/new-portal/tcl/portal-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.tcl,v
diff -u -r1.175 -r1.176
--- openacs-4/packages/new-portal/tcl/portal-procs.tcl	29 Jun 2004 10:18:37 -0000	1.175
+++ openacs-4/packages/new-portal/tcl/portal-procs.tcl	24 Jul 2004 08:34:42 -0000	1.176
@@ -146,7 +146,7 @@
 
         set page_name_list [list "Page 1"]
         set layout_name_list [list "#new-portal.simple_2column_layout_name#"]
-
+	ns_log Warning "CREATING A NEW PORTAL"
         if {![empty_string_p $csv_list]} {
             set page_name_and_layout_list [split [string trimright $csv_list ";"] ";"]
             set page_name_list [list]
@@ -512,15 +512,18 @@
                 # Remove page chunk - don't allow removal of the first page
                 #
 
-		append template "<tr><td><include src=\"show-here\" portal_id=$portal_id
+		
+		if {! $first_page_p } {
+		    
+		    append template "<tr><td> <include src=\"show-here\" portal_id=$portal_id
 		    action_string=@action_string@
-		    region=@region@
+		    region=1
 		    page_id=$page_id
 		    anchor=$page_id
 		    return_url=@return_url@></tr></td>"
-
-
-
+		    
+		    
+		    
                     append template "
                     <tr valign=middle><td valign=middle>
                     <center>
@@ -532,8 +535,8 @@
                     </center>
                     </td>
                     </tr>"
+		}
 
-
                 #
                 # Layout change chunk - only shown when there are no visible elements on the page
                 #
@@ -715,6 +718,17 @@
 		    
 		    db_dml revert_page_update {}
 		    
+		    # First, hide all elements.  
+		    # If there are new content portlets that are not
+		    # in the default template, this will ensure they don't come
+		    # up.
+
+		    db_dml hide_all_elements {
+			update portal_element_map
+			set  state = 'hidden'
+			where page_id = :target_page_id
+		    }
+
 		    # revert elements in two steps like "swap"
 		    db_foreach revert_get_source_elements {} {
 			# the element might not be on the target page...
@@ -1995,8 +2009,7 @@
 
         if {[llength $element_id_list] == 0} {
             db_transaction {
-
-                # Tell portal to add this element to the page
+		# Tell portal to add this element to the page
                 set element_id [add_element \
                         -portal_id $portal_id \
                         -portlet_name $portlet_name \
Index: openacs-4/packages/new-portal/tcl/portal-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.xql,v
diff -u -r1.42 -r1.43
--- openacs-4/packages/new-portal/tcl/portal-procs.xql	16 Oct 2002 15:39:16 -0000	1.42
+++ openacs-4/packages/new-portal/tcl/portal-procs.xql	24 Jul 2004 08:34:42 -0000	1.43
@@ -173,21 +173,24 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="portal::configure_dispatch.revert_get_source_elements">
+
+    <fullquery name="portal::configure_dispatch.revert_page_update">
         <querytext>
-            select region,
-                   sort_key,
-                   state,
-                   pd.datasource_id as datasource_id,
-                   pd.name as name,
-                   pem.pretty_name as pretty_name
-            from portal_element_map pem,
-                 portal_datasources pd
-            where pem.page_id = :source_page_id
-            and pem.datasource_id = pd.datasource_id
+            update portal_pages
+            set pretty_name = :pretty_name,
+                layout_id = :layout_id
+            where page_id = :target_page_id
         </querytext>
     </fullquery>
 
+    <fullquery name="portal::configure_dispatch.hide_all_element">
+        <querytext>
+		update portal_element_map		
+		set  state = 'hidden'
+		 where page_id = :target_page_id
+        </querytext>
+    </fullquery>
+
     <fullquery name="portal::configure_dispatch.revert_get_target_element">
         <querytext>
             select element_id
Index: openacs-4/packages/new-portal/www/place-element.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/place-element.adp,v
diff -u -r1.40 -r1.41
--- openacs-4/packages/new-portal/www/place-element.adp	22 Oct 2003 13:22:51 -0000	1.40
+++ openacs-4/packages/new-portal/www/place-element.adp	24 Jul 2004 08:34:42 -0000	1.41
@@ -18,15 +18,22 @@
 
 %>
 
+
+<table border=0 width="100%">
+<tr><td>
+
+<multiple name=element_multi>
+
+<if @element_multi.rownum@ eq 1>
+
 <form method=post action=@action_string@>
 <input type=hidden name=portal_id value=@portal_id@>
 <input type=hidden name=region value=@region@>
 <input type=hidden name=page_id value=@page_id@>
 
-<table border=0 width="100%">
-<tr><td>
+</if>
 
-<multiple name=element_multi>
+
 <center>  
 <table class="portlet-config" cellpadding=0 cellspacing=0 border="0" bground="white" width="95%">
     <tr><td class="element-header-text"><%= [lang::util::localize "@element_multi.name@"] %></td>
Index: openacs-4/packages/notifications/sql/oracle/notifications-core-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/sql/oracle/notifications-core-create.sql,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/notifications/sql/oracle/notifications-core-create.sql	11 Dec 2003 21:40:08 -0000	1.13
+++ openacs-4/packages/notifications/sql/oracle/notifications-core-create.sql	24 Jul 2004 08:34:43 -0000	1.14
@@ -92,6 +92,7 @@
 create table notification_requests (
     request_id                      constraint notif_request_id_fk
                                     references acs_objects (object_id)
+                                    on delete cascade
                                     constraint notif_request_id_pk
                                     primary key,
     type_id                         constraint notif_request_type_id_fk
@@ -141,6 +142,7 @@
 create table notifications (
     notification_id                 constraint notif_notif_id_fk
                                     references acs_objects (object_id)
+                                    on delete cascade
                                     constraint notif_notif_id_pk
                                     primary key,
     type_id                         constraint notif_type_id_fk
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/notifications/sql/oracle/upgrade/upgrade-5.0.0b4-5.1.0d2.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/notifications/sql/oracle/upgrade/upgrade-5.1.0d2-5.1.0d3.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/notifications/sql/postgresql/notifications-core-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/sql/postgresql/notifications-core-create.sql,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/notifications/sql/postgresql/notifications-core-create.sql	11 Dec 2003 21:40:09 -0000	1.12
+++ openacs-4/packages/notifications/sql/postgresql/notifications-core-create.sql	24 Jul 2004 08:34:44 -0000	1.13
@@ -100,6 +100,7 @@
     request_id                      integer
                                     constraint notif_request_id_fk
                                     references acs_objects (object_id)
+                                    on delete cascade
                                     constraint notif_request_id_pk
                                     primary key,
     type_id                         integer
@@ -150,6 +151,7 @@
     notification_id                 integer
                                     constraint notif_notif_id_fk
                                     references acs_objects (object_id)
+                                    on delete cascade
                                     constraint notif_notif_id_pk
                                     primary key,
     type_id                         integer
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/notifications/sql/postgresql/upgrade/upgrade-5.0.0b4-5.1.0d2.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/notifications/sql/postgresql/upgrade/upgrade-5.1.0d2-5.1.0d3.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/notifications/tcl/sweep-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/sweep-procs.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/notifications/tcl/sweep-procs.tcl	29 Jun 2004 10:18:42 -0000	1.18
+++ openacs-4/packages/notifications/tcl/sweep-procs.tcl	24 Jul 2004 08:34:45 -0000	1.19
@@ -125,27 +125,20 @@
                 set notif_html [ns_set get $notif notif_html]
 
                 if {[empty_string_p $notif_text]} {
-                    set notif_text [ad_html_text_convert -from html -to text $no
-tif_html]
+                    set notif_text [ad_html_text_convert -from html -to text $notif_html]
                 }
 
                 if {[empty_string_p $notif_html]} {
-                    set notif_html [ad_html_text_convert -from text -to html $no
-tif_text]
+                    set notif_html [ad_html_text_convert -from text -to html $notif_text]
                 } else {
                     set html_content_p 1
                 }
 
                 append summary_text "[ns_set get $notif notif_subject]\n"
-                append summary_html "<li><a href=#[ns_set get $notif notificatio
-n_id]>[ns_set get $notif notif_subject]</a></li>"
+                append summary_html "<li><a href=#[ns_set get $notif notification_id]>[ns_set get $notif notif_subject]</a></li>"
 
-                append batched_content_text "[_ notifications.SUBJECT] [ns_set get $notif notif_s
-ubject]\n[ns_set get $notif notif_text]\n=====================\n"
-                append batched_content_html "<a name=[ns_set get $notif notifica
-tion_id]>[_ notifications.SUBJECT]</a> [ns_set get $notif notif_subject]\n $notif_html <hr><p>"
-                lappend list_of_notification_ids [ns_set get $notif notification
-_id]
+                append batched_content_text "[_ notifications.SUBJECT] [ns_set get $notif notif_subject]\n[ns_set get $notif notif_text]\n=====================\n"
+                append batched_content_html "<a name=[ns_set get $notif notification_id]>[_ notifications.SUBJECT]</a> [ns_set get $notif notif_subject]\n $notif_html <hr><p>"
 
                 lappend list_of_notification_ids [ns_set get $notif notification_id]
 
Index: openacs-4/packages/oacs-dav/oacs-dav.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/oacs-dav/oacs-dav.info,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/oacs-dav/oacs-dav.info	17 May 2004 15:15:24 -0000	1.4
+++ openacs-4/packages/oacs-dav/oacs-dav.info	24 Jul 2004 08:34:45 -0000	1.5
@@ -8,14 +8,14 @@
     <singleton-p>t</singleton-p>
     <auto-mount>webdav-support</auto-mount>
 
-    <version name="0.6d" url="http://openacs.org/repository/download/apm/oacs-dav-0.6d.apm">
+    <version name="0.7d" url="http://openacs.org/repository/download/apm/oacs-dav-0.7d.apm">
         <owner url="mailto:dave@thedesignexperience.org">Dave Bauer</owner>
         <summary>Provides services to enable webDAV access to content repository items.</summary>
         <release-date>2004-05-03</release-date>
         <vendor>OpenACS</vendor>
         <description format="text/html">An interface to the tDAV webDAV package. oacs-dav provides services to offer webDAV access to content repository data.</description>
 
-        <provides url="oacs-dav" version="0.6d"/>
+        <provides url="oacs-dav" version="0.7d"/>
 
         <callbacks>
             <callback type="after-install"  proc="oacs_dav::install::package_install"/>
Index: openacs-4/www/blank-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/blank-master.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/www/blank-master.tcl	7 May 2004 15:17:44 -0000	1.14
+++ openacs-4/www/blank-master.tcl	24 Jul 2004 08:34:46 -0000	1.15
@@ -33,7 +33,7 @@
 global acs_blank_master__htmlareas
 if { [info exists acs_blank_master__htmlareas] } {
     foreach htmlarea_id $acs_blank_master__htmlareas {
-        append header_stuff "<script type=\"text/javascript\">var editor_var_${htmlarea_id} = null;</script>"
+        append header_stuff "<script type=\"text/javascript\">var editor_var_${htmlarea_id} = new HTMLArea(\"${htmlarea_id}\");</script>"
         lappend onload "acs_initHtmlArea(editor_var_${htmlarea_id}, '${htmlarea_id}');"
     }
 }