Index: openacs-4/packages/contacts/contacts.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/contacts.info,v
diff -u -r1.90 -r1.91
--- openacs-4/packages/contacts/contacts.info 25 Jun 2007 17:29:23 -0000 1.90
+++ openacs-4/packages/contacts/contacts.info 26 Jun 2007 02:53:12 -0000 1.91
@@ -7,14 +7,14 @@
<initial-install-p>f</initial-install-p>
<singleton-p>f</singleton-p>
- <version name="1.2b29" url="http://openacs.org/repository/download/apm/contacts-1.2b29.apm">
+ <version name="1.2b30" url="http://openacs.org/repository/download/apm/contacts-1.2b30.apm">
<owner url="mailto:openacs@geddert.com">Matthew Geddert</owner>
<summary>This application lets you collaboratively view, edit and categorize contacts.</summary>
<release-date>2006-06-25</release-date>
<description format="text/plain">Contacts is an application for managing all those people and or organization you need to keep track of. It has a complete UI for storing and categorizing contacts. Each contact can have an arbitrary number of custom attributes associated with it, including other contacts (i.e. a certain contact "belongs" to a certain organization). It also functions as a service contract provider for attributes related to users in your system</description>
<maturity>0</maturity>
- <provides url="contacts" version="1.2b29"/>
+ <provides url="contacts" version="1.2b30"/>
<requires url="acs-datetime" version="4.1"/>
<requires url="acs-events" version="0.5d3"/>
<requires url="acs-tcl" version="5.3.0d2"/>
@@ -81,7 +81,7 @@
<parameter datatype="string" min_n_values="1" max_n_values="1" name="SpouseSyncedAttributes" description="A tcl list of a person or party object types attribute_names or attribute_ids that you want people in a spousal relationship to keep in sync. For example, if you change a wife's home_phone and home_address you might want it to automatically update the husband's record as well you could put in 'home_phone home_address', or you might possibly want last_names to stay in sync (depending on cultural context), etc."/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="SquareThumbnails" default="1" description="0 for no, 1 for yes. If yes we crop either the top or the bottom of the image to create square thumbnails and portraits" section_name="Photos"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="ThumbnailSize" default="125x125" description="Max dimension for thumbnail image" section_name="Photos"/>
- <parameter datatype="number" min_n_values="1" max_n_values="1" name="UseSubsiteAsDefaultGroup" default="0" description="Default '0'. Should we use this contact's instances subsite's application group as the default group? If yes set to '1'. Using the subsites application group as the default group will automatically add all subsite users to this contacts instance. This should only be changed at install time."/>
+ <parameter datatype="number" min_n_values="1" max_n_values="1" name="UseSubsiteAsDefaultGroup" default="1" description="Default '1'. Should we use this contact's instances subsite's application group as the default group? If yes set to '1'. Using the subsites application group as the default group will automatically add all subsite users to this contacts instance. If set to '0' users will not automatically be added to contacts and this contacts instance's contacts will be self contained and not shared with the rest of the system. This should only be changed at install time."/>
<parameter datatype="number" min_n_values="1" max_n_values="1" name="ViewOthersSearchesP" default="0" description="Are users allowed to view other users searches. '1' is yes, '0' is no. The default is '0'. On sites where some users are not allowed to view certain attributes or search condition types this should be '0', since viewing searches from other users may allow you to gain access to information they must not access. Site wide administrators are automatically given permission to view all users searches."/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="OORemoteConverter" default="" description="URL of the remote converter. If none is provided we will use the local converter" section_name="Templates"/>
</parameters>
Index: openacs-4/packages/contacts/tcl/contacts-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-callback-procs.tcl,v
diff -u -r1.61 -r1.62
--- openacs-4/packages/contacts/tcl/contacts-callback-procs.tcl 21 Jun 2007 20:06:42 -0000 1.61
+++ openacs-4/packages/contacts/tcl/contacts-callback-procs.tcl 26 Jun 2007 02:53:13 -0000 1.62
@@ -1388,14 +1388,3 @@
}
}
-ad_proc -public -callback group::add_member -impl contacts {
- {-group_id:required}
- {-user_id:required}
- {-rel_type:required}
- {-member_state:required}
-} {
-
-} {
- ns_log Notice "callback group::add_member -group_id $group_id -user_id $user_id -rel_type $rel_type -member_state $member_state"
-
-}
\ No newline at end of file
Index: openacs-4/packages/contacts/tcl/contacts-import-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-import-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/contacts/tcl/contacts-import-procs.tcl 18 Dec 2006 19:15:05 -0000 1.3
+++ openacs-4/packages/contacts/tcl/contacts-import-procs.tcl 26 Jun 2007 02:53:13 -0000 1.4
@@ -441,13 +441,13 @@
# todo: set correct locale
callback contact::person_add -package_id $contacts_package_id -person_id $person_id
- group::add_member \
+ contact::group::add_member \
-group_id $default_group_id \
-user_id $person_id \
-rel_type "membership_rel"
if {$group_id ne ""} {
- group::add_member \
+ contact::group::add_member \
-group_id $group_id \
-user_id $person_id \
-rel_type "membership_rel"
Index: openacs-4/packages/contacts/tcl/contacts-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-install-procs.tcl,v
diff -u -r1.23 -r1.24
--- openacs-4/packages/contacts/tcl/contacts-install-procs.tcl 1 Jun 2006 09:52:51 -0000 1.23
+++ openacs-4/packages/contacts/tcl/contacts-install-procs.tcl 26 Jun 2007 02:53:13 -0000 1.24
@@ -582,7 +582,31 @@
}
}
+ 1.2b29 1.2b30 {
+ # We are changing all contacts application group members
+ # to be members of their subsite group.
+ parameter::set_default -package_key "contacts" -parameter "UseSubsiteAsDefaultGroup" -value "1"
+
+ foreach package_id [apm_package_ids_from_key -package_key "contacts"] {
+ parameter::set_value -package_id $package_id -parameter "UseSubsiteAsDefaultGroup" -value "1"
+ set contacts_application_group_id [application_group::group_id_from_package_id -no_complain -package_id $package_id]
+ if { $contacts_application_group_id eq "" } {
+ continue
+ }
+ set contacts_node_id [site_node::get_node_id_from_object_id -object_id ${package_id}]
+ if { $contacts_node_id eq "" } {
+ continue
+ }
+ set subsite_package_id [site_node::closest_ancestor_package -node_id $contacts_node_id -package_key "acs-subsite"]
+ set subsite_application_group_id [application_group::group_id_from_package_id -no_complain -package_id $subsite_package_id]
+
+ foreach member_id [group::get_members_not_cached -group_id group_id -type "party"] {
+ contact::group::add_member -no_perm_check -group_id $contacts_application_group_id -user_id $member_id -member_state "approved"
+ }
+ }
+ }
+
}
}
Index: openacs-4/packages/contacts/tcl/contacts-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-procs.tcl,v
diff -u -r1.112 -r1.113
--- openacs-4/packages/contacts/tcl/contacts-procs.tcl 24 Jun 2007 08:20:54 -0000 1.112
+++ openacs-4/packages/contacts/tcl/contacts-procs.tcl 26 Jun 2007 02:53:13 -0000 1.113
@@ -155,35 +155,33 @@
set member_state [db_string member_state "select member_state from cc_users where user_id = :person_id" -default ""]
if {$member_state ne "deleted"} {
foreach group_id $default_groups {
- if {[group::party_member_p -party_id $person_id -group_id $group_id]} {
- set contact_revision_id [contact::revision::new -party_id $person_id -package_id $contact_package($group_id)]
- break
- }
+ if {[group::party_member_p -party_id $person_id -group_id $group_id]} {
+ set contact_revision_id [contact::revision::new -party_id $person_id -package_id $contact_package($group_id)]
+ break
+ }
}
if {![exists_and_not_null contact_revision_id]} {
- # We did not found a group, so just use the first contacts instance.
- if {[ad_conn isconnected]} {
- set user_id [ad_conn user_id]
- set peeraddr [ad_conn peeraddr]
- } else {
- set user_id $person_id
- set peeraddr 127.0.0.1
+ # We did not found a group, so just use the first contacts instance.
+ if {[ad_conn isconnected]} {
+ set user_id [ad_conn user_id]
+ set peeraddr [ad_conn peeraddr]
+ } else {
+ set user_id $person_id
+ set peeraddr 127.0.0.1
+ }
+ set contact_revision_id [contact::revision::new -party_id $person_id -package_id $contact_package_id -creation_user $user_id -creation_ip $peeraddr]
}
- set contact_revision_id [contact::revision::new -party_id $person_id -package_id $contact_package_id -creation_user $user_id -creation_ip $peeraddr]
- }
# Add the default ams attributes
foreach attribute {first_names last_name email} {
- if {[exists_and_not_null $attribute]} {
- ams::attribute::save::text -object_type "person" -object_id $contact_revision_id -attribute_name "$attribute" -value [set $attribute]
+ if {[exists_and_not_null $attribute]} {
+ ams::attribute::save::text -object_type "person" -object_id $contact_revision_id -attribute_name "$attribute" -value [set $attribute]
+ }
}
- }
-
- # And insert into the default group for this package.
- group::add_member -user_id $person_id -group_id $default_group_id -no_perm_check
+
incr counter
- ns_log notice "contacts::sweeper ($counter / $person_num) creating content_item and content_revision $contact_revision_id for party_id: $person_id in $default_group_id"
+ ns_log notice "contacts::sweeper ($counter / $person_num) creating content_item and content_revision $contact_revision_id for party_id: $person_id"
}
}
@@ -203,10 +201,10 @@
}
db_dml insert_privacy_records {}
# Delete records where the user_id has been deleted. After all, deleted users should not show up in contacts either
- foreach group_id $default_groups {
- db_dml delete_deleted_users {}
- }
-
+ foreach group_id $default_groups {
+ db_dml delete_deleted_users {}
+ }
+
} -finally {
nsv_incr contacts sweeper_p -1
}
@@ -884,13 +882,13 @@
# will not automatically be sent.
auth::password::reset -authority_id [auth::authority::local] -username $username -admin
if { [string is true $no_perm_check] } {
- group::add_member \
+ contact::group::add_member \
-no_perm_check \
-group_id "-2" \
-user_id $person_id \
-rel_type "membership_rel"
} else {
- group::add_member \
+ contact::group::add_member \
-group_id "-2" \
-user_id $person_id \
-rel_type "membership_rel"
@@ -966,6 +964,101 @@
}
}
+
+ad_proc -public contact::group::add_member {
+ {-no_perm_check:boolean}
+ {-group_id:required}
+ {-user_id:required}
+ {-rel_type ""}
+ {-member_state ""}
+} {
+ Adds a user to a group, checking that the rel_type is permissible given the user's privileges,
+ Can default both the rel_type and the member_state to their relevant values.
+} {
+ set admin_p [permission::permission_p -object_id $group_id -privilege "admin"]
+
+
+ # Only admins can add non-membership_rel members
+ if { $rel_type eq "" || \
+ (!$no_perm_check_p && $rel_type ne "" && $rel_type ne "membership_rel" && \
+ ![permission::permission_p -object_id $group_id -privilege "admin"]) } {
+ switch [contact::type -party_id $party_id] {
+ person - user {
+ set rel_type "membership_rel"
+ }
+ organization {
+ # Execute the callback for the organization depending on the group they are added to.
+ # We use this callback to add the organization to .LRN if it is a Customer
+ callback contact::organization_new_group -organization_id $party_id -group_id $group_id
+ set rel_type "organization_rel"
+ }
+ }
+ }
+
+ group::get -group_id $group_id -array group
+
+ if { !$no_perm_check_p } {
+ set create_p [group::permission_p -privilege create $group_id]
+ if { $group(join_policy) eq "closed" && !$create_p } {
+ error "You do not have permission to add members to the group '$group(group_name)'"
+ }
+ } else {
+ set create_p 1
+ }
+
+ if { $member_state eq "" } {
+ set member_state [group::default_member_state \
+ -join_policy $group(join_policy) \
+ -create_p $create_p]
+ }
+
+ if { $rel_type eq "organization_rel" } {
+ # They are using the special organization_rel which
+ # needs to be added differently since organizations
+ # can be part of a group which violates the membership_rel
+ # constraint for a group member to be a person see:
+ # http://openacs.org/forums/message-view?message_id=1059049
+ #
+ # The organization_rel behaves exactly like a basic membership_rel
+ # and uses the exact same tables, but it allows an organization
+ # to be a member of a group. If the constraint is dropped/changed
+ # then this code could be cleaned up to act like the other rel
+ # types listed below - and potentially all organization_rels can be
+ # updated and changed into membership_rels
+
+ set existing_rel_id [db_string rel_exists {
+ select rel_id
+ from acs_rels
+ where rel_type = :rel_type
+ and object_id_one = :group_id
+ and object_id_two = :user_id
+ } -default {}]
+ if { [empty_string_p $existing_rel_id] } {
+ if { [ad_conn isconnected] } {
+ set peeraddr [ad_conn peeraddr]
+ set creation_user [ad_conn user_id]
+ } else {
+ set user_id $organization_id
+ set peeraddr 127.0.0.1
+ }
+ set rel_id [db_string insert_rels { select acs_rel__new (NULL::integer,:rel_type,:group_id,:user_id,NULL,:creation_user,:peeraddr) as org_rel_id }]
+ db_dml insert_state { insert into membership_rels (rel_id,member_state) values (:rel_id,:member_state) }
+ } else {
+ # update member state
+ db_dml update_state { update membership_rels set member_state = :member_state where rel_id = :existing_rel_id }
+ }
+ } else {
+ if { $rel_type ne "membership_rel" } {
+ # add them with a membership_rel first
+ relation_add -member_state $member_state "membership_rel" $group_id $user_id
+ }
+ relation_add -member_state $member_state $rel_type $group_id $user_id
+ }
+ flush_members_cache -group_id $group_id
+
+}
+
+
ad_proc -public contact::group::parent {
-group_id:required
} {
@@ -1109,7 +1202,7 @@
# Add to default group
set default_group_id [contacts::default_group -package_id $contacts_package_id]
- group::add_member \
+ contact::group::add_member \
-group_id $default_group_id \
-user_id $person_id \
-rel_type "membership_rel"
Index: openacs-4/packages/contacts/www/contact-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact-add.tcl,v
diff -u -r1.55 -r1.56
--- openacs-4/packages/contacts/www/contact-add.tcl 18 Jun 2007 03:20:45 -0000 1.55
+++ openacs-4/packages/contacts/www/contact-add.tcl 26 Jun 2007 02:53:13 -0000 1.56
@@ -291,7 +291,7 @@
set cat_ids [list]
foreach group_id $group_ids {
- group::add_member \
+ contact::group::add_member \
-group_id $group_id \
-user_id $person_party_id \
-rel_type "membership_rel"
@@ -316,11 +316,10 @@
foreach group_id $group_ids {
if {![empty_string_p $group_id]} {
-
- # relation-add does not work as there is no
- # special procedure for organizations at the moment.
- set rel_id [db_string insert_rels { select acs_rel__new (NULL::integer,'organization_rel',:group_id,:organization_party_id,NULL,:user_id,:peeraddr) as org_rel_id }]
- db_dml insert_state { insert into membership_rels (rel_id,member_state) values (:rel_id,'approved') }
+ contact::group::add_member \
+ -group_id $group_id \
+ -user_id $organization_party_id \
+ -rel_type "organization_rel"
}
}
Index: openacs-4/packages/contacts/www/group-parties-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/group-parties-add.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/contacts/www/group-parties-add.tcl 1 May 2006 19:58:01 -0000 1.8
+++ openacs-4/packages/contacts/www/group-parties-add.tcl 26 Jun 2007 02:53:13 -0000 1.9
@@ -67,38 +67,7 @@
db_transaction {
foreach group_id $group_ids {
foreach party_id $party_ids {
-
- switch [contact::type -party_id $party_id] {
- person - user {
- set rel_type "membership_rel"
- }
- organization {
- # Execute the callback for the organization depending on the group they are added to.
- # We use this callback to add the organization to .LRN if it is a Customer
- callback contact::organization_new_group -organization_id $party_id -group_id $group_id
- set rel_type "organization_rel"
- }
- }
-
- # relation-add does not work as there is no
- # special procedure for organizations at
- # the moment.
- set existing_rel_id [db_string rel_exists {
- select rel_id
- from acs_rels
- where rel_type = :rel_type
- and object_id_one = :group_id
- and object_id_two = :party_id
- } -default {}]
-
- if { [empty_string_p $existing_rel_id] } {
- set rel_id [db_string insert_rels { select acs_rel__new (NULL::integer,:rel_type,:group_id,:party_id,NULL,:user_id,:peeraddr) as org_rel_id }]
- db_dml insert_state { insert into membership_rels (rel_id,member_state) values (:rel_id,'approved') }
- } else {
- # we approve the existing rel which may not be approved
- db_dml update_state { update membership_rels set member_state = 'approved' where rel_id = :existing_rel_id }
- }
-
+ contact::group::add_member -group_id $group_id -user_id $party_id -member_state "approved"
}
}
}
Index: openacs-4/packages/contacts/www/group-party-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/group-party-add.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/contacts/www/group-party-add.tcl 29 May 2006 21:50:19 -0000 1.9
+++ openacs-4/packages/contacts/www/group-party-add.tcl 26 Jun 2007 02:53:13 -0000 1.10
@@ -24,23 +24,27 @@
set rel_type "membership_rel"
}
}
+
+
+
+set rel_id [relation::get_id -object_id_one $group_id -object_id_two $party_id -rel_type $rel_type]
+
if {$rel_type == "organization_rel"} {
- set user_id [ad_conn user_id]
- set ip_addr [ad_conn peeraddr]
- set rel_id [db_exec_plsql add_organization_rel {}]
- db_dml insert_state {}
-
- # Execute the callback for the organization depending on the group they are added to.
- # We use this callback to add the organization to .LRN if it is a Customer
- callback contact::organization_new_group -organization_id $party_id -group_id $group_id
-
+ if { [exists_and_not_null rel_id] } {
+ # this relationship was previously deleted and needs to be approved
+ db_dml update_state {}
+ } else {
+ contact::group::add_member -group_id $group_id -user_id $party_id -rel_type $rel_type
+ # Execute the callback for the organization depending on the group they are added to.
+ # We use this callback to add the organization to .LRN if it is a Customer
+ callback contact::organization_new_group -organization_id $party_id -group_id $group_id
+ }
} else {
- set rel_id [relation::get_id -object_id_one $group_id -object_id_two $party_id -rel_type "membership_rel"]
if { [exists_and_not_null rel_id] } {
# this relationship was previously deleted and needs to be approved
db_dml update_state {}
} else {
- group::add_member \
+ contact::group::add_member \
-group_id $group_id \
-user_id $party_id \
-rel_type membership_rel
Index: openacs-4/packages/contacts/www/group-party-add.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/group-party-add.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/contacts/www/group-party-add.xql 20 Feb 2006 10:36:33 -0000 1.2
+++ openacs-4/packages/contacts/www/group-party-add.xql 26 Jun 2007 02:53:13 -0000 1.3
@@ -1,12 +1,6 @@
<?xml version="1.0"?>
<queryset>
-<fullquery name="insert_state">
- <querytext>
- insert into membership_rels (rel_id,member_state) values (:rel_id,'approved')
- </querytext>
-</fullquery>
-
<fullquery name="update_state">
<querytext>
update membership_rels set member_state = 'approved' where rel_id = :rel_id