From 553152fc8086d6ca507693b8a4a3bf24f52504d6 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Mon, 13 Sep 2010 08:41:04 +0000
Subject: [PATCH] fix for expected parameter for data must be an array in
 set_timer, when starting async testjob; handling array as adr in send when
 creating messages

---
 admin/inc/class.uiasyncservice.inc.php | 2 +-
 phpgwapi/inc/class.send.inc.php        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/inc/class.uiasyncservice.inc.php b/admin/inc/class.uiasyncservice.inc.php
index 40a206fd8e..6cbdf38d11 100644
--- a/admin/inc/class.uiasyncservice.inc.php
+++ b/admin/inc/class.uiasyncservice.inc.php
@@ -59,7 +59,7 @@ class uiasyncservice
 				{
 					echo '<p><b>'.lang("You have no email address for your user set !!!")."</b></p>\n";
 				}
-				elseif (!$async->set_timer($times,'test','admin.uiasyncservice.test',$GLOBALS['egw_info']['user']['email']))
+				elseif (!$async->set_timer($times,'test','admin.uiasyncservice.test',(array)$GLOBALS['egw_info']['user']['email']))
 				{
 					echo '<p><b>'.lang("Error setting timer, wrong syntax or maybe there's one already running !!!")."</b></p>\n";
 				}
diff --git a/phpgwapi/inc/class.send.inc.php b/phpgwapi/inc/class.send.inc.php
index 682469e9b2..8f4d38544e 100644
--- a/phpgwapi/inc/class.send.inc.php
+++ b/phpgwapi/inc/class.send.inc.php
@@ -213,14 +213,14 @@
 			{
 				if ($$adr)
 				{
-					if (preg_match_all('/"?(.+)"?<(.+)>,?/',$$adr,$matches))
+					if (is_string($$adr) && preg_match_all('/"?(.+)"?<(.+)>,?/',$$adr,$matches))
 					{
 						$names = $matches[1];
 						$addresses = $matches[2];
 					}
 					else
 					{
-						$addresses = explode(',',trim($$adr));
+						$addresses = (is_string($$adr) ? explode(',',trim($$adr)) : explode(',',trim($$adr[0])));
 						$names = array();
 					}
 					$method = 'Add'.($adr == 'to' ? 'Address' : $adr);