Index: openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.adp,v diff -u -r1.7 -r1.8 --- openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.adp 14 May 2007 20:30:25 -0000 1.7 +++ openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.adp 21 Nov 2007 17:01:55 -0000 1.8 @@ -2,18 +2,18 @@ #acs-subsite.lt_Edit_comment_for_the_# @context;noquote@ +
-@export_vars;noquote@ -#acs-subsite.Story_behind_photo#:
+
@export_vars;noquote@
+

#acs-subsite.Story_behind_photo#:

+

+

-

-
+

-

+

- - - +
Index: openacs-4/packages/acs-subsite/www/user/portrait/erase.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/erase.adp,v diff -u -r1.6 -r1.7 --- openacs-4/packages/acs-subsite/www/user/portrait/erase.adp 11 Sep 2007 09:44:47 -0000 1.6 +++ openacs-4/packages/acs-subsite/www/user/portrait/erase.adp 21 Nov 2007 17:01:55 -0000 1.7 @@ -9,10 +9,11 @@

#acs-subsite.lt_Sure_erase_user_por#

+
-@export_vars;noquote@ -
- -
+
@export_vars;noquote@
+

+ +

- +
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 -r1.10 -r1.11 --- openacs-4/packages/acs-subsite/www/user/portrait/index.adp 29 Jun 2004 10:17:43 -0000 1.10 +++ openacs-4/packages/acs-subsite/www/user/portrait/index.adp 21 Nov 2007 17:01:55 -0000 1.11 @@ -9,17 +9,14 @@

#acs-subsite.lt_This_is_the_image_that#:

-
- -
+
+Portrait of @first_names@ @last_name@ +
@@ -37,15 +34,18 @@ -#acs-subsite.lt_We_cant_find_you# +

#acs-subsite.lt_We_cant_find_you#

+

#acs-subsite.lt_The_picture_of_you_in# #acs-subsite.upload# #acs-subsite.another_picture# +

+

#acs-subsite.lt_This_user_doesnt_have# #acs-subsite.go_upload_the_users_por#. @@ -54,6 +54,7 @@ #acs-subsite.You_dont_have_a_portrait# #acs-subsite.go_upload_your_portrait#. +

Index: openacs-4/packages/acs-subsite/www/user/portrait/upload.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/upload.adp,v diff -u -r1.7 -r1.8 --- openacs-4/packages/acs-subsite/www/user/portrait/upload.adp 29 May 2007 05:37:25 -0000 1.7 +++ openacs-4/packages/acs-subsite/www/user/portrait/upload.adp 21 Nov 2007 17:01:55 -0000 1.8 @@ -2,20 +2,19 @@ #acs-subsite.Upload_Portrait# @context;noquote@ -#acs-subsite.lt_How_would_you_like_the# -

+

#acs-subsite.lt_How_would_you_like_the#

-#acs-subsite.lt_Upload_your_favorite# +

#acs-subsite.lt_Upload_your_favorite#

-
+
-@export_vars;noquote@ +
@export_vars;noquote@
@@ -25,23 +24,22 @@
- +Your portrait
(Delete Portrait)
#acs-subsite.Filename#:
-#acs-subsite.lt_Use_the_Browse_button# +#acs-subsite.lt_Use_the_Browse_button#
#acs-subsite.Story_Behind_Photo#
-#acs-subsite.optional# +#acs-subsite.optional#
-

-

+

-

+

-
+ Index: openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl 29 May 2007 05:37:25 -0000 1.7 +++ openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl 21 Nov 2007 17:01:55 -0000 1.8 @@ -15,17 +15,11 @@ set current_user_id [ad_conn user_id] -set portrait_p [db_0or1row "checkportrait" {SELECT live_revision as revision_id, item_id - FROM acs_rels a, cr_items c - WHERE a.object_id_two = c.item_id - AND a.rel_type = 'user_portrait_rel' - AND a.object_id_one = :current_user_id - AND c.live_revision is not NULL -} ] +set portrait_p [db_0or1row "checkportrait" {}] if { $portrait_p } { - set story [db_string "getstory" "select description from cr_revisions where revision_id = :revision_id"] + set story [db_string "getstory" {}] } else { set story "" set revision_id "" @@ -41,10 +35,7 @@ ad_require_permission $user_id "write" -if {![db_0or1row name "select - first_names, last_name -from persons -where person_id=:user_id"]} { +if {![db_0or1row get_name {}]} { ad_return_error "Account Unavailable" "We can't find you (user #$user_id) in the users table. Probably your account was deleted for some reason." return }