Index: openacs-4/packages/contacts/contacts.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/contacts.info,v
diff -u -r1.63 -r1.64
--- openacs-4/packages/contacts/contacts.info	10 Feb 2006 01:32:22 -0000	1.63
+++ openacs-4/packages/contacts/contacts.info	15 Feb 2006 10:06:35 -0000	1.64
@@ -5,19 +5,19 @@
     <package-name>Contacts</package-name>
     <pretty-plural>Contacts</pretty-plural>
     <initial-install-p>f</initial-install-p>
-    <singleton-p>t</singleton-p>
+    <singleton-p>f</singleton-p>
     
-    <version name="1.2b3" url="http://openacs.org/repository/download/apm/contacts-1.2b3.apm">
+    <version name="1.2b4" url="http://openacs.org/repository/download/apm/contacts-1.2b4.apm">
         <owner url="mailto:openacs@geddert.com">Matthew Geddert</owner>
         <summary>This application lets you collaboratively view, edit and categorize contacts.</summary>
         <release-date>2005-11-23</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 &quot;belongs&quot; 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.2b3"/>
-        <requires url="acs-tcl" version="5.2.0b3"/>
-        <requires url="acs-datetime" version="4.2"/>
+        <provides url="contacts" version="1.2b4"/>
+        <requires url="acs-datetime" version="4.1"/>
         <requires url="acs-events" version="0.5d3"/>
+        <requires url="acs-tcl" version="5.2.0b3"/>
         <requires url="ams" version="1.1d13"/>
         <requires url="categories" version="1.0d6"/>
         <requires url="general-comments" version="4.1"/>
@@ -26,11 +26,10 @@
 
         <callbacks>
             <callback type="after-install"  proc="contacts::install::package_install"/>
-            <callback type="after-upgrade"  proc="contacts::install::package_upgrade"/>
             <callback type="after-instantiate"  proc="contacts::install::package_instantiate"/>
+            <callback type="after-upgrade"  proc="contacts::install::package_upgrade"/>
         </callbacks>
         <parameters>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DefaultOrganizationID"  default="0" description="Organization ID of the organization running this site"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="AcceptableFileUploadMIMETypes"  default="*" description="* for any. CSV of acceptable MIME Types for File Upload" section_name="File Upload"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="AcceptablePhotoUploadMIMETypes"  default="image/jpeg,image/gif,image/png,image/bmp,image/tiff" description="CSV of acceptable MIME Types for Photo Upload" section_name="Photos"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="AddEditComplaint"  default="/packages/contacts/templates/ae-complaint" description="The template for the display of the complaint form" section_name="Portal Templates"/>
@@ -47,6 +46,7 @@
 " section_name="Templates"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ConverttoJpg"  default="1" description="0 for no, 1 for yes. Flag to convert images to jpegs automatically" section_name="Photos"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DefaultOrganizationAttributeExtension"  description="List of names of the attributes that will extend a search for Organization separated by &quot;;&quot;." section_name="Attribute Extensions"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DefaultOrganizationID"  default="0" description="Organization ID of the organization running this site"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="DefaultPageSize"  default="50" description="The default page size for this contacts instance. Acceptable values are 0, 25, 50, 100 or 500. If set to 0 there will be no pagination which can be incredibly slow when you have more than a few hundred contacts."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DefaultPersonAttributeExtension"  description="List of names of the attributes that will extended a search for a Person separated by &quot;;&quot;." section_name="Attribute Extensions"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DefaultPersonOrganAttributeExtension"  description="List names of the attributes that will extend a search for a person or an organization separated by &quot;;&quot;." section_name="Attribute Extensions"/>
@@ -58,16 +58,18 @@
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ForceSearchBeforeAdd"  default="0" description="1 for yes, 0 for no. Should we force users to search all contacts before they are allowed to add a person or organization? This is not an actual software force but the &quot;add person&quot; and &quot;add organization&quot; buttons will only be displayed after a search on &quot;all contacts.&quot;"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="History"  default="/packages/contacts/templates/history" description="The template src for history page" section_name="Portal Templates"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ImageMagickPath"  default="/usr/local/bin" description="Absolute path from computer root to directory containing ImageMagick executables" section_name="Photos"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="IncludeChildPackages"  default="0" description="Default '0'. Set to '1' to include child contacts instances contacts in searches for this package."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="Index"  default="/packages/contacts/templates/index" description="The template src for the index page" section_name="Portal Templates"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="LogEmailsP"  default="t" description="Boolean that indicates if messages of type &quot;email&quot; are going to be logged or not on the contact_message_log"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="MailingAddressAttributeIdOrder"  description="A list of attribute_ids for postal addresses in order of priority. In doing a letter mail merge the first attribute_id in this list that a contact has a value for will be used as the mailing address. If no attribute_ids are specified all postal_address attribute_ids will be used in alphabetical order."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="Message"  default="/packages/contacts/templates/message" description="The template src for the message page" section_name="Portal Templates"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="OOMailingPath"  default="/packages//contacts/templates/oo-mailing" description="The directory that contains all files needed for a proper OO mailing. This is the document.odt, content.xml, styles.xml and the banner directory" section_name="Templates"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="PortraitSize"  default="200x200" description="Max dimensions for portrait" section_name="Photos"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="PortraitThumbnailSize"  default="50x50" description="Max dimensions of portrait thumbnail" section_name="Photos"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RequireAdminForTemplatesP"  default="0" description="Do we allow users to create templates in the system. If set to 1, only admins can create templates." section_name="Templates"/>
             <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="string"  min_n_values="1"  max_n_values="1"  name="OOMailingPath"  default="/packages//contacts/templates/oo-mailing" description="The directory that contains all files needed for a proper OO mailing. This is the document.odt, content.xml, styles.xml and the banner directory" section_name="Templates"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RequireAdminForTemplatesP"  default="0" description="Do we allow users to create templates in the system. If set to 1, only admins can create templates." section_name="Templates"/>
+            <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."/>
         </parameters>
 
     </version>