From 1557afe7928ed73cbad5d98539a2db23dbf63eef Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 13 Jun 2007 16:29:06 +0000
Subject: [PATCH] some fixes for the contactform: customfields, not working
 mail-subject, ...

---
 .../inc/class.addressbook_contactform.inc.php    |  2 ++
 .../inc/class.addressbook_tracking.inc.php       | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/addressbook/inc/class.addressbook_contactform.inc.php b/addressbook/inc/class.addressbook_contactform.inc.php
index 6707d7e5d4..618c0553df 100644
--- a/addressbook/inc/class.addressbook_contactform.inc.php
+++ b/addressbook/inc/class.addressbook_contactform.inc.php
@@ -54,6 +54,8 @@ class addressbook_contactform
 					}
 					if ($contact->save($content))
 					{
+						unset($content['modified']); unset($content['modifier']);	// not interesting for new entries
+
 						$tracking->do_notifications($content,null);	// only necessary as long addressbook is not doing this itself
 
 						return '<p align="center">'.$content['msg'].'</p>';
diff --git a/addressbook/inc/class.addressbook_tracking.inc.php b/addressbook/inc/class.addressbook_tracking.inc.php
index cc8aa71319..98c33b1119 100644
--- a/addressbook/inc/class.addressbook_tracking.inc.php
+++ b/addressbook/inc/class.addressbook_tracking.inc.php
@@ -142,7 +142,7 @@ class addressbook_tracking extends bo_tracking
 		{
 			$prefix = ($data['subject_contactform'] ? $data['subject_contactform'] : lang('Contactform')).': ';
 		}
-		return $prefix.parent::get_subject($data,$old);
+		return $prefix.$this->contacts->link_title($data);
 	}
 	
 	/**
@@ -162,7 +162,7 @@ class addressbook_tracking extends bo_tracking
 			switch($name)
 			{
 				case 'n_prefix': case 'n_given': case 'n_middle': case 'n_family': case 'n_suffix':	// already in n_fn
-				case 'tid':
+				case 'n_fileas': case 'id': case 'tid':
 					break;
 				case 'created': case 'modified':
 					$details[$name] = array(
@@ -214,6 +214,18 @@ class addressbook_tracking extends bo_tracking
 					break;
 			}
 		}
+		if ($this->contacts->customfields)
+		{
+			foreach($this->contacts->customfields as $name => $custom)
+			{
+				if (!$data['#'.$name]) continue;
+
+				$details['#'.$name] = array(
+					'label' => $custom['label'],
+					'value' => $data['#'.$name],
+				);
+			}
+		}
 		return $details;
 	}
 }
\ No newline at end of file