Index: openacs-4/packages/cms/todo
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/todo,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/cms/todo	17 Nov 2004 23:07:35 -0000	1.3
+++ openacs-4/packages/cms/todo	13 Apr 2005 20:15:18 -0000	1.4
@@ -1,29 +1,57 @@
+ideas
+=====
+
+perms for multiple sites
+ - perms on types (see next section), templates (ditto)
+ - multi site:
+   - cm_modules: new group per instance -> security_inherit_p context_id = package_id
+	cms-fix.sql sez:
+	-- content_module inherit from content_item
+	-- this way it is possible to grant permissions on content modules
+   - how about perms on served content?
+
+serving/editing strategy for multiple sites
+ - serveroot/cms -> redirects to the cms?
+ - all other urls are served by index.vuh?
+ - create a new basic revision for each site upon which other content types will be based
+   - otherwise, all edits to basic item (content methods, etc.) will affect all sites
+ - set root_key for content types to new basic revision type
+ - create a new folder for templates and content and set module root_keys to folder_ids
+ - set root content and template folder contexts to package_id 
+
+admin
+ - admin tab to select root/root_key for cm_modules (if is not set per instance, redirect to admin tab ala bcms?)
+
+tasks
+=====
+
+top priority
+------------
+set up install procs that set contexts appropriately
+tidy up "view revision" page
+move tab setup in index pages into a per section tab master and call that from each subpage
+ - select from cm_modules to build tabs
+truncate (and noquote, if richtext) value column in content attribute list
+
 basic/cosmetic
 ---------
 list-ize child items (or what to do with it? shouldn't we be able to relate items that already exist?)
 better navigation strategy (i.e., "back" links while visiting attributes, rename, delete pages, etc.)
-new icon for "clipping" items - new listbuilder checkboxes confuse UI a bit
+new icon for "clipping" items - competing with new listbuilder checkboxes confuse UI a bit
 include description in heading on folder attributes page
 inheritance display should not link to "basic item" on its page and should not include the current type (related to navigation strategy)
 move all item info (clip check, title, path, etc.) into an include and put in /lib (with ancestors and bookmark)
 combine the index pages for templates and items into one and put in /lib? (if they can be made the same)
-use page_title in master (possible?)
 fix "clear the clipboard" functionality
-list-ize user browser
 floatclipboard_p working?
 
 plumbing
 --------
 build up actions list for folder using allow_* vars (i.e., links? new folders?) on sitemap browser
-replace [User::getID] with [auth::require_login]
-root folder param?
-content delivery strategy
-remove custom cms permissions system [perm::require]
-remove old workflow/add new workflow
-fix search
-utilize new cr tcl api
+fix search (when i have tsearch2, ie upgrade to rhel4)
+utilize new cr tcl api where appropriate
 use ad_form where appropriate
-integrate categories package
+integrate categories and workflow packages
 ad_page_contract for non-include pages?
 
 questions/ideas
@@ -32,3 +60,54 @@
 generic error page (replace with ad_complain or just pretty up?)
 better model for "clipping" items?
 how do we get extlinks and other types (if any?) which do not sub-class content_revision into the system?
+comment integration?
+
+-- to drop old workflow from production:
+drop function content_workflow__is_overdue (integer,varchar);
+drop function content_workflow__get_holding_user_name (integer);
+drop function content_workflow__get_first_place();
+drop function content_workflow__get_this_place (varchar);
+drop function content_workflow__get_next_place (varchar);
+drop function content_workflow__get_previous_place (varchar);
+drop function content_workflow__checkout (integer,timestamptz,integer,varchar,varchar);
+drop function content_workflow__checkin (integer,integer,varchar,varchar);
+drop function content_workflow__approve (integer,integer,varchar,varchar);
+drop function content_workflow__reject (integer,integer,varchar,varchar,varchar);
+drop function content_workflow__notify_of_checkout (integer,integer,integer,varchar);
+drop function content_workflow__can_reject (integer,integer);
+drop function content_workflow__can_approve (integer,integer);
+drop function content_workflow__can_start (integer,integer);
+drop function content_workflow__approve_string (integer,integer);
+drop function content_workflow__count_finished_tasks (integer);
+drop function content_workflow__count_unfinished_tasks (integer);
+drop function content_workflow__is_active (integer,varchar);
+drop function content_workflow__is_finished (integer,varchar);
+drop function content_workflow__is_checked_out (integer,varchar);
+drop function content_workflow__is_checked_out (integer,varchar,integer);
+drop function content_workflow__get_status (integer,varchar);
+drop function content_workflow__can_touch (integer,integer);
+drop function content_workflow__unfinished_workflow_exists (integer);
+ 
+-- to drop old perms:
+delete from acs_permissions where privilege like '%cm%';
+select acs_privilege__remove_child('cm_root', 'cm_admin');
+select acs_privilege__remove_child('cm_admin', 'cm_relate');
+select acs_privilege__remove_child('cm_relate', 'cm_write');
+select acs_privilege__remove_child('cm_write', 'cm_new');  
+select acs_privilege__remove_child('cm_new', 'cm_examine');
+select acs_privilege__remove_child('cm_examine', 'cm_read');
+select acs_privilege__remove_child('cm_admin', 'cm_item_workflow');
+select acs_privilege__remove_child('cm_admin', 'cm_perm_admin');
+select acs_privilege__remove_child('cm_perm_admin', 'cm_perm');
+select acs_privilege__remove_child('admin', 'cm_root');
+select acs_privilege__drop_privilege('cm_root');
+select acs_privilege__drop_privilege('cm_admin');
+select acs_privilege__drop_privilege('cm_relate');
+select acs_privilege__drop_privilege('cm_write');
+select acs_privilege__drop_privilege('cm_new');
+select acs_privilege__drop_privilege('cm_examine');
+select acs_privilege__drop_privilege('cm_read');
+select acs_privilege__drop_privilege('cm_item_workflow');
+select acs_privilege__drop_privilege('cm_perm_admin');
+select acs_privilege__drop_privilege('cm_perm');
+
Index: openacs-4/packages/cms/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/index.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/cms/www/index.tcl	16 Nov 2004 22:32:47 -0000	1.4
+++ openacs-4/packages/cms/www/index.tcl	13 Apr 2005 20:15:18 -0000	1.5
@@ -3,9 +3,7 @@
     @author Michael Steigman (michael@steigman.net)
     @creation-date October 2004
 } {
-    {module "modules/workspace/index"}
+    {module "modules/sitemap/index"}
 }
 
-set user_id [auth::require_login]
-
 ns_returnredirect $module
\ No newline at end of file
Index: openacs-4/packages/cms/www/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/master.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/cms/www/master.adp	17 Nov 2004 19:02:45 -0000	1.4
+++ openacs-4/packages/cms/www/master.adp	13 Apr 2005 20:15:18 -0000	1.5
@@ -1,4 +1,5 @@
 <master>
+<property name="title">@title@</property>
 
 <style>
 div#section {
@@ -21,17 +22,6 @@
   <div id="subnavbar-container">
     <div id="subnavbar">
 
- <if @section@ eq "workspace">
-  <div class="tab" id="subnavbar-here">
-    Workspace
-  </div>
- </if>
- <else>
-  <div class="tab">
-    <a href="@package_url@modules/workspace/index" title="">Workspace</a>
-  </div>
- </else>
-        
  <if @section@ eq "sitemap">
   <div class="tab" id="subnavbar-here">
     Content
@@ -87,28 +77,6 @@
   </div>
  </else>
 
- <if @section@ eq "workflow">
-  <div class="tab" id="subnavbar-here">
-    Workflow
-  </div>
- </if>
- <else>
-  <div class="tab">
-    <a href="@package_url@modules/workflow/index" title="">Workflow</a>
-  </div>
- </else>
-
- <if @section@ eq "users">
-  <div class="tab" id="subnavbar-here">
-    Users
-  </div>
- </if>
- <else>
-  <div class="tab">
-    <a href="@package_url@modules/users/index" title="">Users</a>
-  </div>
- </else>
-
  <if @section@ eq "clipboard">
   <div class="tab" id="subnavbar-here">
     Clipboard
Index: openacs-4/packages/cms/www/modules/items/assign-keywords-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/assign-keywords-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/items/assign-keywords-oracle.xql	25 May 2001 04:56:36 -0000	1.1
+++ openacs-4/packages/cms/www/modules/items/assign-keywords-oracle.xql	13 Apr 2005 20:15:19 -0000	1.2
@@ -8,7 +8,7 @@
       
         begin 
          :1 := content_keyword.item_assign(
-          :root_id, :item_id, null, :user_id, :ip); 
+          :root_id, :item_id, null, null, null); 
         end;
       </querytext>
 </fullquery>
Index: openacs-4/packages/cms/www/modules/items/assign-keywords-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/assign-keywords-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/items/assign-keywords-postgresql.xql	25 May 2001 04:56:36 -0000	1.1
+++ openacs-4/packages/cms/www/modules/items/assign-keywords-postgresql.xql	13 Apr 2005 20:15:19 -0000	1.2
@@ -8,7 +8,7 @@
 
 
         select content_keyword__item_assign(
-          :root_id, :item_id, null, :user_id, :ip); 
+          :root_id, :item_id, null, null, null); 
 
       </querytext>
 </fullquery>
Index: openacs-4/packages/cms/www/modules/items/assign-keywords.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/assign-keywords.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/items/assign-keywords.tcl	24 May 2001 23:57:17 -0000	1.2
+++ openacs-4/packages/cms/www/modules/items/assign-keywords.tcl	13 Apr 2005 20:15:19 -0000	1.3
@@ -6,15 +6,10 @@
   parent_id -datatype keyword -optional
 }
 
-set user_id [User::getID]
-set ip [ns_conn peeraddr]
 set folder_list [list]
 
-# Check permissions
-content::check_access $id cm_write \
-  -mount_point $mount_point -parent_id $parent_id \
-  -return_url "modules/sitemap/index" \
-  -passthrough [list id $parent_id] 
+permission::require_permission -party_id [auth::require_login] \
+    -object_id $id -privilege write
 
 if { [template::util::is_nil id] } {
   set root_id [cm::modules::${mount_point}::getRootFolderID]
@@ -27,13 +22,8 @@
 db_transaction {
     clipboard::map_code $clip categories {
         if { [catch { 
-            db_exec_plsql item_assign "
-        begin 
-         :1 := content_keyword.item_assign(
-          :root_id, :item_id, null, :user_id, :ip); 
-        end;"
+            db_exec_plsql item_assign {}
             lappend folder_list [list $mount_point $item_id]
-
         } errmsg] } {
         }    
     }
Index: openacs-4/packages/cms/www/modules/items/attributes-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/attributes-edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/items/attributes-edit.adp	22 May 2003 14:27:33 -0000	1.2
+++ openacs-4/packages/cms/www/modules/items/attributes-edit.adp	13 Apr 2005 20:15:19 -0000	1.3
@@ -2,4 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <h2>@page_title@</h2>
 
-<formtemplate id="add_revision" style="wizard"></formtemplate>
+<formtemplate id="add_revision"></formtemplate>
Index: openacs-4/packages/cms/www/modules/items/attributes-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/attributes-edit.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/cms/www/modules/items/attributes-edit.tcl	19 Sep 2002 13:09:14 -0000	1.5
+++ openacs-4/packages/cms/www/modules/items/attributes-edit.tcl	13 Apr 2005 20:15:19 -0000	1.6
@@ -3,15 +3,11 @@
 request create
 request set_param item_id -datatype integer
 
-# check permissions - user must have cm_write on the item
-content::check_access $item_id cm_write -user_id [User::getID]
+permission::require_permission -party_id [auth::require_login] \
+    -object_id $item_id -privilege write
 
 db_0or1row get_item ""
 
-# flush the sitemap folder listing cache in anticipation 
-# of the new item
-cms_folder::flush sitemap $item_id
-
 # validate item_id
 #  if one_item doesn't exist, then this item may have no latest revision
 #  so redirect to the add_revision page with content_method = no_content
Index: openacs-4/packages/cms/www/modules/items/attributes.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/attributes.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/cms/www/modules/items/attributes.tcl	16 Nov 2004 22:32:48 -0000	1.8
+++ openacs-4/packages/cms/www/modules/items/attributes.tcl	13 Apr 2005 20:15:19 -0000	1.9
@@ -29,11 +29,8 @@
   return
 }
 
-# Check permissions
-content::check_access $info(item_id) cm_examine \
-  -mount_point $mount_point \
-  -return_url "modules/sitemap/index" \
-  -request_error
+permission::require_permission -party_id [auth::require_login] \
+    -object_id $info(item_id) -privilege read
 
 # query the attributes for this content type
 
Index: openacs-4/packages/cms/www/modules/items/children.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/children.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/cms/www/modules/items/children.adp	16 Nov 2004 22:32:48 -0000	1.4
+++ openacs-4/packages/cms/www/modules/items/children.adp	13 Apr 2005 20:15:19 -0000	1.5
@@ -1,5 +1,3 @@
-<div id=section-header>Child Items</div>
-
 <table bgcolor=#6699CC cellspacing=0 cellpadding=4 border=0 width="95%">
 <tr bgcolor="#FFFFFF">
   <th align=left valign=bottom>Child Items</th>
Index: openacs-4/packages/cms/www/modules/items/children.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/children.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/cms/www/modules/items/children.tcl	16 Nov 2004 22:32:48 -0000	1.4
+++ openacs-4/packages/cms/www/modules/items/children.tcl	13 Apr 2005 20:15:19 -0000	1.5
@@ -6,11 +6,9 @@
   mount_point -datatype keyword -optional -value sitemap
 }
 
-# Check permissions
-content::check_access $item_id cm_examine \
-  -mount_point $mount_point \
-  -return_url "modules/sitemap/index" \
-  -request_error
+set user_id [auth::require_login]
+permission::require_permission -party_id $user_id \
+    -object_id $item_id -privilege read
 
 # create a form to add child items
 
@@ -19,7 +17,7 @@
 # do not display template if this content type does not allow children
 if { [llength $child_types] == 0 } { adp_abort }
 
-if { [string equal $user_permissions(cm_new) t] } {
+if { [permission::permission_p -party_id $user_id -object_id $item_id -privilege write] } {
   form create add_child -method get -action "create-1"
   element create add_child parent_id -datatype integer \
     -widget hidden -value $item_id
Index: openacs-4/packages/cms/www/modules/items/content-add-1.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/content-add-1.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/cms/www/modules/items/content-add-1.tcl	19 Sep 2002 13:09:14 -0000	1.5
+++ openacs-4/packages/cms/www/modules/items/content-add-1.tcl	13 Apr 2005 20:15:19 -0000	1.6
@@ -6,10 +6,9 @@
 
 db_1row get_revision ""
 
-# permissions check - must have cm_write on the item
-content::check_access $item_id cm_write -user_id [User::getID]
+permission::require_permission -party_id [auth::require_login] \
+    -object_id $item_id -privilege write
 
-
 # check for custom content-add-1 form
 if { [file exists [ns_url2file \
 	"custom/$content_type/content-add-1.tcl"]] } {
Index: openacs-4/packages/cms/www/modules/items/content-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/content-add-2.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/items/content-add-2.tcl	16 Aug 2002 03:57:48 -0000	1.3
+++ openacs-4/packages/cms/www/modules/items/content-add-2.tcl	13 Apr 2005 20:15:19 -0000	1.4
@@ -6,10 +6,9 @@
 
 db_1row get_revision ""
 
-# permissions check - must have cm_write on the item
-content::check_access $item_id cm_write -user_id [User::getID]
+permission::require_permission -party_id [auth::require_login] \
+    -object_id $item_id -privilege write
 
-
 # if we have an invalid revision_id, then redirect
 if { [template::util::is_nil name] } {
     ns_log Notice "content-add-2.tcl: ERROR - BAD REVISION_ID - $revision_id"
Index: openacs-4/packages/cms/www/modules/items/content-download.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/content-download.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/cms/www/modules/items/content-download.tcl	16 Aug 2002 03:57:48 -0000	1.5
+++ openacs-4/packages/cms/www/modules/items/content-download.tcl	13 Apr 2005 20:15:19 -0000	1.6
@@ -6,15 +6,14 @@
 template::request create
 template::request set_param revision_id -datatype integer
 
-set user_id [User::getID]
-
 db_1row get_iteminfo ""
 
 # item_id, is_live
 
 # check cm permissions on file
 if { ![string equal $is_live t] } {
-  content::check_access $item_id cm_read -user_id $user_id
+    permission::require_permission -party_id [auth::require_login] \
+	-object_id $item_id -privilege read
 }
 
 cr_write_content -revision_id $revision_id
Index: openacs-4/packages/cms/www/modules/items/create-1.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/create-1.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/items/create-1.tcl	16 Aug 2002 03:57:48 -0000	1.3
+++ openacs-4/packages/cms/www/modules/items/create-1.tcl	13 Apr 2005 20:15:19 -0000	1.4
@@ -7,21 +7,15 @@
 request set_param mount_point  -datatype keyword -value "sitemap"
 request set_param parent_id    -datatype integer -optional
 
-set flush_parent_id $parent_id
-
 # Manually set the value since the templating system is still broken in 
 # the -value flag
 if { [template::util::is_nil parent_id] } {
   set parent_id [cm::modules::${mount_point}::getRootFolderID]
 }
 
-# permissions check - need cm_new on the parent item
-content::check_access $parent_id cm_new -user_id [User::getID]
+permission::require_permission -party_id [auth::require_login] \
+    -object_id $parent_id -privilege write
 
-# flush the sitemap folder listing cache in anticipation 
-# of the new item
-cms_folder::flush sitemap $flush_parent_id
-
 # check for custom create-1 form
 if { [file exists [ns_url2file \
 	"custom/$content_type/create-1.tcl"]] } {
Index: openacs-4/packages/cms/www/modules/items/create-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/create-2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/items/create-2.adp	22 May 2003 14:27:33 -0000	1.2
+++ openacs-4/packages/cms/www/modules/items/create-2.adp	13 Apr 2005 20:15:19 -0000	1.3
@@ -4,9 +4,4 @@
 </if>
 <h2>@page_title@</h2>
 
-<if @is_wizard@ eq t>
-  <formtemplate id="create_item" style="wizard"></formtemplate>
-</if>
-<else>
-  <formtemplate id="create_item"></formtemplate>
-</else>
+<formtemplate id="create_item"></formtemplate>
Index: openacs-4/packages/cms/www/modules/items/create-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/create-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/cms/www/modules/items/create-2.tcl	16 Aug 2002 03:57:48 -0000	1.5
+++ openacs-4/packages/cms/www/modules/items/create-2.tcl	13 Apr 2005 20:15:19 -0000	1.6
@@ -22,8 +22,8 @@
 request set_param page_title -datatype text -optional
 request set_param is_wizard -datatype keyword -value f
 
-# permissions check - need cm_new on the parent item
-content::check_access $parent_id cm_new -user_id [User::getID]
+permission::require_permission -party_id [auth::require_login] \
+    -object_id $parent_id -privilege write
 
 db_0or1row get_item "" -column_array new_item
 
@@ -100,7 +100,7 @@
     }
 
     form get_values create_item return_url item_id storage_type
-    
+
     set item_id [content::new_item create_item $storage_type]
 
     # do wizard forward or forward to return_url
Index: openacs-4/packages/cms/www/modules/items/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/delete.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/cms/www/modules/items/delete.tcl	30 Sep 2003 12:10:06 -0000	1.4
+++ openacs-4/packages/cms/www/modules/items/delete.tcl	13 Apr 2005 20:15:19 -0000	1.5
@@ -4,33 +4,13 @@
 request set_param item_id -datatype keyword
 request set_param mount_point -datatype keyword -value sitemap
 
+permission::require_permission -party_id [auth::require_login] \
+    -object_id $item_id -privilege write
+
 db_transaction {
-    # permissions check - must have cm_write permissions on item to delete
-    content::check_access $item_id cm_write -user_id [User::getID]
 
-    # get all the parent_id's of the items being deleted
-    #   because we need to flush the paginator cache for each of these folders
-    set flush_list [db_list flush ""]
+    db_exec_plsql item_delete {}
 
-    db_exec_plsql item_delete "
-  begin 
-    content_item.del(
-      item_id => :item_id
-    ); 
-  end;" 
 }
 
-# flush cache
-set root_id [cm::modules::${mount_point}::getRootFolderID]
-set flushed_list [list]
-foreach parent_id $flush_list {
-  if { [lsearch -exact $flushed_list $parent_id] == -1 } {
-    if { $parent_id == $root_id } {
-      set parent_id ""
-    }
-    cms_folder::flush $mount_point $parent_id
-    lappend flushed_list $parent_id
-  }
-}
-
-template::forward "../sitemap/index?id="
+ad_returnredirect [export_vars -base "../sitemap/index" {mount_point}]
Index: openacs-4/packages/cms/www/modules/items/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/index.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/cms/www/modules/items/index.adp	16 Nov 2004 22:32:48 -0000	1.4
+++ openacs-4/packages/cms/www/modules/items/index.adp	13 Apr 2005 20:15:19 -0000	1.5
@@ -95,12 +95,16 @@
 <if @item_props_tab@ eq children>
 
   <div id=section>
-  <include src="children" item_id="@item_id;noquote@">
+   <div id=section-header>Child Items</div>
+   <p/>
+   <include src="children" item_id="@item_id;noquote@">
   </div>
   <p>
 
   <div id=section>
-  <include src="related-items" item_id="@item_id;noquote@">
+   <div id=section-header>Related Items</div>
+   <p/>
+   <include src="related-items" item_id="@item_id;noquote@">
   </div>
   <p>
 
@@ -109,25 +113,23 @@
 <if @item_props_tab@ eq publishing>
 
   <div id=section>
-  <include src="publish-status" item_id="@item_id;noquote@">
+   <div id=section-header>Publishing Status</div>
+   <p/>
+   <include src="publish-status" item_id="@item_id;noquote@">
   </div>
   <p>
 
   <div id=section>
-  <include src="templates" item_id="@item_id;noquote@">
+   <div id=section-header>Registered Templates</div>
+   <p/>
+   <include src="templates" item_id="@item_id;noquote@">
   </div>
   <p>
 
-
-  <if @user_permissions.cm_item_workflow@ eq t>
-    <div id=section>
-    <include src="../workflow/case-status" item_id="@item_id;noquote@">
-    </div>
-    <p>
-  </if>
-
   <div id=section>
-  <include src="comments" item_id="@item_id;noquote@">
+   <div id=section-header>Comments</div>
+   <p/>
+   Place holder for comments
   </div>
   <p>
 
@@ -136,21 +138,21 @@
 <if @item_props_tab@ eq permissions>
   
   <div id=section>
-  <include src="../permissions/index" object_id="@item_id;noquote@" 
-    mount_point="@mount_point;noquote@" return_url="@return_url;noquote@" passthrough="@passthrough;noquote@">
+  <div id=section-header>Item permissions</div>
+  <include src="/packages/acs-subsite/www/permissions/perm-include" object_id="@item_id@">
   </div>
   <p/>
 
 </if>
 
 <!-- Options at the end -->
 
-<if @user_permissions.cm_write@ eq t>
+<if @can_edit_p@>
   <p>
   <a href="rename?item_id=@item_id@&mount_point=@mount_point@">
     Rename</a> this content item
 </if>
-<if @user_permissions.cm_write@ eq t>
+<if @can_edit_p@>
   <br>
   <a href="delete?item_id=@item_id@&mount_point=@mount_point@" 
      onClick="return confirm('Warning! You are about to delete this content item.');">
Index: openacs-4/packages/cms/www/modules/items/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/index.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/cms/www/modules/items/index.tcl	16 Nov 2004 22:32:48 -0000	1.5
+++ openacs-4/packages/cms/www/modules/items/index.tcl	13 Apr 2005 20:15:19 -0000	1.6
@@ -31,11 +31,13 @@
 
 set item_id $resolved_item_id
 
-# Check permissions
-content::check_access $item_id cm_examine \
-  -mount_point $mount_point \
-  -return_url "modules/sitemap/index" 
+set user_id [auth::require_login]
+permission::require_permission -party_id $user_id \
+    -object_id $item_id -privilege read
 
+set can_edit_p [permission::permission_p -party_id $user_id \
+		    -object_id $item_id -privilege write]
+
 # query the content_type of the item ID so we can check for a custom info page
 db_1row get_info "" -column_array info
 template::util::array_to_vars info
Index: openacs-4/packages/cms/www/modules/items/keywords.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/keywords.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/cms/www/modules/items/keywords.tcl	17 Nov 2004 23:07:36 -0000	1.6
+++ openacs-4/packages/cms/www/modules/items/keywords.tcl	13 Apr 2005 20:15:19 -0000	1.7
@@ -6,13 +6,9 @@
   mount_point -datatype keyword -optional -value "sitemap"
 }
 
-# Check permissions
-content::check_access $item_id cm_examine \
-  -mount_point $mount_point \
-  -return_url "modules/sitemap/index" \
-  -request_error
+permission::require_permission -party_id [auth::require_login] \
+    -object_id $item_id -privilege read
 
-
 set name [db_string get_name ""]
 
 template::list::create \
Index: openacs-4/packages/cms/www/modules/items/publish-status.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/publish-status.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/items/publish-status.adp	12 Jun 2001 04:13:46 -0000	1.2
+++ openacs-4/packages/cms/www/modules/items/publish-status.adp	13 Apr 2005 20:15:19 -0000	1.3
@@ -1,28 +1,27 @@
 
-<table cellspacing=0 cellpadding=2 border=0 width=95% bgcolor="#BBBBBB">
-<tr bgcolor="#FFFFFF">
-  <th align=left>Publishing Status</th>
-  <td align=right>
-    <if @user_permissions.cm_item_workflow@ eq t>
-      [<a href="status-edit?item_id=@item_id@">Edit</a>]
+<table cellspacing=0 cellpadding=2 border=0 width=95%>
+<tr>
+  <td colspan=2>
+    <if @can_edit_status_p@>
+      <a href="status-edit?item_id=@item_id@" class="button">Edit Publishing Status</a>
     </if>
     <else>&nbsp;</else>
   </td>
 </tr>
 
-<tr bgcolor="#BBBBBB">
+<tr>
 <td colspan=2>
-  <table cellspacing=0 cellpadding=4 border=2 width="100%">
-  <tr bgcolor="#DDDDDD">
-    <th align=left>@message@</th>
+  <table cellspacing=0 cellpadding=4 width="100%">
+  <tr>
+    <td align=left>@message@</td>
   </tr>
 
 
-  <tr bgcolor="#EEEEEE">
+  <tr>
     <td>
-      <b>This item is 
-      <if @is_publishable@ eq f><font color="red">NOT</font></if> 
-      in a publishable state<if @is_publishable@ eq f>:</if><else>.</else></b>
+      This item is 
+      <if @is_publishable@ eq f><strong>NOT</strong></if> 
+      in a publishable state<if @is_publishable@ eq f>:</if><else>.</else>
 
   <if @is_publishable@ eq f>
   <ul>
@@ -35,13 +34,6 @@
   </if>
 
 
-  <!-- workflow status -->
-
-  <if @unfinished_workflow_exists@ eq t>
-    <li>This item's publishing workflow is still active.
-  </if>
-
-  
   <!-- child rel status -->
 
 
Index: openacs-4/packages/cms/www/modules/items/publish-status.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/publish-status.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/cms/www/modules/items/publish-status.tcl	17 May 2003 10:25:07 -0000	1.7
+++ openacs-4/packages/cms/www/modules/items/publish-status.tcl	13 Apr 2005 20:15:19 -0000	1.8
@@ -4,9 +4,15 @@
 request create
 request set_param item_id -datatype integer
 
-# permissions check - requires cm_item_workflow
-content::check_access $item_id cm_examine -user_id [User::getID] 
+set user_id [auth::require_login]
+permission::require_permission -party_id $user_id \
+    -object_id $item_id -privilege read
 
+set can_edit_status_p [permission::permission_p \
+			   -party_id $user_id \
+			   -object_id $item_id \
+			   -privilege write]
+
 # Query for publish status and release schedule, if any
 
 db_1row get_info "" -column_array info
@@ -60,7 +66,7 @@
 
 # determine if there is an unfinished workflow
 
-set unfinished_workflow_exists [db_string unfinished_exists ""]
+#set unfinished_workflow_exists [db_string unfinished_exists ""]
 
 # determine if child type constraints have been satisfied
 
Index: openacs-4/packages/cms/www/modules/items/relate-items-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/relate-items-2.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/cms/www/modules/items/relate-items-2.tcl	16 Aug 2002 03:57:48 -0000	1.6
+++ openacs-4/packages/cms/www/modules/items/relate-items-2.tcl	13 Apr 2005 20:15:19 -0000	1.7
@@ -11,10 +11,8 @@
 # rel_list is a list of lists in form of
 # {item_id relation_tag order_n relation_type}
 
-# Check permissions
-content::check_access $item_id cm_relate \
-  -mount_point $mount_point \
-  -return_url "modules/sitemap/index"
+permission::require_permission -party_id [auth::require_login] \
+    -object_id $item_id -privilege write
 
 # Create the basic form
 form create rel_form_2
Index: openacs-4/packages/cms/www/modules/items/relate-items.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/relate-items.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/cms/www/modules/items/relate-items.tcl	19 Aug 2002 03:05:17 -0000	1.4
+++ openacs-4/packages/cms/www/modules/items/relate-items.tcl	13 Apr 2005 20:15:19 -0000	1.5
@@ -5,10 +5,8 @@
   mount_point -datatype keyword -value sitemap
 }
 
-# Check permissions
-content::check_access $item_id cm_relate \
-  -mount_point $mount_point \
-  -return_url "modules/sitemap/index"
+permission::require_permission -party_id [auth::require_login] \
+    -object_id $item_id -privilege write
 
 ######################## BASIC PHASE: create default elements ###################
 
Index: openacs-4/packages/cms/www/modules/items/relate-order.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/relate-order.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/cms/www/modules/items/relate-order.tcl	16 Nov 2004 22:32:48 -0000	1.5
+++ openacs-4/packages/cms/www/modules/items/relate-order.tcl	13 Apr 2005 20:15:19 -0000	1.6
@@ -36,14 +36,9 @@
     template::util::array_to_vars rel_info
     lappend passthrough [list item_id $item_id]
 
+    permission::require_permission -party_id [auth::require_login] \
+	-object_id $item_id -privilege write
 
-
-    # Check permissions - must have cm_relate on the item
-    content::check_access $item_id cm_relate \
-        -mount_point $mount_point \
-        -return_url "modules/sitemap/index"
-
-
     # Sort the related/child items order to ensure unique order_n
     if { [string equal $relation_type child] } {
         cms_rel::sort_child_item_order $item_id
Index: openacs-4/packages/cms/www/modules/items/related-items.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/related-items.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/cms/www/modules/items/related-items.adp	16 Nov 2004 22:32:48 -0000	1.4
+++ openacs-4/packages/cms/www/modules/items/related-items.adp	13 Apr 2005 20:15:19 -0000	1.5
@@ -1,5 +1,3 @@
-<div id=section-header>Related Items</div>
-<p/>
 <listtemplate name="related"></listtemplate>
 
 
Index: openacs-4/packages/cms/www/modules/items/related-items.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/related-items.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/cms/www/modules/items/related-items.tcl	16 Nov 2004 22:32:48 -0000	1.4
+++ openacs-4/packages/cms/www/modules/items/related-items.tcl	13 Apr 2005 20:15:19 -0000	1.5
@@ -2,12 +2,10 @@
     item_id -datatype integer
     mount_point -datatype keyword -value sitemap
 }
-# Check permissions
-content::check_access $item_id cm_examine \
-  -mount_point $mount_point \
-  -return_url "modules/sitemap/index" \
-  -request_error
 
+permission::require_permission -party_id [auth::require_login] \
+    -object_id $item_id -privilege read
+
 template::list::create \
     -name related \
     -key rel_id \
Index: openacs-4/packages/cms/www/modules/items/rename.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/rename.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/cms/www/modules/items/rename.tcl	1 Jun 2004 22:54:18 -0000	1.5
+++ openacs-4/packages/cms/www/modules/items/rename.tcl	13 Apr 2005 20:15:19 -0000	1.6
@@ -5,10 +5,9 @@
 request set_param item_id -datatype integer
 request set_param mount_point -datatype keyword -value sitemap
 
+permission::require_permission -party_id [auth::require_login] \
+    -object_id $item_id -privilege read
 
-# permissions check - cm_write required to rename an item
-content::check_access $item_id cm_write -user_id [User::getID]
-
 set item_name [db_string get_item_name ""]
 
 set page_title "Rename $item_name"
Index: openacs-4/packages/cms/www/modules/items/revision-add-1.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/revision-add-1.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/cms/www/modules/items/revision-add-1.tcl	19 Aug 2002 03:30:59 -0000	1.4
+++ openacs-4/packages/cms/www/modules/items/revision-add-1.tcl	13 Apr 2005 20:15:19 -0000	1.5
@@ -5,8 +5,8 @@
 request create
 request set_param item_id -datatype integer
 
-# check permissions
-content::check_access $item_id cm_write -user_id [User::getID]
+permission::require_permission -party_id [auth::require_login] \
+    -object_id $item_id -privilege write
 
 set content_type [db_string get_content_type ""]
 
Index: openacs-4/packages/cms/www/modules/items/revision-add-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/revision-add-2.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/items/revision-add-2.adp	6 Apr 2005 22:03:39 -0000	1.3
+++ openacs-4/packages/cms/www/modules/items/revision-add-2.adp	13 Apr 2005 20:15:19 -0000	1.4
@@ -1,5 +1,5 @@
 <master src="../../master">
-
+<property name="title">@page_title@</property>
 <script language=Javascript src="../clipboard/clipboard.js"></script>
 
 <h2>@page_title@</h2>
Index: openacs-4/packages/cms/www/modules/items/revision-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/revision-add-2.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/cms/www/modules/items/revision-add-2.tcl	6 Apr 2005 22:03:39 -0000	1.4
+++ openacs-4/packages/cms/www/modules/items/revision-add-2.tcl	13 Apr 2005 20:15:19 -0000	1.5
@@ -4,8 +4,8 @@
 request set_param item_id -datatype integer
 request set_param content_method -datatype keyword -value no_content
 
-# check permissions - user must have cm_write on the item
-content::check_access $item_id cm_write -user_id [User::getID]
+permission::require_permission -party_id [auth::require_login] \
+    -object_id $item_id -privilege write
 
 # get content_type and name of item
 db_0or1row get_one_item ""
Index: openacs-4/packages/cms/www/modules/items/revision.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/revision.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/items/revision.adp	22 May 2003 14:27:33 -0000	1.3
+++ openacs-4/packages/cms/www/modules/items/revision.adp	13 Apr 2005 20:15:19 -0000	1.4
@@ -7,12 +7,10 @@
 
 <if @live_revision_p@ eq 1>
   This revision is live. &nbsp;
-  <if @user_permissions.cm_item_workflow@ eq t>
-    <a href="unpublish?item_id=@item_id@">Unpublish</a>
-  </if>
+  <a href="unpublish?item_id=@item_id@">Unpublish</a>
 </if>
 <else>
-  <if @user_permissions.cm_item_workflow@ eq t and @is_publishable@ eq t>
+  <if @is_publishable@ eq t>
     [ <a href="publish?item_id=@item_id@&revision_id=@revision_id@">
       Make this revision live
     </a> ]
@@ -70,7 +68,7 @@
     <td align=right>
       <if @content_size@ gt 1>&nbsp;</if>
       <else>
-        <if @user_permissions.cm_write@ eq t>
+        <if @write_p@>
 	  [<a href="content-add-1?revision_id=@revision_id@">Add</a>]
         </if>
         <else>&nbsp;</else>
@@ -101,7 +99,7 @@
 <p>
 
 
-<if @user_permissions.cm_write@ eq t>
+<if @write_p@>
   <a href="revision-add-1?item_id=@item_id@">
     Add a revision this content item</a>
   <br> 
Index: openacs-4/packages/cms/www/modules/items/revision.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/revision.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/cms/www/modules/items/revision.tcl	19 Sep 2002 13:09:14 -0000	1.7
+++ openacs-4/packages/cms/www/modules/items/revision.tcl	13 Apr 2005 20:15:19 -0000	1.8
@@ -11,13 +11,12 @@
 db_1row get_revision "" -column_array one_revision
 template::util::array_to_vars one_revision
 
-# Check permissions - must have cm_examine on the item
-content::check_access $item_id cm_examine \
-	-mount_point $mount_point \
-	-return_url "modules/sitemap/index" 
+set user_id [auth::require_login]
+permission::require_permission -party_id $user_id \
+    -object_id $item_id -privilege read
 
-
-ns_log notice "user_permissions = [array get user_permissions]"
+set write_p [permission::permission_p -party_id $user_id \
+		 -object_id $item_id -privilege write]
 # validate revision
 if { [template::util::is_nil item_id] } {
     template::request::error invalid_revision \
Index: openacs-4/packages/cms/www/modules/items/revisions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/revisions.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/cms/www/modules/items/revisions.tcl	16 Nov 2004 22:32:48 -0000	1.6
+++ openacs-4/packages/cms/www/modules/items/revisions.tcl	13 Apr 2005 20:15:19 -0000	1.7
@@ -6,11 +6,8 @@
   mount_point -datatype keyword -optional -value sitemap
 }
 
-# Check permissions
-content::check_access $item_id cm_examine \
-  -mount_point $mount_point \
-  -return_url "modules/sitemap/index" \
-  -request_error
+permission::require_permission -party_id [auth::require_login] \
+    -object_id $item_id -privilege read
 
 # add content html
 set content_type [db_string get_content_type ""]
Index: openacs-4/packages/cms/www/modules/items/templates-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/templates-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/items/templates-oracle.xql	25 May 2001 04:56:36 -0000	1.1
+++ openacs-4/packages/cms/www/modules/items/templates-oracle.xql	13 Apr 2005 20:15:19 -0000	1.2
@@ -3,20 +3,6 @@
 <queryset>
    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
-<fullquery name="allowed_set_p">      
-      <querytext>
-      
-  select
-    cms_permission.permission_p( module_id, :user_id, 'cm_write' )
-  from
-    cm_modules
-  where
-     key = 'types'
-
-      </querytext>
-</fullquery>
-
- 
 <fullquery name="get_iteminfo">      
       <querytext>
       
Index: openacs-4/packages/cms/www/modules/items/templates-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/templates-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/items/templates-postgresql.xql	9 Jun 2001 01:06:04 -0000	1.3
+++ openacs-4/packages/cms/www/modules/items/templates-postgresql.xql	13 Apr 2005 20:15:19 -0000	1.4
@@ -3,20 +3,7 @@
 <queryset>
    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
-<fullquery name="allowed_set_p">      
-      <querytext>
-      
-  select
-    cms_permission__permission_p( module_id, :user_id, 'cm_write' )
-  from
-    cm_modules
-  where
-     key = 'types'
 
-      </querytext>
-</fullquery>
-
- 
 <fullquery name="get_iteminfo">      
       <querytext>
       
Index: openacs-4/packages/cms/www/modules/items/templates.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/templates.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/items/templates.adp	12 Jun 2001 04:13:46 -0000	1.2
+++ openacs-4/packages/cms/www/modules/items/templates.adp	13 Apr 2005 20:15:19 -0000	1.3
@@ -1,116 +1,10 @@
-<a name="templates">
 
-<table bgcolor=#6699CC cellspacing=0 cellpadding=4 border=0 width="95%">
+Templates Registered to @iteminfo.name@
 
-<tr bgcolor="#FFFFFF">
-  <td align=left><b>Registered Templates</b></td>
-  <td align=right>&nbsp;</td>
-</tr>
+<listtemplate name="registered_templates"></listtemplate>
 
-<tr><td colspan=2>
-<table bgcolor=#6699CC cellspacing=0 cellpadding=2 border=0 width="100%">
+<p/>
 
-  <tr><th align=left colspan=6>
-    Templates Registered to @iteminfo.name@
-  </th></tr>
-  <tr bgcolor="#99CCFF">
-  <if @registered_templates:rowcount@ eq 0>
-    <td colspan=6>
-      <em>No templates registered to this content item.</em>
-    </td>
-  </if>
-  <else>
-    <th width=25% align=left nowrap>Name</th>
-    <td width="5%">&nbsp;&nbsp;&nbsp;</td>
-    <th width=20% align=left nowrap>Context</th>
-    <td width="5%">&nbsp;&nbsp;&nbsp;</td>
-    <th width=10% align=left nowrap>&nbsp;</th>
-    <th width=35% align=left nowrap>&nbsp;</th>
-  </else>
-  </tr>
+Templates Registered to @iteminfo.pretty_name@
 
-  <multiple name=registered_templates>
-    <if @registered_templates.rownum@ odd><tr bgcolor="#FFFFFF"></if>
-    <else><tr bgcolor="#EEEEEE"></else>
-      <td>@registered_templates.path@</td>
-      <td>&nbsp;&nbsp;&nbsp;</td>
-      <td>@registered_templates.use_context@</td>
-      <td>&nbsp;&nbsp;&nbsp;</td>
-      <td>&nbsp;&nbsp;&nbsp;</td>
-      <td>
-        <if @user_permissions.cm_write@ eq t 
-	  and @registered_templates.can_read_template@ eq t>
-          <a href="template-unregister?item_id=@item_id@&template_id=@registered_templates.template_id@&context=@registered_templates.use_context@">
-            Unregister
-          </a>
-        </if><else>&nbsp;</else>
-      </td>
-    </tr>
-  </multiple>
-
-</table>
-</td></tr>
-
-<tr><td colspan=2>
-<table bgcolor=#6699CC cellspacing=0 cellpadding=2 border=0 width="100%">
-
-  <tr><th align=left colspan=6>
-      Templates Registered to @iteminfo.pretty_name@
-  </th></tr>
-  <tr bgcolor="#99CCFF">
-  <if @type_templates:rowcount@ eq 0>
-    <td colspan=6>
-      <em>No templates registered to this content type.</em>
-    </td>
-  </if>
-  <else>
-
-    <th width="25%">Name</th>
-    <td width="5%">&nbsp;&nbsp;&nbsp;</td>
-    <th width="20%">Context</th>
-    <td width="5%">&nbsp;&nbsp;&nbsp;</td>
-    <th width="10%">&nbsp</th>
-    <th width="35%">&nbsp</th>
-  </else>
-  </tr>
-  
-  <multiple name=type_templates>
-    <if @type_templates.rownum@ odd><tr bgcolor="#ffffff"></if>
-    <else><tr bgcolor="#EEEEEE"></else>
-      <td>@type_templates.path@</td>
-      <td>&nbsp;&nbsp;&nbsp;</td>
-      <td>@type_templates.use_context@</td>
-      <td>&nbsp;&nbsp;&nbsp;</td>
-      <td>
-        <if @type_templates.is_default@ eq "t">Default</if>
-        <else>
-          <if @type_templates.can_read_template@ eq t
-	     and @can_set_default_template@ eq t>
-            <a href="../types/set-default-template?template_id=@type_templates.template_id@&context=@type_templates.use_context@&content_type=@content_type@&return_url=@return_url@">
-	      Make default
-            </a>
-          </if><else>&nbsp;</else>
-        </else>
-      </td>
-
-      <td>
-        <if @type_templates.already_registered_p@ eq 1>Registered</if>
-        <else>
-          <if @user_permissions.cm_write@ eq t 
-	    and @type_templates.can_read_template@ eq t 
-            and @registered_templates:rowcount@ eq 0>
-            <a href="template-register?item_id=@item_id@&template_id=@type_templates.template_id@&context=@type_templates.use_context@">
-              Register template to this item
-            </a>
-          </if><else>&nbsp;</else>
-        </else>
-      </td>
-
-    </tr>
-  </multiple>
-
-</table>
-
-
-</td></tr>
-</table>
+<listtemplate name="type_templates"></listtemplate>
Index: openacs-4/packages/cms/www/modules/items/templates.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/templates.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/cms/www/modules/items/templates.tcl	19 Aug 2002 03:30:59 -0000	1.4
+++ openacs-4/packages/cms/www/modules/items/templates.tcl	13 Apr 2005 20:15:19 -0000	1.5
@@ -5,26 +5,94 @@
 request set_param item_id -datatype integer
 request set_param mount_point -datatype keyword -optional -value sitemap
 
-set user_id [User::getID]
+set return_url "index?item_id=$item_id&mount_point=sitemap"
+set user_id [auth::require_login]
+permission::require_permission -party_id $user_id \
+    -object_id $item_id -privilege read
 
-# Check permissions
-content::check_access $item_id cm_examine \
-  -mount_point $mount_point \
-  -return_url "modules/sitemap/index" \
-  -request_error
-
 # check if the user has write permission on the types module
-set can_set_default_template [db_string allowed_set_p ""]
+# MS: for now, we're just going to check if the user has write
+# privs on this item (need to think about this)
+set can_set_default_template [permission::permission_p \
+				  -party_id $user_id \
+				  -object_id $item_id \
+				  -privilege write]
 
 db_1row get_iteminfo "" -column_array iteminfo
 
 set content_type $iteminfo(object_type)
 
+template::list::create \
+    -name registered_templates \
+    -multirow registered_templates \
+    -has_checkboxes \
+    -no_data "No templates registered to this content item" \
+    -elements {
+	path {
+	    label "Path"
+	}
+	use_context {
+	    label "Use Context?"
+	}
+	action {
+	    label "Action"
+	    display_template "<a href=@registered_templates.unreg_url@>unregister</a>"
+	}
+    }
 
 # templates registered to this item
-db_multirow registered_templates get_reg_templates ""
+db_multirow -extend {unreg_url context} registered_templates get_reg_templates {
+    if {$can_read_template_p} {
+	set context $use_context
+	set unreg_url [export_vars -base template-unregister {item_id template_id context}]
+    }
+}
 
-# templates registered to this content type
-db_multirow type_templates get_type_templates ""
+template::list::create \
+    -name type_templates \
+    -multirow type_templates \
+    -has_checkboxes \
+    -no_data "No templates registered to this content type" \
+    -elements {
+	path {
+	    label "Path"
+	}
+	use_context {
+	    label "Use Context?"
+	}
+	set_default_url {
+	    label "Default?"
+	    display_template {
+		<if @type_templates.set_default_url@ not nil>
+		no, <a href=@type_templates.set_default_url@>set default</a>
+		</if><else>
+		yes
+		</else>
+	    }
+	}
+	register_template_url {
+	    label "Registered?"
+	    display_template {
+		<if @type_templates.register_template_url@ not nil>
+		no, <a href=@type_templates.register_template_url@>register template to this item</a>
+		</if><else>
+	        yes
+		</else>
+	    }
+	}
+    }
 
-set return_url "index?item_id=$item_id&mount_point=sitemap"
+# templates registered to this content type
+db_multirow -extend { set_default_url register_template_url} type_templates get_type_templates {} {
+    set context $use_context
+    if {$can_read_template && $can_set_default_template} {
+	set set_default_url [export_vars -base ../types/set-default-template {template_id context content_type return_url}]
+	if {[string match $already_registered_p f] && {$registered_templates:rowcount == 0}} {
+	    set register_template_url [export_vars -base template-register {item_id template_id contex return_url}]
+	} else {
+	    set register_template_url ""
+	}
+    } else {
+	set set_default_url ""
+    }
+}
Index: openacs-4/packages/cms/www/modules/items/unrelate-item.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/unrelate-item.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/cms/www/modules/items/unrelate-item.tcl	16 Nov 2004 22:32:48 -0000	1.6
+++ openacs-4/packages/cms/www/modules/items/unrelate-item.tcl	13 Apr 2005 20:15:19 -0000	1.7
@@ -10,12 +10,6 @@
     { passthrough "[content::assemble_passthrough mount_point]" }
 }
 
-# request create
-# request set_param rel_id -datatype integer
-# request set_param mount_point -datatype keyword -value "sitemap"
-# request set_param return_url -datatype text -value "index"
-# request set_param passthrough -datatype text -value [content::assemble_passthrough mount_point]
-
 set item_id ""
 foreach rel $rel_id {
 
@@ -27,13 +21,13 @@
 	return
     }
     # Check permissions
-    content::check_access $item_id cm_relate \
-	-mount_point $mount_point \
-	-return_url "modules/sitemap/index"
-    db_exec_plsql unrelate_item ""
+    permission::require_permission -party_id [auth::require_login] \
+	-object_id $item_id -privilege write
+    db_exec_plsql unrelate_item {}
     
 }
 
 lappend passthrough [list item_id $item_id]
 
-template::forward "$return_url?item_props_tab=children[content::url_passthrough $passthrough]"
+set item_props_tab children
+ad_returnredirect [export_vars -base $return_url {item_props_tab mount_pount}]
Index: openacs-4/packages/cms/www/modules/sitemap/attributes.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/attributes.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/cms/www/modules/sitemap/attributes.adp	6 Apr 2005 00:20:59 -0000	1.5
+++ openacs-4/packages/cms/www/modules/sitemap/attributes.adp	13 Apr 2005 20:15:19 -0000	1.6
@@ -13,6 +13,13 @@
 <p/>
 
 <div id=section>
+<div id=section-header>Folder permissions</div>
+<include src="/packages/acs-subsite/www/permissions/perm-include" object_id="@folder_id@">
+</div>
+
+<p/>
+
+<div id=section>
 <div id=section-header>Content types registered to the folder</div>
 <p/>
 <listtemplate name="content_types"></listtemplate>
@@ -25,10 +32,3 @@
 <p/>
 <formtemplate id="special_types"></formtemplate>
 </div>
-
-<p/>
-
-<div id=section>
-<include src="../permissions/index" object_id="@folder_id;noquote@" 
-  mount_point="@mount_point;noquote@" return_url="@return_url;noquote@" passthrough="@passthrough;noquote@">
-</div>
Index: openacs-4/packages/cms/www/modules/sitemap/attributes.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/attributes.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/cms/www/modules/sitemap/attributes.tcl	6 Apr 2005 00:20:59 -0000	1.8
+++ openacs-4/packages/cms/www/modules/sitemap/attributes.tcl	13 Apr 2005 20:15:19 -0000	1.9
@@ -18,8 +18,8 @@
     set folder_resolved_id $folder_id
 }
 
-# permissions check - user must have cm_examine on this folder
-#content::check_access $folder_id cm_examine -user_id [User::getID]
+permission::require_permission -party_id [auth::require_login] \
+    -object_id $folder_id -privilege read
 
 # Get the registered types for the folder 
 # (besides symlinks/templates/subfolders)
@@ -78,8 +78,8 @@
     -on_request {}\
     -on_submit {
 
-        content::check_access $folder_resolved_id cm_write \
-	    -user_id [auth::require_login]
+	permission::require_permission -party_id [auth::require_login] \
+	    -object_id $folder_id -privilege write
 
         if { [string equal $allow_subfolders "t"] } {
             set subfolder_method "register_content_type"
@@ -96,6 +96,6 @@
         db_exec_plsql content ""
     } \
     -after_submit {
-	ad_returnredirect "attributes?folder_id=$folder_id&mount_point=$mount_point"
+	ad_returnredirect [export_vars -base attributes {folder_id mount_point}]
 	ad_script_abort
     }
Index: openacs-4/packages/cms/www/modules/sitemap/copy-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/copy-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/sitemap/copy-oracle.xql	25 May 2001 23:49:05 -0000	1.1
+++ openacs-4/packages/cms/www/modules/sitemap/copy-oracle.xql	13 Apr 2005 20:15:19 -0000	1.2
@@ -10,8 +10,8 @@
             content_item.copy(
                 item_id          => :cp_item_id,
                 target_folder_id => :folder_id,
-	        creation_user    => :user_id,
-	        creation_ip      => :ip
+	        creation_user    => null,
+	        creation_ip      => null
             ); 
             end;
       </querytext>
@@ -42,8 +42,8 @@
   where
     item_id in ([join $clip_items ","])
   and
-    -- only for those items which user has cm_examine
-    cms_permission.permission_p(item_id, :user_id, 'cm_examine') = 't'
+    -- only for those items which user has read
+    acs_permission.permission_p(item_id, :user_id, 'read') = 't'
 
       </querytext>
 </fullquery>
Index: openacs-4/packages/cms/www/modules/sitemap/copy-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/copy-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/sitemap/copy-postgresql.xql	30 May 2001 22:56:27 -0000	1.2
+++ openacs-4/packages/cms/www/modules/sitemap/copy-postgresql.xql	13 Apr 2005 20:15:19 -0000	1.3
@@ -9,8 +9,8 @@
         select content_item__copy(
                 :cp_item_id,
                 :folder_id,
-	        :user_id,
-	        :ip
+	        null,
+	        null
             ); 
            
       </querytext>
@@ -41,8 +41,8 @@
   where
     item_id in ([join $clip_items ","])
   and
-    -- only for those items which user has cm_examine
-    cms_permission__permission_p(item_id, :user_id, 'cm_examine') = 't'
+    -- only for those items which user has read
+    acs_permission__permission_p(item_id, :user_id, 'read') = 't'
 
       </querytext>
 </fullquery>
Index: openacs-4/packages/cms/www/modules/sitemap/copy.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/copy.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/cms/www/modules/sitemap/copy.adp	22 May 2003 14:29:51 -0000	1.4
+++ openacs-4/packages/cms/www/modules/sitemap/copy.adp	13 Apr 2005 20:15:19 -0000	1.5
@@ -10,20 +10,20 @@
 <property name="title">Copy Items to @path;noquote@</property>
 <h2>Copy Items to @path@</h2>
 <formtemplate id="copy">
-<formwidget id="id">
+<formwidget id="folder_id">
 
 <p>  
   <formerror id=copied_items>
     <font color=red>Please choose at least one item to copy</font>
   </formerror>
 </p>
 
-<table bgcolor=#6699CC cellspacing=0 cellpadding=4 border=0 width="95%">
+<table cellspacing=0 cellpadding=4 border=0 width="95%">
 
 <tr>
 <td>
 
-<table bgcolor=#99CCFF cellspacing=0 cellpadding=2 border=0 width="100%">
+<table cellspacing=0 cellpadding=2 border=0 width="100%">
 
   <tr><td>&nbsp;</td>
       <th align=left>Name</th>
Index: openacs-4/packages/cms/www/modules/sitemap/copy.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/copy.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/cms/www/modules/sitemap/copy.tcl	19 Aug 2002 03:42:26 -0000	1.5
+++ openacs-4/packages/cms/www/modules/sitemap/copy.tcl	13 Apr 2005 20:15:19 -0000	1.6
@@ -1,20 +1,21 @@
 # Copy folders under another folder
 
 request create 
-request set_param id -datatype integer -optional
+request set_param folder_id -datatype integer -optional
 request set_param mount_point -datatype keyword -value sitemap
 
 
 set root_id [cm::modules::${mount_point}::getRootFolderID]
-if { [template::util::is_nil id] } {
+if { [template::util::is_nil folder_id] } {
   set folder_id $root_id
-} else {
-  set folder_id $id
-}
+} 
+# else {
+#   set folder_id $id
+# }
 
-# permission check - must have cm_new on the current folder
-set user_id [User::getID]
-content::check_access $folder_id cm_new -user_id $user_id 
+set user_id [auth::require_login]
+permission::require_permission -party_id $user_id \
+    -object_id $folder_id -privilege write
 
 set clip [clipboard::parse_cookie]
 set clip_items [clipboard::get_items $clip $mount_point]
@@ -37,7 +38,7 @@
 	-widget hidden \
 	-value $mount_point
 
-element create copy id \
+element create copy folder_id \
 	-datatype integer \
 	-widget hidden \
 	-param \
@@ -69,10 +70,8 @@
 
 
 if { [form is_valid copy] } {
-    set user_id [User::getID]
-    set ip [ns_conn peeraddr]
 
-    form get_values copy id mount_point
+    form get_values copy folder_id mount_point
     set copied_items [element get_values copy copied_items]
 
     db_transaction {
@@ -81,36 +80,16 @@
         foreach cp_item_id $copied_items {
             set parent_id [element get_values copy "parent_id_$cp_item_id"]
 
-            if { [catch {db_exec_plsql copy_item "
-	    begin
-            content_item.copy(
-                item_id          => :cp_item_id,
-                target_folder_id => :folder_id,
-	        creation_user    => :user_id,
-	        creation_ip      => :ip
-            ); 
-            end;"} errmsg] } {
+            if { [catch {db_exec_plsql copy_item {} } errmsg] } {
                 # possibly a duplicate name
                 ns_log notice "ERROR: copy.tcl - while copying $errmsg"
             }
 
-            # flush the cache
-            if { [lsearch -exact $folder_flush_list $parent_id] == -1 } {
-                lappend folder_flush_list $parent_id
-                cms_folder::flush $mount_point $parent_id
-            }
-
         }
     }
 
-    # flush cache for destination folder
-    if { $folder_id == [cm::modules::${mount_point}::getRootFolderID] } {
-	set folder_id ""
-    }
-    cms_folder::flush $mount_point $folder_id
     clipboard::free $clip
 
-    # Specify a null id so that the entire branch will be refreshed
-    template::forward \
-	    "refresh-tree?goto_id=$folder_id&mount_point=$mount_point"
+    ad_returnredirect [export_vars -base index {folder_id mount_point}]
+
 }
Index: openacs-4/packages/cms/www/modules/sitemap/create.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/create.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/cms/www/modules/sitemap/create.tcl	6 Apr 2005 00:20:59 -0000	1.6
+++ openacs-4/packages/cms/www/modules/sitemap/create.tcl	13 Apr 2005 20:15:19 -0000	1.7
@@ -7,8 +7,8 @@
     {mount_point "sitemap"}
 }
 
-# permissions check - user must have cm_new on parent
-#content::check_access $create_parent_id cm_new -user_id [auth::require_login] 
+permission::require_permission -party_id [auth::require_login] \
+    -object_id $folder_id -privilege write
 
 set path [content::item::get_path -item_id $folder_id]
 if {[template::util::is_nil path]} {
Index: openacs-4/packages/cms/www/modules/sitemap/delete-items-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/delete-items-oracle.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/cms/www/modules/sitemap/delete-items-oracle.xql	30 Sep 2003 12:10:06 -0000	1.4
+++ openacs-4/packages/cms/www/modules/sitemap/delete-items-oracle.xql	13 Apr 2005 20:15:19 -0000	1.5
@@ -22,7 +22,7 @@
     item_id in ([join $clip_items ","])
   and
     -- permissions check
-    cms_permission.permission_p( item_id, :user_id, 'cm_write' ) = 't'
+    acs_permission.permission_p( item_id, :user_id, 'write' ) = 't'
   order by
     -- this way parents are deleted after their children
     item_id desc
Index: openacs-4/packages/cms/www/modules/sitemap/delete-items-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/delete-items-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/sitemap/delete-items-postgresql.xql	30 May 2001 22:56:27 -0000	1.3
+++ openacs-4/packages/cms/www/modules/sitemap/delete-items-postgresql.xql	13 Apr 2005 20:15:19 -0000	1.4
@@ -22,7 +22,7 @@
     item_id in ([join $clip_items ","])
   and
     -- permissions check
-    cms_permission__permission_p( item_id, :user_id, 'cm_write' ) = 't'
+    acs_permission__permission_p( item_id, :user_id, 'write' ) = 't'
   order by
     -- this way parents are deleted after their children
     item_id desc
Index: openacs-4/packages/cms/www/modules/sitemap/delete-items.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/delete-items.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/cms/www/modules/sitemap/delete-items.tcl	26 Sep 2002 03:28:52 -0000	1.7
+++ openacs-4/packages/cms/www/modules/sitemap/delete-items.tcl	13 Apr 2005 20:15:19 -0000	1.8
@@ -1,10 +1,14 @@
-# delete.tcl
-# Delete marked items
-request create 
-request set_param id -datatype integer
-request set_param mount_point -datatype keyword -value sitemap
+ad_page_contract {
 
+    Delete marked items
 
+} {
+    {folder_id:integer}
+    {mount_point:optional "sitemap"}
+}
+
+set user_id [auth::require_login]
+
 set clip [clipboard::parse_cookie]
 set clip_items [clipboard::get_items $clip $mount_point]
 set clip_length [llength $clip_items]
@@ -15,8 +19,6 @@
     set no_items_on_clipboard "f"
 }
 
-set user_id [User::getID]
-
 # get title, content_type, path, item_id of each marked item
 
 db_multirow marked_items get_marked_items ""
@@ -28,6 +30,11 @@
 	-datatype integer \
 	-widget checkbox
 
+element create delete folder_id \
+	-datatype integer \
+	-widget hidden \
+    -value $folder_id
+
 set marked_item_size [multirow size marked_items]
 
 for { set i 1 } { $i <= $marked_item_size } { incr i } {
@@ -58,9 +65,6 @@
 
 if { [form is_valid delete] } {
 
-    set user_id [User::getID]
-    set ip [ns_conn peeraddr]
-
     set deleted_items [element get_values delete deleted_items]
 
     db_transaction {
@@ -91,42 +95,17 @@
                 set delete_key "item_id"
             }
 
-            # the following SQL will have this form:
-            # content_something.delete(
-            #   something_id => :del_item_id
-            # );
-
-            if { [catch { db_exec_plsql delete_items "
-	  begin
-	  $delete_proc (
-	    $delete_key => :del_item_id
-          );
-          end;" } errmsg] } {
+            if { [catch { db_exec_plsql delete_items {} } errmsg] } {
                 ns_log notice \
                     "../../sitemap/delete.tcl caught error in dml: - $errmsg"
                 ns_log notice \
                     "../../sitemap/delete.tcl - Item $del_item_id was not deleted"
             }
 
-            # build a list of parent items whose paginator cache needs flushing
-            foreach parent_id $flush_list {
-                # flush as few times as necessary
-                if { [lsearch -exact $parents $parent_id] == -1 } {
-                    # flush cache
-                    lappend parents $parent_id
-
-                    if { $parent_id == [cm::modules::${mount_point}::getRootFolderID] } {
-                        set parent_id ""
-                    }
-                    cms_folder::flush $mount_point $parent_id
-
-                }
-            }
         }
     }
 
     clipboard::free $clip
+    ad_returnredirect [export_vars -base index {folder_id mount_point}]
 
-    # Specify a null id so that the entire branch will be refreshed
-    forward "refresh-tree?goto_id=$id&id=$id&mount_point=$mount_point"
 }
Index: openacs-4/packages/cms/www/modules/sitemap/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/delete.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/cms/www/modules/sitemap/delete.tcl	6 Apr 2005 00:20:59 -0000	1.6
+++ openacs-4/packages/cms/www/modules/sitemap/delete.tcl	13 Apr 2005 20:15:19 -0000	1.7
@@ -8,8 +8,9 @@
     {mount_point "sitemap"}
 }
 
-# permission check - user must have cm_write on this folder to delete it
-#content::check_access $item_id cm_write -user_id [auth::require_login]
+set user_id [auth::require_login] 
+permission::require_permission -party_id $user_id \
+    -object_id $parent_id -privilege write
 
 # Determine if the folder is empty
 if { [string match [content::folder::is_empty -folder_id $folder_id] "f" ] } {
Index: openacs-4/packages/cms/www/modules/sitemap/index-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/index-oracle.xql,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/cms/www/modules/sitemap/index-oracle.xql	6 Apr 2005 00:20:59 -0000	1.7
+++ openacs-4/packages/cms/www/modules/sitemap/index-oracle.xql	13 Apr 2005 20:15:19 -0000	1.8
@@ -7,24 +7,17 @@
       <querytext>
       
   select
-    r.item_id,
-    decode(o.object_type, 'content_symlink', r.label,
-			  'content_folder', f.label,
-			  nvl(v.title, i.name)) title,
-    decode(r.item_id, :index_page_id, 't', 'f') is_index_page,
-    nvl(to_char(round(v.content_length / 1000, 2)), '-') file_size
+    r.item_id, v.title, last_modified
   from 
     cr_resolved_items r, cr_items i, cr_folders f, cr_revisions v, 
-    cr_revisions u, acs_objects o, acs_object_types t
+    cr_revisions u, acs_objects o
   where
-    r.parent_id = $parent_var
+    r.parent_id = :parent_id
   and
     r.resolved_id = i.item_id
   and
     i.item_id = o.object_id
   and
-    i.content_type = t.object_type
-  and
     i.latest_revision = v.revision_id (+)
   and
     i.live_revision = u.revision_id (+)
@@ -52,7 +45,7 @@
     cr_resolved_items r, cr_items i, cr_folders f, cr_revisions v, 
     cr_revisions u, acs_objects o, acs_object_types t
   where
-    r.parent_id = $parent_var
+    r.parent_id = :parent_id
   and
     r.resolved_id = i.item_id
   and
@@ -84,7 +77,7 @@
 <fullquery name="get_index_page_id">      
       <querytext>
       
-  select content_folder.get_index_page($parent_var) from dual
+  select content_folder.get_index_page(:parent_id) from dual
 
       </querytext>
 </fullquery>
Index: openacs-4/packages/cms/www/modules/sitemap/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/index-postgresql.xql,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/cms/www/modules/sitemap/index-postgresql.xql	6 Apr 2005 22:09:10 -0000	1.8
+++ openacs-4/packages/cms/www/modules/sitemap/index-postgresql.xql	13 Apr 2005 20:15:19 -0000	1.9
@@ -7,7 +7,7 @@
       <querytext>
 
   select
-    r.item_id, v.title
+    r.item_id, v.title, last_modified
   from 
     cr_items i
         LEFT OUTER JOIN
@@ -16,11 +16,13 @@
     cr_revisions u ON i.live_revision = u.revision_id
         LEFT OUTER JOIN
     cr_folders f ON i.item_id = f.folder_id, 
-    cr_resolved_items r
+    cr_resolved_items r, acs_objects o
   where
     r.parent_id = $parent_var
   and
     r.resolved_id = i.item_id
+  and
+    i.item_id = o.object_id
    [template::list::orderby_clause -name folder_items -orderby]
 
       </querytext>
Index: openacs-4/packages/cms/www/modules/sitemap/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/index.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/cms/www/modules/sitemap/index.adp	6 Apr 2005 00:20:59 -0000	1.5
+++ openacs-4/packages/cms/www/modules/sitemap/index.adp	13 Apr 2005 20:15:19 -0000	1.6
@@ -1,11 +1,12 @@
 <master src="../../master">
 <property name="title">@page_title@</property>
 
-<nobr><p class="h1">
+<p/>
+
 <include src="../../bookmark" mount_point="@mount_point@" id="@parent_id@">
+
 @page_title;noquote@ 
-</p>
-</nobr>
+
 <p/>
 
 &nbsp;&nbsp;&nbsp;
Index: openacs-4/packages/cms/www/modules/sitemap/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/index.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/cms/www/modules/sitemap/index.tcl	6 Apr 2005 22:09:10 -0000	1.9
+++ openacs-4/packages/cms/www/modules/sitemap/index.tcl	13 Apr 2005 20:15:19 -0000	1.10
@@ -14,116 +14,89 @@
     { page:optional }
 }
 
-# Create all the neccessary URL params for passthrough
-set passthrough "mount_point=$mount_point&parent_id=$parent_id"
-
 set original_folder_id $folder_id
 set user_id [auth::require_login]
 set root_id [cm::modules::${mount_point}::getRootFolderID]
 
-set package_url [ad_conn package_url]
-
 # Get the folder label/description
 #   If :id does not exist, then use :root_id
 if { [template::util::is_nil folder_id] } {
+    set parent_var :root_id
+    #set parent_id $root_id
+    set folder_id $root_id
+    permission::require_permission -party_id $user_id \
+	-object_id $folder_id -privilege read
 
-  set parent_var :root_id
-
-  set module_name [db_string get_module_name ""]
-
-  set info(label) $module_name
-  set info(description) ""
-  set what "Folder"
-  set is_symlink f
-
-  # get all the content types registered to this folder
-  # check whether this folder allows subfolders, symlinks, and templates
-  set registered_types [db_list get_reg_types ""]
-
-  set subfolders_allowed f
-  set symlinks_allowed f
-  set templates_allowed f
-  if { [lsearch -exact $registered_types "content_folder"] != -1 } {
-    set subfolders_allowed t
-  }
-  if { [lsearch -exact $registered_types "content_symlink"] != -1 } {
-    set symlinks_allowed t
-  }
-  if { [lsearch -exact $registered_types "content_template"] != -1 } {
-    set templates_allowed t
-  }
-
-  set parent_id ""
-
+    set module_name [db_string get_module_name ""]
+    
+    set info(label) $module_name
+    set info(description) ""
+    set what "Folder"
+    set is_symlink f
+    
+    # get all the content types registered to this folder
+    # check whether this folder allows subfolders, symlinks, and templates
+    set registered_types [db_list get_reg_types ""]
+    
+    set subfolders_allowed f
+    set symlinks_allowed f
+    set templates_allowed f
+    if { [lsearch -exact $registered_types "content_folder"] != -1 } {
+	set subfolders_allowed t
+    }
+    if { [lsearch -exact $registered_types "content_symlink"] != -1 } {
+	set symlinks_allowed t
+    }
+    if { [lsearch -exact $registered_types "content_template"] != -1 } {
+	set templates_allowed t
+    }
+    
 } else {
+    
+    permission::require_permission -party_id $user_id \
+	    -object_id $folder_id -privilege read
+    
+    set parent_var :folder_id
+    
+    # Resolve the symlink, if any
+    set resolved_id [db_string get_resolved_id ""]
+    
+    if { $resolved_id != $folder_id } {
+	set is_symlink t
+	set item_id $resolved_id
+	set what "Link"
+    } else {
+	set is_symlink f
+	set what "Folder"
+    }
+    
+    # get all the content types registered to this folder
+    # check whether this folder allows subfolders, symlinks, and templates
+    set registered_types [db_list get_types ""]
+    
+    set subfolders_allowed f
+    set symlinks_allowed f
+    set templates_allowed f
+    if { [lsearch -exact $registered_types "content_folder"] != -1 } {
+	set subfolders_allowed t
+    }
+    if { [lsearch -exact $registered_types "content_symlink"] != -1 } {
+	set symlinks_allowed t
+    }
+    if { [lsearch -exact $registered_types "content_template"] != -1 } {
+	set templates_allowed t
+    }
+    
+}
 
-  set parent_var :folder_id
-
-  # Resolve the symlink, if any
-  set resolved_id [db_string get_resolved_id ""]
-
-  if { $resolved_id != $folder_id } {
-    set is_symlink t
-    set item_id $resolved_id
-    set what "Link"
-  } else {
-    set is_symlink f
-    set what "Folder"
-  }
-
-  db_1row get_info "" -column_array info
-
-  # Determine the parent id if none exists
-  set parent_id $info(parent_id)
-  if { [template::util::is_nil parent_id] } {
-      set parent_id ""
-  }
-
-
-  # get all the content types registered to this folder
-  # check whether this folder allows subfolders, symlinks, and templates
-  set registered_types [db_list get_types ""]
-
-  set subfolders_allowed f
-  set symlinks_allowed f
-  set templates_allowed f
-  if { [lsearch -exact $registered_types "content_folder"] != -1 } {
-    set subfolders_allowed t
-  }
-  if { [lsearch -exact $registered_types "content_symlink"] != -1 } {
-    set symlinks_allowed t
-  }
-  if { [lsearch -exact $registered_types "content_template"] != -1 } {
-    set templates_allowed t
-  }
-
+db_1row get_info "" -column_array info
+if { $info(parent_id) == 0  } {
+    # at root; this will change once inheritance is set up for modules
+    set parent_id ""
+} else {
+    set parent_id $info(parent_id)
 }
 
-set page_title "Content Folder - $info(label)"
-
-# Make sure the user has the right access to this folder,
-# set up the user_permissions array
-# if { [template::util::is_nil folder_id] } {
-#   set object_id $root_id
-# } else {
-#   set object_id $folder_id
-# }  
-
-# content::check_access $object_id "cm_examine" \
-#   -user_id $user_id -mount_point $mount_point -parent_id $parent_id \
-#   -return_url "modules/sitemap/index" \
-#   -passthrough [list [list item_id $original_id] [list orderby $orderby]]
-
-
-# If the user doesn't have the New permission, he can't create any new items
-# at all
-#if { [string equal $user_permissions(cm_new) f] } {
-# MS: FIXME
-set info(subfolders_allowed) f
-set info(symlinks_allowed) f
-set info(templates_allowed) f
-#}
-
 # Get the index page ID
 
 set index_page_id [db_string get_index_page_id ""]
@@ -133,28 +106,30 @@
 
 # build folder contents list
 
-if { [template::util::is_nil folder_id] } {
-    set folder_id $root_id
-    set parent_id $root_id
-} else {
-#    set parent_id $folder_id
-}  
+set page_title "Content Folder - $info(label)"
 
+set actions "Attributes [export_vars -base attributes?mount_point=sitemap {folder_id}] \"Folder Attributes\""
+if { [permission::permission_p -party_id $user_id \
+	  -object_id $folder_id -privilege write] } {
+    append actions "
+\"Delete Folder\" [export_vars -base delete?mount_point=sitemap {folder_id parent_id}] \"Delete this folder\"
+\"Rename Folder\" [export_vars -base rename?mount_point=sitemap {folder_id}] \"Rename this folder\"
+\"New Folder\" [export_vars -base create?mount_point=sitemap {folder_id}] \"Create a new folder within this folder\"
+\"Move Items\" [export_vars -base move?mount_point=sitemap {folder_id}] \"Move marked items to this folder\"
+\"Copy Items\" [export_vars -base copy?mount_point=sitemap {folder_id}] \"Copy marked items to this folder\"
+\"Link Items\" [export_vars -base symlink?mount_point=sitemap {folder_id}] \"Link marked items to this folder\"
+\"Delete Items\" [export_vars -base delete-items?mount_point=sitemap {folder_id}] \"Delete marked items\"
+"
+} 
+
 template::list::create \
     -name folder_items \
     -multirow folder_contents \
     -has_checkboxes \
     -key item_id \
     -page_size 20 \
     -page_query_name get_folder_contents_paginate \
-    -actions [list "Attributes" [export_vars -base attributes?mount_point=sitemap {folder_id}] "Folder Attributes" \
-		  "Delete Folder" [export_vars -base delete?mount_point=sitemap {folder_id parent_id}] "Delete this folder" \
-		  "Rename Folder" [export_vars -base rename?mount_point=sitemap {folder_id}] "Rename this folder" \
-		  "New Folder" [export_vars -base create?mount_point=sitemap {folder_id}] "Create a new folder within this folder" \
-		  "Move Items" [export_vars -base move?mount_point=sitemap {folder_id}] "Move marked items to this folder" \
-		  "Copy Items" [export_vars -base copy?mount_point=sitemap {folder_id}] "Copy marked items to this folder" \
-		  "Link Items" [export_vars -base symlink?mount_point=sitemap {folder_id}] "Link marked items to this folder" \
-		  "Delete Items" [export_vars -base delete-items?mount_point=sitemap {folder_id}] "Delete marked items"] \
+    -actions $actions \
     -elements {
 	copy {
 	    label "Clipboard"
@@ -207,7 +182,7 @@
     } else {
 	set file_size "-"
     }
-    set copy [clipboard::render_bookmark sitemap $item_id $package_url]
+    set copy [clipboard::render_bookmark sitemap $item_id [ad_conn package_url]]
 }
 
 form create add_item
Index: openacs-4/packages/cms/www/modules/sitemap/index.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/index.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/sitemap/index.xql	6 Apr 2005 00:20:59 -0000	1.3
+++ openacs-4/packages/cms/www/modules/sitemap/index.xql	13 Apr 2005 20:15:19 -0000	1.4
@@ -1,6 +1,14 @@
 <?xml version="1.0"?>
 <queryset>
 
+<fullquery name="get_module_id">      
+      <querytext>
+      
+  select module_id from cm_modules where key = 'sitemap'
+
+      </querytext>
+</fullquery>
+
 <fullquery name="get_module_name">      
       <querytext>
       
Index: openacs-4/packages/cms/www/modules/sitemap/move.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/move.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/cms/www/modules/sitemap/move.tcl	19 Aug 2002 03:54:52 -0000	1.5
+++ openacs-4/packages/cms/www/modules/sitemap/move.tcl	13 Apr 2005 20:15:19 -0000	1.6
@@ -12,11 +12,9 @@
   set folder_id $id
 }
 
+permission::require_permission -party_id [auth::require_login] \
+    -object_id $folder_id -privilege write
 
-# permission check - must have cm_write on the current folder
-set user_id [User::getID]
-content::check_access $folder_id cm_new -user_id $user_id
-
 set clip [clipboard::parse_cookie]
 set clip_items [clipboard::get_items $clip $mount_point]
 set clip_length [llength $clip_items]
@@ -67,12 +65,8 @@
     element set_value move parent_id_$item_id $parent_id
 }
 
-
-
 if { [form is_valid move] } {
 
-    set user_id [User::getID]
-    set ip [ns_conn peeraddr]
     set root_id [cm::modules::${mount_point}::getRootFolderID]
 
     form get_values move id mount_point
@@ -83,39 +77,15 @@
         foreach mv_item_id $moved_items {
             set parent_id [element get_values move "parent_id_$mv_item_id"]
 
-            if { [catch {db_exec_plsql move_items "
-	    begin
-            content_item.move(
-                item_id          => :mv_item_id,
-                target_folder_id => :folder_id
-            ); 
-            end;"} errmsg] } {
+            if { [catch {db_exec_plsql move_items {} } errmsg] } {
                 # possibly a duplicate name
                 ns_log notice "move.tcl - while moving $errmsg"
             }
-
-            # flush the cache
-            if { [lsearch -exact $folder_flush_list $parent_id] == -1 } {
-                lappend folder_flush_list $parent_id
-                if { $parent_id == $root_id } {
-                    set parent_id ""
-                }
-                cms_folder::flush $mount_point $parent_id
-            }
-
-        }
+	}
     }
 
-
-    # flush cache for destination folder
-    if { $folder_id == $root_id } {
-	set folder_id ""
-    }
-
-    cms_folder::flush $mount_point $folder_id
     clipboard::free $clip
 
-    # Specify a null id so that the entire branch will be refreshed
-    template::forward \
-	    "refresh-tree?goto_id=$folder_id&mount_point=$mount_point"
+    ad_returnredirect [export_vars -base index {folder_id mount_point}]
+
 }
Index: openacs-4/packages/cms/www/modules/sitemap/rename.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/rename.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/sitemap/rename.adp	16 Nov 2004 22:32:50 -0000	1.2
+++ openacs-4/packages/cms/www/modules/sitemap/rename.adp	13 Apr 2005 20:15:19 -0000	1.3
@@ -1,4 +1,5 @@
 <master src="../../master">
+<property name="title">Rename Folder</property>
 
 <h2>Rename folder</h2>
 
Index: openacs-4/packages/cms/www/modules/sitemap/rename.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/rename.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/cms/www/modules/sitemap/rename.tcl	6 Apr 2005 00:20:59 -0000	1.6
+++ openacs-4/packages/cms/www/modules/sitemap/rename.tcl	13 Apr 2005 20:15:19 -0000	1.7
@@ -4,11 +4,9 @@
 request set_param folder_id -datatype integer
 request set_param mount_point -datatype keyword -value sitemap
 
+permission::require_permission -party_id [auth::require_login] \
+    -object_id $folder_id -privilege write
 
-# permissions check - renaming a folder requires cm_write on the folder
-#content::check_access $item_id cm_write -user_id [auth::require_login] 
-
-
 # Create then form
 form create rename_folder
 
Index: openacs-4/packages/cms/www/modules/sitemap/symlink-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/symlink-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/sitemap/symlink-oracle.xql	25 May 2001 23:49:05 -0000	1.1
+++ openacs-4/packages/cms/www/modules/sitemap/symlink-oracle.xql	13 Apr 2005 20:15:19 -0000	1.2
@@ -13,8 +13,8 @@
                 target_id     => :sym_item_id, 
                 parent_id     => :folder_id,
                 creation_date => sysdate, 
-                creation_user => :user_id, 
-                creation_ip   => :ip
+                creation_user => null, 
+                creation_ip   => null
             ); 
             end;
       </querytext>
Index: openacs-4/packages/cms/www/modules/sitemap/symlink-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/symlink-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/sitemap/symlink-postgresql.xql	25 May 2001 23:49:05 -0000	1.1
+++ openacs-4/packages/cms/www/modules/sitemap/symlink-postgresql.xql	13 Apr 2005 20:15:19 -0000	1.2
@@ -14,8 +14,8 @@
                 :folder_id,
                 null,
                 current_timestamp, 
-                :user_id, 
-                :ip
+                null, 
+                null
             ); 
             
       </querytext>
Index: openacs-4/packages/cms/www/modules/sitemap/symlink.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/symlink.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/cms/www/modules/sitemap/symlink.tcl	19 Aug 2002 03:54:52 -0000	1.6
+++ openacs-4/packages/cms/www/modules/sitemap/symlink.tcl	13 Apr 2005 20:15:19 -0000	1.7
@@ -15,9 +15,9 @@
     set folder_id $id
 }
 
-# permission check - must have cm_new on id
-set user_id [User::getID]
-content::check_access $folder_id cm_new -user_id $user_id
+set user_id [auth::require_login]
+permission::require_permission -party_id $user_id \
+    -object_id $folder_id -privilege write
 
 set clip [clipboard::parse_cookie]
 set clip_items [clipboard::get_items $clip $mount_point]
@@ -81,9 +81,6 @@
 
 if { [form is_valid symlink] } {
 
-    set user_id [User::getID]
-    set ip [ns_conn peeraddr]
-
     form get_values symlink id mount_point
     set symlinked_items [element get_values symlink symlinked_items]
 
@@ -95,18 +92,7 @@
             set name [element get_values symlink $element_name_1]
             set label [lindex [element get_values symlink $element_name_2] 0]
 
-            if { [catch {db_exec_plsql new_link "
-	    begin
-            :1 := content_symlink.new(
-                name          => :name, 
-                label         => :label,
-                target_id     => :sym_item_id, 
-                parent_id     => :folder_id,
-                creation_date => sysdate, 
-                creation_user => :user_id, 
-                creation_ip   => :ip
-            ); 
-            end;"} errmsg] } {
+            if { [catch {db_exec_plsql new_link {} } errmsg] } {
                 # possibly a duplicate name
                 ns_log notice "symlink.tcl - while symlinking $errmsg"
             }
@@ -117,11 +103,6 @@
 
     clipboard::free $clip
 
+    ad_returnredirect [export_vars -base index {folder_id mount_point}]
 
-    # flush folder listing cache
-    cms_folder::flush $mount_point $folder_id
-
-
-    # Specify a null id so that the entire branch will be refreshed
-    forward "refresh-tree?goto_id=$folder_id&id=$folder_id&mount_point=$mount_point"\
 }
Index: openacs-4/packages/cms/www/modules/templates/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/templates/index.adp	16 Nov 2004 22:32:51 -0000	1.3
+++ openacs-4/packages/cms/www/modules/templates/index.adp	13 Apr 2005 20:15:19 -0000	1.4
@@ -1,12 +1,11 @@
 <master src="../../master">
 <property name="title">@page_title@</property>
 
-<nobr>
-<p class="h1">
+<p/>
+
 <include src="../../bookmark" mount_point="@mount_point@" id="@parent_id@">
+
 @page_title;noquote@ 
-</p>
-</nobr>
 
 <p/>
 
Index: openacs-4/packages/cms/www/modules/types/content-method.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/content-method.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/cms/www/modules/types/content-method.tcl	16 Nov 2004 22:32:52 -0000	1.6
+++ openacs-4/packages/cms/www/modules/types/content-method.tcl	13 Apr 2005 20:15:19 -0000	1.7
@@ -2,9 +2,10 @@
 request set_param content_type -datatype keyword -value content_revision
 request set_param return_url -datatype text -value ""
 
-# permissions check - user must have cm_examine on the types module
-set types_module_id [cm::modules::get_module_id types]
-content::check_access $types_module_id cm_examine -user_id [User::getID]
+# permissions check - user must have read on the types module
+set module_id [cm::modules::get_module_id types]
+permission::require_permission -party_id [auth::require_login] \
+    -object_id $module_id -privilege read
 
 # default return_url
 if { [template::util::is_nil return_url] } {
Index: openacs-4/packages/cms/www/modules/types/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/index.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/cms/www/modules/types/index.adp	16 Nov 2004 22:32:52 -0000	1.4
+++ openacs-4/packages/cms/www/modules/types/index.adp	13 Apr 2005 20:15:19 -0000	1.5
@@ -130,29 +130,26 @@
 <if @type_props_tab@ eq templates>
 
     <div id=section>    
-    <div id=section-header>Registered Templates</div>
-    <p/>
-    <listtemplate name="type_templates"></listtemplate>
+     <div id=section-header>Registered Templates</div>
+      <p/>
+      <listtemplate name="type_templates"></listtemplate>
     </div>
 
 </if>
 
 <if @type_props_tab@ eq permissions>
 
     <div id=section>    
-    <include src="../permissions/index" 
-      object_id=@module_id;noquote@ 
-      mount_point="types" 
-      return_url="@return_url;noquote@" 
-      passthrough="@passthrough;noquote@">
+     <div id=section-header>Permissions</div>
+      <include src="/packages/acs-subsite/www/permissions/perm-include" object_id="@module_id@">
     </div>
 
 </if>
 
 <if @type_props_tab@ eq subtypes>
     
     <div id=section>
-    <include src="subtypes" content_type=@content_type;noquote@ object_type_pretty=@object_type_pretty;noquote@>
+     <include src="subtypes" content_type=@content_type;noquote@ object_type_pretty=@object_type_pretty;noquote@>
     </div>
 
 </if>
Index: openacs-4/packages/cms/www/modules/types/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/index.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/cms/www/modules/types/index.tcl	16 Nov 2004 22:32:52 -0000	1.5
+++ openacs-4/packages/cms/www/modules/types/index.tcl	13 Apr 2005 20:15:19 -0000	1.6
@@ -28,14 +28,16 @@
 }
 
 set content_type $id
-set user_id [auth::require_login]
 set root_id [cm::modules::templates::getRootFolderID]
 
 set module_id [db_string get_module_id ""]
 
-content::check_access $module_id cm_examine -user_id $user_id
+set user_id [auth::require_login]
+permission::require_permission -party_id $user_id \
+    -object_id $module_id -privilege read
 
-set can_edit_widgets $user_permissions(cm_write)
+set can_edit_widgets [permission::permission_p -party_id $user_id \
+    -object_id $module_id -privilege write]
 
 
 # get the content type pretty name
@@ -92,21 +94,3 @@
 set return_url [ns_conn url]
 set passthrough [content::assemble_passthrough return_url mount_point id]
 
-# for templates table
-if { [string equal $user_permissions(cm_write) t] } {
-    set footer "<a href=\"register-templates?content_type=$content_type\">
-    Register marked templates to this content type</a>"
-} else {
-    set footer ""
-}
-
-# Create the tabbed dialog
-set url [ad_conn url]
-append url "?id=$id&mount_point=$mount_point&parent_id=$parent_id&refresh_tree=f"
-
-# template::tabstrip create type_props -base_url $url
-# template::tabstrip add_tab type_props attributes "Attributes and Uploads" attributes
-# template::tabstrip add_tab type_props relations "Relation Types" relations
-# template::tabstrip add_tab type_props templates "Templates" templates
-# template::tabstrip add_tab type_props permissions "Permissions" permissions
-
Index: openacs-4/packages/cms/www/modules/types/mime-types.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/mime-types.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/cms/www/modules/types/mime-types.tcl	16 Nov 2004 22:32:52 -0000	1.5
+++ openacs-4/packages/cms/www/modules/types/mime-types.tcl	13 Apr 2005 20:15:19 -0000	1.6
@@ -6,10 +6,9 @@
 request set_param content_type -datatype keyword -value 'content_revision'
 
 set module_id [db_string get_module_id ""]
+permission::require_permission -party_id [auth::require_login] \
+    -object_id $module_id -privilege read
 
-# permissions check - must have cm_examine
-content::check_access $module_id cm_examine -user_id [auth::require_login]
-
 set content_type_name [db_string get_name ""]
 
 set unregistered_mime_types [db_list_of_lists get_unreg_mime_types ""]
Index: openacs-4/packages/cms/www/modules/types/relation-register.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/relation-register.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/cms/www/modules/types/relation-register.tcl	16 Nov 2004 22:32:52 -0000	1.5
+++ openacs-4/packages/cms/www/modules/types/relation-register.tcl	13 Apr 2005 20:15:19 -0000	1.6
@@ -4,10 +4,9 @@
 
 
 set module_id [db_string get_module_id ""]
+permission::require_permission -party_id [auth::require_login] \
+    -object_id $module_id -privilege write
 
-# permissions check - must have cm_write on the types module
-content::check_access $module_id cm_write -user_id [User::getID]
-
 form create relation -elements {
     rel_type     -datatype keyword -widget hidden -param
     content_type -datatype keyword -widget hidden -param
Index: openacs-4/packages/cms/www/modules/types/relation-unregister.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/relation-unregister.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/cms/www/modules/types/relation-unregister.tcl	16 Nov 2004 22:32:52 -0000	1.5
+++ openacs-4/packages/cms/www/modules/types/relation-unregister.tcl	13 Apr 2005 20:15:19 -0000	1.6
@@ -9,10 +9,9 @@
 request set_param relation_tag -datatype text -value ""
 
 set module_id [db_string get_module_id ""]
+permission::require_permission -party_id [auth::require_login] \
+    -object_id $module_id -privilege write
 
-# permissions check - must have cm_write on the types module
-content::check_access $module_id cm_write -user_id [User::getID]
-
 if { [string equal $rel_type child_rel] } {
 
     set unregister_method "unregister_child_type"
Index: openacs-4/packages/cms/www/modules/types/relations.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/relations.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/cms/www/modules/types/relations.tcl	16 Nov 2004 22:32:52 -0000	1.4
+++ openacs-4/packages/cms/www/modules/types/relations.tcl	13 Apr 2005 20:15:19 -0000	1.5
@@ -6,10 +6,9 @@
 request set_param content_type -datatype integer -value content_revision
 
 set module_id [db_string get_module_id ""]
+permission::require_permission -party_id [auth::require_login] \
+    -object_id $module_id -privilege read
 
-# permission check - must have cm_examine on types module
-content::check_access $module_id cm_examine -user_id [auth::require_login] 
-
 template::list::create \
     -name rel_types \
     -multirow rel_types \
Index: openacs-4/packages/cms/www/modules/types/unregister-mime-type.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/unregister-mime-type.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/types/unregister-mime-type.tcl	20 Aug 2002 04:18:00 -0000	1.3
+++ openacs-4/packages/cms/www/modules/types/unregister-mime-type.tcl	13 Apr 2005 20:15:19 -0000	1.4
@@ -10,17 +10,11 @@
 db_transaction {
 
     set module_id [db_string get_module_id ""]
+    permission::require_permission -party_id [auth::require_login] \
+	-object_id $module_id -privilege write
 
-    # permissions check - must have cm_write to unregister mime type
-    content::check_access $module_id cm_write -user_id [User::getID]
+    db_exec_plsql unregister_mime_type {}
 
-    db_exec_plsql unregister_mime_type "
-  begin
-    content_type.unregister_mime_type(
-        content_type => :content_type,
-        mime_type    => :mime_type
-    );
-  end;"
 }
 
 content_method::flush_content_methods_cache $content_type
Index: openacs-4/packages/cms/www/modules/types/widget-register.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/widget-register.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/cms/www/modules/types/widget-register.tcl	22 Sep 2003 16:27:44 -0000	1.5
+++ openacs-4/packages/cms/www/modules/types/widget-register.tcl	13 Apr 2005 20:15:19 -0000	1.6
@@ -6,11 +6,9 @@
 request set_param widget -datatype keyword -optional
 
 set module_id [db_string get_module_id ""]
+permission::require_permission -party_id [auth::require_login] \
+    -object_id $module_id -privilege write
 
-# permissions check - need cm_write on types module to edit a widget
-content::check_access $module_id cm_write -user_id [User::getID] 
-
-
 wizard set_param attribute_id $attribute_id
 wizard set_param content_type $content_type
 if { ![template::util::is_nil widget] } {
Index: openacs-4/packages/cms/www/modules/types/widget-unregister.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/widget-unregister.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/types/widget-unregister.tcl	20 Aug 2002 11:17:30 -0000	1.3
+++ openacs-4/packages/cms/www/modules/types/widget-unregister.tcl	13 Apr 2005 20:15:19 -0000	1.4
@@ -1,23 +1,13 @@
 request create
 request set_param attribute_id -datatype integer
 
-
-# permissions check - must have cm_write on the types module to unregister
-#  a widget
 set module_id [db_string get_module_id ""]
+permission::require_permission -party_id [auth::require_login] \
+    -object_id $module_id -privilege write
 
-content::check_access $module_id cm_write -user_id [User::getID]
-
 db_1row get_attr_info ""
 
-if { [catch {db_exec_plsql unregister "
-  begin
-  cm_form_widget.unregister_attribute_widget (
-      content_type   => :content_type,
-      attribute_name => :attribute_name
-  );
-  end;
-"} errmsg] } {
+if { [catch { db_exec_plsql unregister {} } errmsg] } {
   template::request::error unregister_attribute_widget $errmsg
 }