Index: openacs-4/packages/dotlrn-forums/tcl/dotlrn-forums-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-forums/tcl/dotlrn-forums-procs.tcl,v diff -u -r1.12 -r1.12.6.1 --- openacs-4/packages/dotlrn-forums/tcl/dotlrn-forums-procs.tcl 29 May 2003 18:05:42 -0000 1.12 +++ openacs-4/packages/dotlrn-forums/tcl/dotlrn-forums-procs.tcl 25 Jul 2005 19:45:14 -0000 1.12.6.1 @@ -150,8 +150,7 @@ -rel_type dotlrn_member_rel \ ] - permission::grant -party_id $members -object_id $package_id -privilege forum_read - permission::grant -party_id $members -object_id $package_id -privilege forum_post + permission::grant -party_id $members -object_id $package_id -privilege read # set up the admin portlet set admin_portal_id [dotlrn_community::get_admin_portal_id \ Index: openacs-4/packages/forums/forums.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/forums.info,v diff -u -r1.25.2.16 -r1.25.2.17 --- openacs-4/packages/forums/forums.info 5 Jul 2005 23:26:39 -0000 1.25.2.16 +++ openacs-4/packages/forums/forums.info 25 Jul 2005 19:42:04 -0000 1.25.2.17 @@ -7,14 +7,14 @@ f f - + OpenACS Online discussion forums. 2003-11-10 OpenACS This online discussion board software is the successor of the original bboard package. The biggest improvement is a scalable datamodel. Forums supports threaded and flat view, moderation, a stand alone search function as well as integration with the OpenACS search package and integration with the notifications package for email alerts. It also supports reply via email. - + Index: openacs-4/packages/forums/sql/oracle/forums-forums-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/sql/oracle/forums-forums-create.sql,v diff -u -r1.4.4.1 -r1.4.4.2 --- openacs-4/packages/forums/sql/oracle/forums-forums-create.sql 25 Dec 2004 01:05:11 -0000 1.4.4.1 +++ openacs-4/packages/forums/sql/oracle/forums-forums-create.sql 25 Jul 2005 19:42:04 -0000 1.4.4.2 @@ -12,29 +12,21 @@ -- privileges declare begin - -- moderate and post are new privileges - -- the rest are obvious inheritance - -- forum creation on a package allows a user to create forums - -- forum creation on a forum allows a user to create new threads - acs_privilege.create_privilege('forum_create',null,null); - acs_privilege.create_privilege('forum_write',null,null); - acs_privilege.create_privilege('forum_delete',null,null); - acs_privilege.create_privilege('forum_read',null,null); - acs_privilege.create_privilege('forum_post',null,null); - acs_privilege.create_privilege('forum_moderate',null,null); + -- The standard privilege 'admin' on a package allows a user to + -- create forums (enforced by URL). + -- The standard privilege 'create' on a forum allows a user to + -- create new threads. + -- The standard privilege 'write' on a message allows a user to + -- post a follow up message. - -- add children - acs_privilege.add_child('create','forum_create'); - acs_privilege.add_child('write','forum_write'); - acs_privilege.add_child('delete','forum_delete'); + -- forum_moderate lets us grant moderation without granting full admin + acs_privilege.create_privilege('forum_moderate',null,null); acs_privilege.add_child('admin','forum_moderate'); - acs_privilege.add_child('forum_moderate','forum_read'); - acs_privilege.add_child('forum_moderate','forum_post'); - acs_privilege.add_child('forum_write','forum_read'); - acs_privilege.add_child('forum_write','forum_post'); - - -- the last one that will cause all the updates - acs_privilege.add_child('read','forum_read'); + acs_privilege.add_child('forum_moderate','create'); + acs_privilege.add_child('forum_moderate','delete'); + acs_privilege.add_child('forum_moderate','read'); + acs_privilege.add_child('forum_moderate','write'); + end; / show errors Index: openacs-4/packages/forums/sql/oracle/forums-forums-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/sql/oracle/forums-forums-drop.sql,v diff -u -r1.3 -r1.3.4.1 --- openacs-4/packages/forums/sql/oracle/forums-forums-drop.sql 30 Sep 2003 12:10:07 -0000 1.3 +++ openacs-4/packages/forums/sql/oracle/forums-forums-drop.sql 25 Jul 2005 19:42:04 -0000 1.3.4.1 @@ -13,25 +13,16 @@ declare begin - delete from acs_permissions where privilege in ('forum_moderate','forum_post','forum_read','forum_create','forum_write','forum_delete'); + delete from acs_permissions where privilege in ('forum_moderate'); -- remove children - acs_privilege.remove_child('read','forum_read'); - acs_privilege.remove_child('create','forum_create'); - acs_privilege.remove_child('write','forum_write'); - acs_privilege.remove_child('delete','forum_delete'); acs_privilege.remove_child('admin','forum_moderate'); - acs_privilege.remove_child('forum_moderate','forum_read'); - acs_privilege.remove_child('forum_moderate','forum_post'); - acs_privilege.remove_child('forum_write','forum_read'); - acs_privilege.remove_child('forum_write','forum_post'); + acs_privilege.remove_child('forum_moderate','create'); + acs_privilege.remove_child('forum_moderate','delete'); + acs_privilege.remove_child('forum_moderate','read'); + acs_privilege.remove_child('forum_moderate','write'); acs_privilege.drop_privilege('forum_moderate'); - acs_privilege.drop_privilege('forum_post'); - acs_privilege.drop_privilege('forum_read'); - acs_privilege.drop_privilege('forum_create'); - acs_privilege.drop_privilege('forum_write'); - acs_privilege.drop_privilege('forum_delete'); end; / show errors Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/forums/sql/oracle/upgrade/upgrade-1.1.2d4-1.1.2d5.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/forums/sql/postgresql/forums-forums-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/sql/postgresql/forums-forums-create.sql,v diff -u -r1.6.4.1 -r1.6.4.2 --- openacs-4/packages/forums/sql/postgresql/forums-forums-create.sql 23 Dec 2004 02:12:54 -0000 1.6.4.1 +++ openacs-4/packages/forums/sql/postgresql/forums-forums-create.sql 25 Jul 2005 19:42:04 -0000 1.6.4.2 @@ -11,29 +11,20 @@ -- privileges begin; - -- moderate and post are new privileges - -- the rest are obvious inheritance - -- forum creation on a package allows a user to create forums - -- forum creation on a forum allows a user to create new threads - select acs_privilege__create_privilege('forum_create',null,null); - select acs_privilege__create_privilege('forum_write',null,null); - select acs_privilege__create_privilege('forum_delete',null,null); - select acs_privilege__create_privilege('forum_read',null,null); - select acs_privilege__create_privilege('forum_post',null,null); - select acs_privilege__create_privilege('forum_moderate',null,null); + -- The standard privilege 'admin' on a package allows a user to + -- create forums (enforced by URL). + -- The standard privilege 'create' on a forum allows a user to + -- create new threads. + -- The standard privilege 'write' on a message allows a user to + -- post a follow up message. - -- add children - select acs_privilege__add_child('create','forum_create'); - select acs_privilege__add_child('write','forum_write'); - select acs_privilege__add_child('delete','forum_delete'); + -- forum_moderate lets us grant moderation without granting full admin + select acs_privilege__create_privilege('forum_moderate',null,null); select acs_privilege__add_child('admin','forum_moderate'); - select acs_privilege__add_child('forum_moderate','forum_read'); - select acs_privilege__add_child('forum_moderate','forum_post'); - select acs_privilege__add_child('forum_write','forum_read'); - select acs_privilege__add_child('forum_write','forum_post'); - - -- the last one that will cause all the updates - select acs_privilege__add_child('read','forum_read'); + select acs_privilege__add_child('forum_moderate','create'); + select acs_privilege__add_child('forum_moderate','delete'); + select acs_privilege__add_child('forum_moderate','read'); + select acs_privilege__add_child('forum_moderate','write'); --return null; end; Index: openacs-4/packages/forums/sql/postgresql/forums-forums-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/sql/postgresql/forums-forums-drop.sql,v diff -u -r1.3 -r1.3.4.1 --- openacs-4/packages/forums/sql/postgresql/forums-forums-drop.sql 23 Feb 2003 18:20:31 -0000 1.3 +++ openacs-4/packages/forums/sql/postgresql/forums-forums-drop.sql 25 Jul 2005 19:42:04 -0000 1.3.4.1 @@ -13,24 +13,17 @@ create function inline_0 () returns integer as ' begin + + delete from acs_permissions where privilege in (''forum_moderate''); + -- remove children - perform acs_privilege__remove_child(''read'',''forum_read''); - perform acs_privilege__remove_child(''create'',''forum_create''); - perform acs_privilege__remove_child(''write'',''forum_write''); - perform acs_privilege__remove_child(''delete'',''forum_delete''); perform acs_privilege__remove_child(''admin'',''forum_moderate''); - perform acs_privilege__remove_child(''forum_moderate'',''forum_read''); - perform acs_privilege__remove_child(''forum_moderate'',''forum_post''); - perform acs_privilege__remove_child(''forum_write'',''forum_read''); + perform acs_privilege__remove_child(''forum_moderate'',''create''); + perform acs_privilege__remove_child(''forum_moderate'',''delete''); + perform acs_privilege__remove_child(''forum_moderate'',''read''); + perform acs_privilege__remove_child(''forum_moderate'',''write''); - perform acs_privilege__remove_child(''forum_write'',''forum_post''); - perform acs_privilege__drop_privilege(''forum_moderate''); - perform acs_privilege__drop_privilege(''forum_post''); - perform acs_privilege__drop_privilege(''forum_read''); - perform acs_privilege__drop_privilege(''forum_create''); - perform acs_privilege__drop_privilege(''forum_write''); - perform acs_privilege__drop_privilege(''forum_delete''); return null; end;' language 'plpgsql'; Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/forums/sql/postgresql/upgrade/upgrade-1.1.2d4-1.1.2d5.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/forums/tcl/forums-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/forums-procs.tcl,v diff -u -r1.11.4.2 -r1.11.4.3 --- openacs-4/packages/forums/tcl/forums-procs.tcl 23 Dec 2004 02:12:54 -0000 1.11.4.2 +++ openacs-4/packages/forums/tcl/forums-procs.tcl 25 Jul 2005 19:42:04 -0000 1.11.4.3 @@ -74,16 +74,16 @@ } { # JCD: this is potentially bad since we are # just assuming registered_users is the - # right group to be granting forum_write to. + # right group to be granting write to. if {![string equal closed $posting_policy]} { permission::grant -object_id $forum_id \ -party_id [acs_magic_object registered_users] \ - -privilege forum_write + -privilege write } else { permission::revoke -object_id $forum_id \ -party_id [acs_magic_object registered_users] \ - -privilege forum_write + -privilege write } } @@ -98,7 +98,7 @@ # Give the public the right to ask new questions permission::grant -object_id $forum_id \ -party_id $party_id \ - -privilege forum_create + -privilege create util_memoize_flush_regexp $forum_id } @@ -112,7 +112,7 @@ # Revoke the right from the public to ask new questions permission::revoke -object_id $forum_id \ -party_id $party_id \ - -privilege forum_create + -privilege create util_memoize_flush_regexp $forum_id } @@ -125,7 +125,7 @@ } permission::permission_p -object_id $forum_id \ -party_id $party_id \ - -privilege forum_create + -privilege create } ad_proc -public forum::enable {