From b07e51b90c4b5f362bbf3c5157bcccaf47636aa0 Mon Sep 17 00:00:00 2001 From: trougakoss Date: Sat, 20 Apr 2013 21:04:11 +0300 Subject: [PATCH] Fixed Issue #7733: invite_participants method throws exception when some emails are registered --- application/controllers/admin/remotecontrol.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/application/controllers/admin/remotecontrol.php b/application/controllers/admin/remotecontrol.php index 230e354986e..525604a085c 100644 --- a/application/controllers/admin/remotecontrol.php +++ b/application/controllers/admin/remotecontrol.php @@ -2177,6 +2177,22 @@ public function invite_participants($sSessionKey, $iSurveyID ) if (empty($aResultTokens)) return array('status' => 'Error: No candidate tokens'); + foreach($aResultTokens as $key=>$oToken) + { + //pattern taken from php_filter_validate_email PHP_5_4/ext/filter/logical_filters.c + $pattern = '/^(?!(?:(?:\\x22?\\x5C[\\x00-\\x7E]\\x22?)|(?:\\x22?[^\\x5C\\x22]\\x22?)){255,})(?!(?:(?:\\x22?\\x5C[\\x00-\\x7E]\\x22?)|(?:\\x22?[^\\x5C\\x22]\\x22?)){65,}@)(?:(?:[\\x21\\x23-\\x27\\x2A\\x2B\\x2D\\x2F-\\x39\\x3D\\x3F\\x5E-\\x7E]+)|(?:\\x22(?:[\\x01-\\x08\\x0B\\x0C\\x0E-\\x1F\\x21\\x23-\\x5B\\x5D-\\x7F]|(?:\\x5C[\\x00-\\x7F]))*\\x22))(?:\\.(?:(?:[\\x21\\x23-\\x27\\x2A\\x2B\\x2D\\x2F-\\x39\\x3D\\x3F\\x5E-\\x7E]+)|(?:\\x22(?:[\\x01-\\x08\\x0B\\x0C\\x0E-\\x1F\\x21\\x23-\\x5B\\x5D-\\x7F]|(?:\\x5C[\\x00-\\x7F]))*\\x22)))*@(?:(?:(?!.*[^.]{64,})(?:(?:(?:xn--)?[a-z0-9]+(?:-+[a-z0-9]+)*\\.){1,126}){1,}(?:(?:[a-z][a-z0-9]*)|(?:(?:xn--)[a-z0-9]+))(?:-+[a-z0-9]+)*)|(?:\\[(?:(?:IPv6:(?:(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){7})|(?:(?!(?:.*[a-f0-9][:\\]]){7,})(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,5})?::(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,5})?)))|(?:(?:IPv6:(?:(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){5}:)|(?:(?!(?:.*[a-f0-9]:){5,})(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,3})?::(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,3}:)?)))?(?:(?:25[0-5])|(?:2[0-4][0-9])|(?:1[0-9]{2})|(?:[1-9]?[0-9]))(?:\\.(?:(?:25[0-5])|(?:2[0-4][0-9])|(?:1[0-9]{2})|(?:[1-9]?[0-9]))){3}))\\]))$/iD'; + + //if(!filter_var($emailaddress, FILTER_VALIDATE_EMAIL)) + if (preg_match($pattern, $oToken['email']) !== 1) + unset($aResultTokens[$key]); + } + + if (empty($aResultTokens)) + return array('status' => 'Error: No candidate tokens'); + + + + $aResult = emailTokens($iSurveyID,$aResultTokens,'invite'); $iLeft = count($aAllTokens) - count($aResultTokens); $aResult['status'] =$iLeft. " left to send";