Index: openacs-4/contrib/obsolete-packages/postcard/www/confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/postcard/www/confirm.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/postcard/www/confirm.adp	21 Aug 2001 22:22:29 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/postcard/www/confirm.adp	28 Aug 2002 07:51:18 -0000	1.3
@@ -8,7 +8,6 @@
 <form action=send-card method=post>
 <%= [export_form_vars image_id] %>
 <%= [export_form_vars recipient] %>
-<%= [export_form_vars sender] %>
 <%= [export_form_vars subject] %>
 <%= [export_form_vars message] %>
 <%= [export_form_vars card_id] %>
@@ -22,7 +21,7 @@
   </tr>
   <tr>
      <td align=right>
-     From: @sender@
+     From: @email@
      </td>
   </tr>
   <tr>
Index: openacs-4/contrib/obsolete-packages/postcard/www/confirm.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/postcard/www/confirm.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/postcard/www/confirm.tcl	21 Aug 2001 22:52:06 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/postcard/www/confirm.tcl	28 Aug 2002 07:51:18 -0000	1.4
@@ -9,7 +9,6 @@
 } {
   card_id:integer,notnull
   image_id:integer,notnull
-  sender:notnull
   recipient:notnull
   subject:notnull
   message:notnull
@@ -24,6 +23,8 @@
 
 # Insert a new postcard in the database, set card_id to the card id value
 ad_require_permission [ad_conn package_id] "postcard_create_card"
+ad_get_user_info
+set sender $email
 
 ad_return_template
 
Index: openacs-4/contrib/obsolete-packages/postcard/www/send-card.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/postcard/www/send-card.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/postcard/www/send-card.tcl	21 Aug 2001 22:22:29 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/postcard/www/send-card.tcl	28 Aug 2002 07:51:18 -0000	1.3
@@ -9,7 +9,6 @@
 } {
   card_id:integer,notnull
   image_id:integer,notnull
-  sender:notnull
   recipient:notnull
   subject:notnull
   message:notnull
@@ -23,6 +22,10 @@
 
 set pickup_code [ns_crypt $card_id foobar]
 
+# Don't take the email from the poster. Pull it out of the db instead.
+ad_get_user_info
+set sender $email
+
 db_transaction {
 
     db_dml add_message {
@@ -51,7 +54,7 @@
 }
 
 set message  "
-You have received a postcard from $sender.
+You have received a postcard from $first_names $last_name ($sender).
 
 You may go to $url to pick up your card!
 
Index: openacs-4/contrib/obsolete-packages/postcard/www/write-card.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/postcard/www/write-card.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/postcard/www/write-card.adp	21 Aug 2001 22:22:29 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/postcard/www/write-card.adp	28 Aug 2002 07:51:18 -0000	1.3
@@ -18,13 +18,6 @@
   </tr>
   <tr>
      <td align=right>
-     From: (email address)
-     <td>
-     <input type=text name=sender>
-     </td>
-  </tr>
-  <tr>
-     <td align=right>
      Subject
      <td>
      <input type=text name=subject>
Index: openacs-4/packages/postcard/www/confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/postcard/www/confirm.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/postcard/www/confirm.adp	21 Aug 2001 22:22:29 -0000	1.2
+++ openacs-4/packages/postcard/www/confirm.adp	28 Aug 2002 07:51:18 -0000	1.3
@@ -8,7 +8,6 @@
 <form action=send-card method=post>
 <%= [export_form_vars image_id] %>
 <%= [export_form_vars recipient] %>
-<%= [export_form_vars sender] %>
 <%= [export_form_vars subject] %>
 <%= [export_form_vars message] %>
 <%= [export_form_vars card_id] %>
@@ -22,7 +21,7 @@
   </tr>
   <tr>
      <td align=right>
-     From: @sender@
+     From: @email@
      </td>
   </tr>
   <tr>
Index: openacs-4/packages/postcard/www/confirm.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/postcard/www/confirm.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/postcard/www/confirm.tcl	21 Aug 2001 22:52:06 -0000	1.3
+++ openacs-4/packages/postcard/www/confirm.tcl	28 Aug 2002 07:51:18 -0000	1.4
@@ -9,7 +9,6 @@
 } {
   card_id:integer,notnull
   image_id:integer,notnull
-  sender:notnull
   recipient:notnull
   subject:notnull
   message:notnull
@@ -24,6 +23,8 @@
 
 # Insert a new postcard in the database, set card_id to the card id value
 ad_require_permission [ad_conn package_id] "postcard_create_card"
+ad_get_user_info
+set sender $email
 
 ad_return_template
 
Index: openacs-4/packages/postcard/www/send-card.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/postcard/www/send-card.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/postcard/www/send-card.tcl	21 Aug 2001 22:22:29 -0000	1.2
+++ openacs-4/packages/postcard/www/send-card.tcl	28 Aug 2002 07:51:18 -0000	1.3
@@ -9,7 +9,6 @@
 } {
   card_id:integer,notnull
   image_id:integer,notnull
-  sender:notnull
   recipient:notnull
   subject:notnull
   message:notnull
@@ -23,6 +22,10 @@
 
 set pickup_code [ns_crypt $card_id foobar]
 
+# Don't take the email from the poster. Pull it out of the db instead.
+ad_get_user_info
+set sender $email
+
 db_transaction {
 
     db_dml add_message {
@@ -51,7 +54,7 @@
 }
 
 set message  "
-You have received a postcard from $sender.
+You have received a postcard from $first_names $last_name ($sender).
 
 You may go to $url to pick up your card!
 
Index: openacs-4/packages/postcard/www/write-card.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/postcard/www/write-card.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/postcard/www/write-card.adp	21 Aug 2001 22:22:29 -0000	1.2
+++ openacs-4/packages/postcard/www/write-card.adp	28 Aug 2002 07:51:18 -0000	1.3
@@ -18,13 +18,6 @@
   </tr>
   <tr>
      <td align=right>
-     From: (email address)
-     <td>
-     <input type=text name=sender>
-     </td>
-  </tr>
-  <tr>
-     <td align=right>
      Subject
      <td>
      <input type=text name=subject>