Index: openacs-4/packages/photo-album/photo-album.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/photo-album.info,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/photo-album/photo-album.info	26 Jun 2003 02:45:08 -0000	1.6
+++ openacs-4/packages/photo-album/photo-album.info	26 Sep 2003 14:25:22 -0000	1.7
@@ -7,24 +7,20 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="4.6.2" url="http://xarg.net/download/photo-album-4.6.2.apm">
-    <database-support>
-        <database>oracle</database>
-        <database>postgresql</database>
-    </database-support>
+    <version name="4.6.3" url="http://xarg.net/download/photo-album-4.6.3.apm">
         <owner url="mailto:davis@xarg.net">Jeff Davis</owner>
         <owner url="mailto:wtem@olywa.net">Walter McGinnis</owner>
         <owner>Tom Baginski</owner>
-        <summary>A photo album application that provides photo display
+        <summary>A photo album application that provides photo display
 and grouping functionality using the ACS Content Repository.</summary>
-        <release-date>2003-06-25</release-date>
+        <release-date>2003-09-26</release-date>
         <vendor url="http://xarg.net/">OpenACS</vendor>
         <description format="text/plain">A photo album application that provides photo display and grouping
 functionality using the ACS Content Repository.
 
-Allows users to upload photos, store and edit attributes, and group
-photos into albums and folders.  Allows site administrators to set
-permissions that control who can do and see what within a photo album
+Allows users to upload photos, store and edit attributes, and group
+photos into albums and folders.  Allows site administrators to set
+permissions that control who can do and see what within a photo album
 application.  Includes sub-site support.
 
 Requires installation of ImageMagick and jhead on host machine.  See design doc
@@ -34,24 +30,25 @@
 Heavily modified from the original Ars Digita version by
 davis@xarg.net.</description>
 
-        <provides url="photo-album" version="4.6.1" />
+        <provides url="photo-album" version="4.6.3"/>
         <requires url="acs-content-repository" version="4.1"/>
         <requires url="acs-kernel" version="4.6.2"/>
         <requires url="acs-templating" version="4.1"/>
 
         <callbacks>
         </callbacks>
         <parameters>
-            <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"/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ThumbnailSize"  default="150x150" description="Max Dimension for thumbnail image"/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ViewerSize"  default="700x500" description="Max Dimension for viewer image"/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ThumbnailsPerPage"  default="12" description="Number of thumbnail images to be displayed per album page"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="PrivilegeForCreator"  default="admin" description="CSV of privileges to grant to creators of new objects within photo album"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="AcceptableUploadMIMETypes"  default="image/jpeg,image/gif" description="CSV of acceptable MIME Types for Photo Upload"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DefaultRootFolderPrivileges"  default="the_public read registered_users pa_create_album registered_users pa_create_folder" description="List of grantee privilege pairs for new root folders.  Grantee is either an integer or function that returns a party_id.  Format as a space separated listlist"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="FullTempPhotoDir"  default="/tmp/photo-album" description="Absolute path from computer root to path for temporary photos."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="AllowBasePhotoAccessP"  default="t" description="If set to t, users are presented a link to display the full sized base image from photo page."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="CheckPermissionOnImageServeP"  default="f" description="If set to t, the index.vuh file in the images directory runs a query to check if user has read access to photo prior to serving it.  Note, setting to t can impact performance on high volume sites."/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DefaultRootFolderPrivileges"  default="the_public read registered_users pa_create_album registered_users pa_create_folder" description="List of grantee privilege pairs for new root folders.  Grantee is either an integer or function that returns a party_id.  Format as a space separated listlist"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="FullTempPhotoDir"  default="/tmp/photo-album" description="Absolute path from computer root to path for temporary photos."/>
+            <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"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="PrivilegeForCreator"  default="admin" description="CSV of privileges to grant to creators of new objects within photo album"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ShowShutterflyLinkP"  default="f" description="Set to t if you want to allow users to send selected photos to Shutterfly.com, a for-profit photo-printing service."/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ThumbnailSize"  default="150x150" description="Max Dimension for thumbnail image"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ThumbnailsPerPage"  default="12" description="Number of thumbnail images to be displayed per album page"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ViewerSize"  default="700x500" description="Max Dimension for viewer image"/>
         </parameters>
 
     </version>
Index: openacs-4/packages/photo-album/www/clipboard-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/clipboard-view.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/photo-album/www/clipboard-view.adp	10 Jun 2003 10:07:11 -0000	1.1
+++ openacs-4/packages/photo-album/www/clipboard-view.adp	26 Sep 2003 14:25:22 -0000	1.2
@@ -4,9 +4,14 @@
 
 
     <p>
-    <form action="http://www.shutterfly.com/c4p/UpdateCart.jsp" method="POST">
       Clipboard: <strong>@title@</strong> <if @owner_id@ ne
         @user_id@>(<a href="/shared/community-member?user_id=@owner_id@">@owner_name@</a>)</if>
+    </p>
+
+    <p>
+
+    <if @shutterfly_p@ eq "t">
+    <form action="http://www.shutterfly.com/c4p/UpdateCart.jsp" method="POST">
       <input type="hidden" name="addim" value="1" />
       <input type="hidden" name="protocol" value="SFP,100" />
       <input type="hidden" name="pid" value="C4PP" />
@@ -24,6 +29,7 @@
       <input type="hidden" name="returl" value="@returnurl@">
       <input type="submit" value="Order prints">
     </form>
+    </if>
 
     </p>
     <if @images:rowcount@ lt 1> 
Index: openacs-4/packages/photo-album/www/clipboard-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/clipboard-view.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/photo-album/www/clipboard-view.tcl	30 Jun 2003 07:53:56 -0000	1.3
+++ openacs-4/packages/photo-album/www/clipboard-view.tcl	26 Sep 2003 14:25:22 -0000	1.4
@@ -14,6 +14,7 @@
     user_id:onevalue
     base_url:onevalue
     images:multirow
+    shutterfly_p:onevalue
 }
 
 set user_id [ad_conn user_id]
@@ -40,5 +41,7 @@
    and f.relation_tag = 'base'
 }
 
+set shutterfly_p [parameter::get -parameter ShowShutterflyLinkP -default f]
+
 set returnurl "[ad_url][ad_conn package_url]"
 set base_url  "[ad_url][ad_conn package_url]images/"
Index: openacs-4/packages/photo-album/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/index.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/photo-album/www/index.adp	10 Jun 2003 10:07:11 -0000	1.1
+++ openacs-4/packages/photo-album/www/index.adp	26 Sep 2003 14:25:22 -0000	1.2
@@ -56,9 +56,12 @@
 <p><a href="clipboards">View all of your clipboards</a>.</p>
 </if>
 
+<if @shutterfly_p@ eq "t">
     <p class="hint">
       To order prints of these photos you will first need to add them
       to a clipboard (you can do this when viewing an individual
       photo).  Once they are in a clipboard you can send them off to
       <a href="http://shutterfly.com">shutterfly.com</a> for
       printing from a <a href="clipboards">clipboard</a> screen.
+    </p>
+</if>
Index: openacs-4/packages/photo-album/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/index.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/photo-album/www/index.tcl	17 Jun 2003 13:51:21 -0000	1.3
+++ openacs-4/packages/photo-album/www/index.tcl	26 Sep 2003 14:25:22 -0000	1.4
@@ -26,6 +26,7 @@
     move_p:onevalue
     delete_p:onevalue
     child:multirow
+    shutterfly_p:onevalue
 }
 
 
@@ -54,3 +55,4 @@
 
 set collections [db_string collections {select count(*) from pa_collections where owner_id = :user_id}]
 
+set shutterfly_p [parameter::get -parameter ShowShutterflyLinkP -default f]