Index: openacs-4/packages/acs-subsite/acs-subsite.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/acs-subsite.info,v
diff -u -r1.70 -r1.71
--- openacs-4/packages/acs-subsite/acs-subsite.info	13 Jan 2005 13:55:30 -0000	1.70
+++ openacs-4/packages/acs-subsite/acs-subsite.info	14 Jan 2005 15:01:29 -0000	1.71
@@ -6,25 +6,27 @@
     <pretty-plural>Subsite Services</pretty-plural>
     <initial-install-p>t</initial-install-p>
     <singleton-p>f</singleton-p>
-
-    <version name="5.2.0d2" url="http://openacs.org/repository/download/apm/acs-subsite-5.2.0d2.apm">
+    
+    <version name="5.2.0d3" url="http://openacs.org/repository/download/apm/acs-subsite-5.2.0d2.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Subsite</summary>
-        <release-date>2005-01-09</release-date>
-        <maturity>3</maturity>
+        <release-date>2005-01-14</release-date>
+	<maturity>3</maturity>	
         <vendor url="http://openacs.org">OpenACS</vendor>
-	<license url="http://www.gnu.org/copyleft/gpl.html">GPL</license>
-	<maturity>3</maturity>
         <description format="text/html">Provides for creating subsites within the OpenACS Community System.  Aware of parties, groups, users, portraits.  Can be themed via a per subsite master template.</description>
+        <license>GPL</license>
+        <maturity>3</maturity>
+
         <provides url="acs-subsite" version="5.2.0d2"/>
         <requires url="acs-content-repository" version="5.2.0d1"/>
         <requires url="acs-kernel" version="5.2.0d3"/>
         <requires url="acs-tcl" version="5.2.0d1"/>
 
         <callbacks>
-            <callback type="before-upgrade"  proc="subsite::before_upgrade"/>
+            <callback type="after-install"  proc="email_image::create_type_folder_rel"/>
             <callback type="after-mount"  proc="subsite::after_mount"/>
             <callback type="before-uninstantiate"  proc="subsite::before_uninstantiate"/>
+            <callback type="before-upgrade"  proc="subsite::before_upgrade"/>
         </callbacks>
         <parameters>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="AcceptablePortraitMIMETypes"  default="image/gif image/jpeg" description="Enter a set of acceptable MIME types for portrait submissions." section_name="user-info"/>
@@ -36,13 +38,14 @@
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="EmailForgottenPasswordP"  default="1" description="Email users forgotten passwords" section_name="user-login"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="EmailRegistrationConfirmationToUserP"  default="0" description="send confirmation email to user after registration" section_name="user-login"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="GlobalURLStub"  default="/global" description="Where is the global directory for such things as file-not-found error messages"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="IndexRedirectUrl"  description="A URL to redirect to instead of showing the subsite index page. Useful if you want to replace the index page with a page generated by portals, by edit-this-page, or to one of the applications installed at the subsite."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="IndexInternalRedirectUrl"  description="If non-blank and IndexRedirectUrl is blank, serve the given template rather than the default index template, but with an rp_internal_redirect. Value is relative to serverroot. Example: /packages/dotlrn/index"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="IndexRedirectUrl"  description="A URL to redirect to instead of showing the subsite index page. Useful if you want to replace the index page with a page generated by portals, by edit-this-page, or to one of the applications installed at the subsite."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="LastVisitUpdateInterval"  default="600" description="how many seconds old a last visit cookie must be before we update it"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="MaxPortraitBytes"  default="200000" description="Maximum portrait size in bytes. Leave empty for no limitation." section_name="user-info"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="MembersCanInviteMembersP"  default="0" description="Set this to 1 if you want to allow members to invite other members." section_name="user-info"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="NewRegistrationEmailAddress"  default="admin@yourdomain.com" description="Where should we send email about new registrations (defaults to SystemOwner)" section_name="user-login"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="NotifyAdminOfNewRegistrationsP"  default="0" description="Notify someone of new registrations?" section_name="user-login"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="PrivateEmailLevelP"  default="4" description="Defines the level of privacy of the users email. The levels are: 4 - Show user email. 3 - Show user email as an image (require ImageMagick). If ImageMagick not present then the @ symbol is replaced with an image. 2 - Hide email, show a link that allows users to send a message. 1 -  Shows nothing." section_name="user-info"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RegistrationProvidesRandomPasswordP"  default="0" description="have the system generate a random password instead of the user" section_name="user-login"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RegistrationRequiresApprovalP"  default="0" description="set this to 1 if user does not go live immediately" section_name="user-login"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RegistrationRequiresEmailVerificationP"  default="0" description="set this to 1 if the user has to receive and email and come back to the site" section_name="user-login"/>
@@ -60,7 +63,3 @@
 
     </version>
 </package>
-
-
-
-