Index: openacs-4/packages/acs-subsite/www/user/basic-info-update-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/Attic/basic-info-update-oracle.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/www/user/basic-info-update-oracle.xql	30 Jul 2003 22:44:51 -0000	1.1.2.1
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+
+<queryset>
+    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+
+<fullquery name="get_portrait_info">
+      <querytext>
+    
+    select cr.publish_date, nvl(cr.title,'your portrait') as portrait_title
+    from cr_revisions cr, cr_items ci, acs_rels a
+    where cr.revision_id = ci.live_revision
+    and  ci.item_id = a.object_id_two
+    and a.object_id_one = :user_id
+    and a.rel_type = 'user_portrait_rel'
+      
+      </querytext>
+</fullquery>
+
+</queryset>
Index: openacs-4/packages/acs-subsite/www/user/basic-info-update-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/Attic/basic-info-update-postgresql.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/www/user/basic-info-update-postgresql.xql	30 Jul 2003 22:44:51 -0000	1.1.2.1
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+
+<queryset>
+    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+<fullquery name="get_portrait_info">
+      <querytext>
+    
+    select cr.publish_date, coalesce(cr.title,'your portrait') as portrait_title
+    from cr_revisions cr, cr_items ci, acs_rels a
+    where cr.revision_id = ci.live_revision
+    and  ci.item_id = a.object_id_two
+    and a.object_id_one = :user_id
+    and a.rel_type = 'user_portrait_rel'
+      
+      </querytext>
+</fullquery>
+
+</queryset>
Index: openacs-4/packages/acs-subsite/www/user/basic-info-update.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/basic-info-update.adp,v
diff -u -N -r1.3 -r1.3.2.1
--- openacs-4/packages/acs-subsite/www/user/basic-info-update.adp	6 Sep 2002 21:50:12 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/user/basic-info-update.adp	30 Jul 2003 22:44:51 -0000	1.3.2.1
@@ -27,4 +27,14 @@
 <input type=submit value="Update">
 </center></p>
 
+<if @portrait_state@ eq upload>
 
+<a href="/user/portrait/upload">Upload a Portrait</a>
+
+</if>
+<if @portrait_state@ eq show>
+
+On @portrait_publish_date@, you uploaded <a href="/user/portrait/">@portrait_title@</a>.
+
+</if>
+
Index: openacs-4/packages/acs-subsite/www/user/basic-info-update.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/basic-info-update.tcl,v
diff -u -N -r1.2.2.1 -r1.2.2.2
--- openacs-4/packages/acs-subsite/www/user/basic-info-update.tcl	4 Jul 2003 13:30:31 -0000	1.2.2.1
+++ openacs-4/packages/acs-subsite/www/user/basic-info-update.tcl	30 Jul 2003 22:44:51 -0000	1.2.2.2
@@ -37,3 +37,16 @@
 set site_link [ad_site_home_link]
 set export_vars [export_form_vars return_url user_id]
 
+# moved from acs-subsite/www/pvt/home.tcl
+if [ad_parameter SolicitPortraitP "user-info" 0] {
+    # we have portraits for some users
+    if ![db_0or1row get_portrait_info ""] {
+        set portrait_state "upload"
+    } else {
+        set portrait_state "show"
+        set portrait_publish_date [util_AnsiDatetoPrettyDate $publish_date]
+    }
+} else {
+    set portrait_state "none"
+}
+
Index: openacs-4/packages/acs-subsite/www/user/portrait/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/index.adp,v
diff -u -N -r1.4 -r1.4.2.1
--- openacs-4/packages/acs-subsite/www/user/portrait/index.adp	9 Sep 2002 13:52:21 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/user/portrait/index.adp	30 Jul 2003 22:44:51 -0000	1.4.2.1
@@ -2,14 +2,14 @@
 <property name="title">Portrait of @first_names@ @last_name@</property>
 <property name="context">@context@</property>
 
+<if @admin_p@ eq 1>
 <p>This is the image that we show to other users at @system_name@:</p>
+</if>
 
 <center>
 <img @widthheight@ src="/shared/portrait-bits.tcl?@export_vars@">
 </center>
 
-Data:
-
 <ul>
 <li>Uploaded:  @pretty_date@</li>
 <li>Comment: 
@@ -19,6 +19,7 @@
 </li>
 </ul>
 
+<if @admin_p@ eq 1>
 Options:
 
 <ul>
@@ -28,5 +29,4 @@
 <li><a href="erase?@export_edit_vars@">erase portrait</a></li>
 
 </ul>
-
-
+</if>
Index: openacs-4/packages/acs-subsite/www/user/portrait/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/index.tcl,v
diff -u -N -r1.3 -r1.3.2.1
--- openacs-4/packages/acs-subsite/www/user/portrait/index.tcl	18 Sep 2002 14:54:54 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/user/portrait/index.tcl	30 Jul 2003 22:44:51 -0000	1.3.2.1
@@ -23,12 +23,15 @@
 
 if [empty_string_p $user_id] {
     set user_id $current_user_id
-    set admin_p 0
-} else {
+}
+
+if { $current_user_id == $user_id } {
     set admin_p 1
+    ad_require_permission $user_id "write"
+} else {
+    set admin_p 0
 }
 
-ad_require_permission $user_id "write"
 
 if ![db_0or1row user_info "select 
   first_names, 
@@ -95,4 +98,4 @@
 set pretty_date [util_AnsiDatetoPrettyDate $publish_date]
 set export_edit_vars [export_url_vars user_id return_url]
 
-ad_return_template
\ No newline at end of file
+ad_return_template