[eGroupWare-svn] r27941 - in /trunk/addressbook: inc/ sitemgr/

[<ste...@us...>]

Author: stefanbecker
Date: Mon Sep 28 21:22:45 2009
New Revision: 27941

URL: http://www.egroupware.org/viewvc/egroupware?rev=27941&view=rev
Log:
added paramter to select, if sender gets also an email via contactform

Modified:
    trunk/addressbook/inc/class.addressbook_contactform.inc.php
    trunk/addressbook/inc/class.addressbook_tracking.inc.php
    trunk/addressbook/sitemgr/class.module_addressbook_contactform.inc.php

Modified: trunk/addressbook/inc/class.addressbook_contactform.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/addressbook/inc/class.addressbook_contactform.inc.php?rev=27941&r1=27940&r2=27941&view=diff
==============================================================================
--- trunk/addressbook/inc/class.addressbook_contactform.inc.php (original)
+++ trunk/addressbook/inc/class.addressbook_contactform.inc.php Mon Sep 28 21:22:45 2009
@@ -26,9 +26,10 @@
 	 * @param string $email=null comma-separated email addresses
 	 * @param string $tpl_name=null custom etemplate to use
 	 * @param string $subject=null subject for email
+	 * @param string $copytoresiver=false send a copy of notification to resiver
 	 * @return string html content
 	 */
-	function display($content=null,$addressbook=null,$fields=null,$msg=null,$email=null,$tpl_name=null,$subject=null)
+	function display($content=null,$addressbook=null,$fields=null,$msg=null,$email=null,$tpl_name=null,$subject=null,$copytoresiver=false)
 	{
 		#error_log( "<p>addressbook_contactform::display(".print_r($content,true).",$addressbook,".print_r($fields,true).",$msg,$tpl_name)</p>\n");
 		if (empty($tpl_name) && !empty($content['tpl_form_name'])) $tpl_name =$content['tpl_form_name'];
@@ -105,6 +106,7 @@
 			$preserv['is_contactform'] = true;
 			$preserv['email_contactform'] = $email;
 			$preserv['subject_contactform'] = $subject;
+			$preserv['email_copytoresiver'] = $copytoresiver;
 			#if (!$fields) $fields = array('org_name','n_fn','email','tel_work','url','note','captcha');
 			$custom = 1;
 			foreach($fields as $name)

Modified: trunk/addressbook/inc/class.addressbook_tracking.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/addressbook/inc/class.addressbook_tracking.inc.php?rev=27941&r1=27940&r2=27941&view=diff
==============================================================================
--- trunk/addressbook/inc/class.addressbook_tracking.inc.php (original)
+++ trunk/addressbook/inc/class.addressbook_tracking.inc.php Mon Sep 28 21:22:45 2009
@@ -92,7 +92,9 @@
 			case 'copy':
 				if ($data['is_contactform'])
 				{
-					return preg_split('/, ?/',$data['email_contactform']);
+					$copy = preg_split('/, ?/',$data['email_contactform']);
+					if  ($data['email_copytoresiver']) $copy[] = $data['email'];
+					return $copy;
 				}
 				break;
 

Modified: trunk/addressbook/sitemgr/class.module_addressbook_contactform.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/addressbook/sitemgr/class.module_addressbook_contactform.inc.php?rev=27941&r1=27940&r2=27941&view=diff
==============================================================================
--- trunk/addressbook/sitemgr/class.module_addressbook_contactform.inc.php (original)
+++ trunk/addressbook/sitemgr/class.module_addressbook_contactform.inc.php Mon Sep 28 21:22:45 2009
@@ -107,6 +107,11 @@
 				'params' => array('size' => 40),
 				'default' => 'addressbook.contactform',
 			),
+			'arg7' => array(
+				'type' => 'checkbox',
+				'label' => lang('Send emailcopy to receiver'),
+				'params' => array('size' => 1),
+			),
 		);
 		return parent::get_user_interface();
 	}