Index: openacs-4/packages/contacts/contacts.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/contacts.info,v
diff -u -r1.88 -r1.89
--- openacs-4/packages/contacts/contacts.info	23 Jan 2007 18:23:19 -0000	1.88
+++ openacs-4/packages/contacts/contacts.info	2 Feb 2007 11:24:56 -0000	1.89
@@ -7,17 +7,18 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="1.2b27" url="http://openacs.org/repository/download/apm/contacts-1.2b27.apm">
+    <version name="1.2b28" url="http://openacs.org/repository/download/apm/contacts-1.2b28.apm">
         <owner url="mailto:openacs@geddert.com">Matthew Geddert</owner>
         <summary>This application lets you collaboratively view, edit and categorize contacts.</summary>
         <release-date>2006-06-25</release-date>
         <description format="text/plain">Contacts is an application for managing all those people and or organization you need to keep track of. It has a complete UI for storing and categorizing contacts. Each contact can have an arbitrary number of custom attributes associated with it, including other contacts (i.e. a certain contact &quot;belongs&quot; to a certain organization). It also functions as a service contract provider for attributes related to users in your system</description>
         <maturity>0</maturity>
 
-        <provides url="contacts" version="1.2b27"/>
+        <provides url="contacts" version="1.2b28"/>
         <requires url="acs-datetime" version="4.1"/>
         <requires url="acs-events" version="0.5d3"/>
         <requires url="acs-tcl" version="5.3.0d2"/>
+        <requires url="acs-mail-lite" version="5.4.0d1"/>
         <requires url="ams" version="1.1d16"/>
         <requires url="ref-countries" version="1.1"/>
         <requires url="categories" version="1.0d6"/>
Index: openacs-4/packages/contacts/catalog/contacts.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/catalog/contacts.de_DE.ISO-8859-1.xml,v
diff -u -r1.30 -r1.31
--- openacs-4/packages/contacts/catalog/contacts.de_DE.ISO-8859-1.xml	14 Jan 2007 11:35:23 -0000	1.30
+++ openacs-4/packages/contacts/catalog/contacts.de_DE.ISO-8859-1.xml	2 Feb 2007 11:24:57 -0000	1.31
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="contacts" package_version="1.2b26" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="contacts" package_version="1.2b27" locale="de_DE" charset="ISO-8859-1">
 
   <msg key="--_select_a_group_--">-- eine Gruppe markieren --</msg>
   <msg key="--add_column--">-- Reihe hinzuf�gen --</msg>
@@ -333,6 +333,7 @@
   <msg key="lt_Last_Name_is_required">Nachname notwendig</msg>
   <msg key="lt_Last_updated_update_d">Letztes Update: %update_date%</msg>
   <msg key="lt_li_The_role_you_enter">&lt;li&gt; Die von Ihnen eingegebene Rolle \&quot;%pretty_name%\&quot; oder der Plural \&quot;%pretty_plural%\&quot; existieren bereits.</msg>
+  <msg key="lt_Mail_through_p_help">Soll das Mail Tracking eingeschaltet sein so dass die Antworten auch vom System erfasst werden?</msg>
   <msg key="lt_Make_sure_you_do_not_">Gehen Sie sicher, dass Sie nicht die gleichen Attribute zu mehreren Gruppen hinzuf�gen</msg>
   <msg key="lt_neither_person_nor_or">Weder der Personen- noch der Organisationstypus ist g�ltig, was ist da passiert Admin?</msg>
   <msg key="lt_no_matches_for_-query-">Keine Ergebnisse f�r'%query%'</msg>
@@ -434,6 +435,7 @@
   <msg key="Mail">Mailing</msg>
   <msg key="Mail_Merge">Adresszusammenstellung</msg>
   <msg key="Mail_Merge_Results">Resultate der Mail Zusammenfassung (mail merge)</msg>
+  <msg key="Mail_through_p">Mail Through</msg>
   <msg key="Mail_to_contact">Dateien an Kontakt schicken</msg>
   <msg key="mailing_subject">Betreff</msg>
   <msg key="mailing_subject_help">Geben Sie den Betreff ein f�r den Fall das die Vorlage dies unterst�tzt.</msg>
Index: openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml,v
diff -u -r1.94 -r1.95
--- openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml	14 Jan 2007 11:35:23 -0000	1.94
+++ openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml	2 Feb 2007 11:24:57 -0000	1.95
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="contacts" package_version="1.2b26" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="contacts" package_version="1.2b27" locale="en_US" charset="ISO-8859-1">
 
   <msg key="--_select_a_group_--">-- select a group --</msg>
   <msg key="--add_column--">-- add column --</msg>
@@ -156,6 +156,7 @@
   <msg key="Current">Current</msg>
   <msg key="Customer">Customer:</msg>
   <msg key="Customer_has_no_employees">Customer has no employees.</msg>
+  <msg key="cvs_groups_help">Choose the groups where you want to import the contacts to. This also determines which attributes you can assign.</msg>
   <msg key="Date">Date</msg>
   <msg key="days">days</msg>
   <msg key="Default">Default</msg>
@@ -236,6 +237,7 @@
   <msg key="Header">Header</msg>
   <msg key="Help_Text">Help Text</msg>
   <msg key="History">History</msg>
+  <msg key="import_csv_2_context">CSV Import Matching</msg>
   <msg key="In_Searches">Searches</msg>
   <msg key="in_the_search">in the search</msg>
   <msg key="Include_address_for_windowed_">include name and mailing address for use with windowed envelopes</msg>
@@ -345,6 +347,7 @@
   <msg key="lt_contacts_were_deleted">%contacts@ were deleted</msg>
   <msg key="lt_country_code_is_not_-">country code is not -&gt;</msg>
   <msg key="lt_created_in_the_last_-">created in the last -&gt;</msg>
+  <msg key="lt_csv_import_instructions">Please choose the file you want to upload. The file should be a CSV file, seperated by &quot;;&quot;. Also it is mandatory that the first line is the header line. If your CSV does not contain a header line, create one, otherwise matching will be really hard.</msg>
   <msg key="lt_Currently_the_group_">Currently, the group is able to handle the following types of relationships:</msg>
   <msg key="lt_dear_ladies_and">Dear ladies and gentlemen</msg>
   <msg key="lt_Debugging_Code_-_Only">Debugging Code - Only SW Admins See This</msg>
@@ -377,6 +380,7 @@
   <msg key="lt_Last_Name_is_required">Last Name is required</msg>
   <msg key="lt_Last_updated_update_d">Last updated: %update_date%</msg>
   <msg key="lt_li_The_role_you_enter">&lt;li&gt; The role you entered \&quot;%pretty_name%\&quot; or the plural \&quot;%pretty_plural%\&quot; already exists.</msg>
+  <msg key="lt_Mail_through_p_help">Do you want to use mail through sending, changing the reply-to address so the reply is tracked in the system as well?</msg>
   <msg key="lt_Make_sure_you_do_not_">Make sure you do not add the same attribute to multiple groups</msg>
   <msg key="lt_neither_person_nor_or">neither person nor org type is valid, what happened admin?</msg>
   <msg key="lt_No_marrying_yourself">You cannot be married to yourself. Please correct this problem.</msg>
@@ -510,6 +514,7 @@
   <msg key="Mail">Mail</msg>
   <msg key="Mail_Merge">Mail Merge</msg>
   <msg key="Mail_Merge_Results">Mail Merge Results</msg>
+  <msg key="Mail_through_p">Mail Through</msg>
   <msg key="Mail_to_contact">Mail to contact</msg>
   <msg key="mailing_allowed">mailing allowed</msg>
   <msg key="mailing_not_allowed">mailing not allowed</msg>
Index: openacs-4/packages/contacts/lib/email.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/email.tcl,v
diff -u -r1.31 -r1.32
--- openacs-4/packages/contacts/lib/email.tcl	8 Jan 2007 12:53:34 -0000	1.31
+++ openacs-4/packages/contacts/lib/email.tcl	2 Feb 2007 11:24:57 -0000	1.32
@@ -53,12 +53,12 @@
 	}
 	{cc:text(text),optional
 	    {label "[_ contacts.CC]:"} 
-	    {html {size 56}}
+	    {html {size 60}}
 	    {help_text "[_ contacts.cc_help]"}
 	}
 	{bcc:text(text),optional
 	    {label "[_ acs-mail-lite.BCC]:"} 
-	    {html {size 56}}
+	    {html {size 60}}
 	    {help_text "[_ contacts.cc_help]"}
 	}
     }
@@ -82,12 +82,12 @@
 	}
 	{cc:text(text),optional
 	    {label "[_ contacts.CC]:"} 
-	    {html {size 56}}
+	    {html {size 60}}
 	    {help_text "[_ contacts.cc_help]"}
 	}
 	{bcc:text(text),optional
 	    {label "[_ acs-mail-lite.BCC]:"} 
-	    {html {size 56}}
+	    {html {size 60}}
 	    {help_text "[_ contacts.cc_help]"}
 	}
     }
@@ -171,18 +171,24 @@
 append form_elements {
     {subject:text(text),optional
 	{label "[_ contacts.Subject]"}
-	{html {size 55}}
+	{html {size 60}}
 	{section "[_ contacts.Message]"}
     }
     {content_body:richtext(richtext),optional
 	{label "[_ contacts.Message]"}
-	{html {cols 55 rows 18}}
+	{html {cols 80 rows 18}}
 	{help_text "[_ contacts.lt_remember_that_you_can]"}
 	{value $content_list}
     }
     {upload_file:file(file),optional
 	{label "[_ contacts.Upload_file]"}
     }
+    {mail_through_p:integer(radio)
+	{label "[_ contacts.Mail_through_p]"}
+	{options {{"Yes" "1"} {"No" "0"}}}
+	{value "1"}
+	{help_text "[_ contacts.lt_Mail_through_p_help]"}
+    }
 }
 
 if { [exists_and_not_null item_id] } {
@@ -310,11 +316,22 @@
 	    
 	    set subject [contact::message::interpolate -text $subject -values $values]
 	    set content_body [contact::message::interpolate -text $content_body -values $values]
+	    
+	    # If we are doing mail through for tracking purposes
+	    # Set the reply_to_addr accordingly
+	    if {$mail_through_p} {
+		regsub -all {@} $from_addr {\#} reply_to
+		set reply_to_addr "${reply_to}@[acs_mail_lite::address_domain]"
+	    } else {
+		set reply_to_addr $from_addr
+	    }
+
 	    acs_mail_lite::complex_send \
 		-to_party_ids $party_id \
 		-cc_addr $cc_list \
 		-bcc_addr $bcc_list \
 		-from_addr "$from_addr" \
+		-reply_to "$reply_to_addr" \
 		-subject "$subject" \
 		-body "$content_body" \
 		-package_id $package_id \
Index: openacs-4/packages/contacts/tcl/contacts-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-callback-procs.tcl,v
diff -u -r1.56 -r1.57
--- openacs-4/packages/contacts/tcl/contacts-callback-procs.tcl	24 Dec 2006 11:46:50 -0000	1.56
+++ openacs-4/packages/contacts/tcl/contacts-callback-procs.tcl	2 Feb 2007 11:24:57 -0000	1.57
@@ -1250,6 +1250,7 @@
     }
 }    
 
+
 ad_proc -public -callback acs_mail_lite::incoming_email -impl contacts_mail_through {
     -array:required
     {-package_id ""}
@@ -1261,6 +1262,8 @@
 
     This allows you to go in direct communication with a customer using you standard e-mail program instead of having to go to the website.
 
+    It supports also a subject line like "$object_id: <real_subject>" so you can actually store the e-mail with an object.
+
     @author Malte Sussdorff (malte.sussdorff@cognovis.de)
     @creation-date 2005-12-18
     
@@ -1331,6 +1334,7 @@
 	}
 
 	if {$object_p} {
+	    # Trim the subject by the object_id
 	    regexp {:(.*)} $email(subject) match subject
 	    set subject [string trim $subject]
 	} else {
Index: openacs-4/packages/contacts/www/import-csv-4.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/import-csv-4.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/www/import-csv-4.tcl	23 Jan 2007 18:23:20 -0000	1.1
+++ openacs-4/packages/contacts/www/import-csv-4.tcl	2 Feb 2007 11:24:57 -0000	1.2
@@ -18,6 +18,8 @@
     page_title:onevalue
 }
 
+ad_progress_bar_begin -title [_ contacts.Starting_import] -message_1 "[_ contacts.Import_Running]"
+
 # The usual defaults
 set package_id [ad_conn package_id]
 set user_id [ad_conn user_id]
@@ -298,4 +300,6 @@
     }
 
 }
-ad_return_error test $html
+
+ad_progress_bar_end -url "[ad_conn package_url]"
+