From: <sy...@us...> - 2005-08-30 11:55:08
|
Update of /cvsroot/tikiwiki/tiki In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22345 Modified Files: messu-compose.php Log Message: SF 1223129: usernames must be separated with; to allow username with space Mr X and with comma Smith, Paul - for name with ; use \; Index: messu-compose.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/messu-compose.php,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- messu-compose.php 12 Aug 2005 13:01:58 -0000 1.25 +++ messu-compose.php 30 Aug 2005 11:55:00 -0000 1.26 @@ -93,15 +93,17 @@ } // Parse the to, cc and bcc fields into an array - $arr_to = preg_split('/\s*(,|\s)\s*/', $_REQUEST['to']); - $arr_cc = preg_split('/\s*(,|\s)\s*/', $_REQUEST['cc']); - $arr_bcc = preg_split('/\s*(,|\s)\s*/', $_REQUEST['bcc']); + $arr_to = preg_split('/\s*(?<!\\\);\s*/', $_REQUEST['to']); + $arr_cc = preg_split('/\s*(?<!\\\);\s*/', $_REQUEST['cc']); + $arr_bcc = preg_split('/\s*(?<!\\\);\s*/', $_REQUEST['bcc']); // Remove invalid users from the to, cc and bcc fields $users = array(); foreach ($arr_to as $a_user) { if (!empty($a_user)) { + $a_user = str_replace('\\;', ';', $a_user); +echo "<pre>$a_user</pre>"; if ($messulib->user_exists($a_user)) { // mail only to users with activated message feature if ($messulib->get_user_preference($a_user, 'allowMsgs', 'y') == 'y') { @@ -122,6 +124,7 @@ foreach ($arr_cc as $a_user) { if (!empty($a_user)) { + $a_user = str_replace('\\;', ';', $a_user); if ($messulib->user_exists($a_user)) { // mail only to users with activated message feature if ($messulib->get_user_preference($a_user, 'allowMsgs', 'y') == 'y') { @@ -142,6 +145,7 @@ foreach ($arr_bcc as $a_user) { if (!empty($a_user)) { + $a_user = str_replace('\\;', ';', $a_user); if ($messulib->user_exists($a_user)) { // mail only to users with activated message feature if ($messulib->get_user_preference($a_user, 'allowMsgs', 'y') == 'y') { |