Fixed issue #5474: Not possible to send a token to multiple email add…

…resses git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@11225 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Oct 20, 2011 · 38c0fa5 · 38c0fa5
1 parent 0d2a37e
commit 38c0fa5
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/admin/tokens.php b/admin/tokens.php
@@ -1557,7 +1557,11 @@
             while ($emrow = $emresult->FetchRow())
             {
                 unset($fieldsarray);
-                $to = $emrow['firstname']." ".$emrow['lastname']." <".$emrow['email'].">";
+                $aEmailaddresses=explode(';',$emrow['email']);
+                foreach($aEmailaddresses as $sEmailaddress)
+                {
+                    $to[]=$emrow['firstname']." ".$emrow['lastname']." <{$sEmailaddress}>";
+                }
                 $fieldsarray["{EMAIL}"]=$emrow['email'];
                 $fieldsarray["{FIRSTNAME}"]=$emrow['firstname'];
                 $fieldsarray["{LASTNAME}"]=$emrow['lastname'];
@@ -1628,7 +1632,7 @@
                     ."SET sent='$today' WHERE tid={$emrow['tid']}";
                     //
                     $uderesult = $connect->Execute($udequery) or safe_die ("Could not update tokens<br />$udequery<br />".$connect->ErrorMsg());
-                    $tokenoutput .= $clang->gT("Invitation sent to:")." {$emrow['firstname']} {$emrow['lastname']} ($to)<br />\n";
+                    $tokenoutput .= $clang->gT("Invitation sent to:")." {$emrow['firstname']} {$emrow['lastname']} (".htmlspecialchars(implode(',',$to)).")<br />\n";
                     if ($emailsmtpdebug==2)
                     {
                         $tokenoutput .=$maildebug;
@@ -1885,7 +1889,11 @@
             while ($emrow = $emresult->FetchRow())
             {
                 unset($fieldsarray);
-                $to = $emrow['firstname']." ".$emrow['lastname']." <".$emrow['email'].">";
+                $aEmailaddresses=explode(';',$emrow['email']);
+                foreach($aEmailaddresses as $sEmailaddress)
+                {
+                    $to[]=$emrow['firstname']." ".$emrow['lastname']." <{$sEmailaddress}>";
+                }
                 $fieldsarray["{EMAIL}"]=$emrow['email'];
                 $fieldsarray["{FIRSTNAME}"]=$emrow['firstname'];
                 $fieldsarray["{LASTNAME}"]=$emrow['lastname'];