@@ -89,7 +89,7 @@ |
||
| 89 | 89 | * @return Boolval |
| 90 | 90 | */ |
| 91 | 91 | private function isValidEmail($email) { |
| 92 | - return (!preg_match('/^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/', $email)) ? FALSE : TRUE; |
|
| 92 | + return (!preg_match('/^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/', $email)) ? false : true; |
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | /** |
@@ -298,8 +298,8 @@ |
||
| 298 | 298 | $recipient['link'] |
| 299 | 299 | ); |
| 300 | 300 | |
| 301 | - $emailTemplate->addBodyText( $trans->t('This link gives you personal access to the poll named above. </br> Press the button above or copy the following link and add it in your browser\'s location bar: ') ); |
|
| 302 | - $emailTemplate->addBodyText( $recipient['link'] ); |
|
| 301 | + $emailTemplate->addBodyText($trans->t('This link gives you personal access to the poll named above. </br> Press the button above or copy the following link and add it in your browser\'s location bar: ')); |
|
| 302 | + $emailTemplate->addBodyText($recipient['link']); |
|
| 303 | 303 | |
| 304 | 304 | $emailTemplate->addFooter($trans->t('This email is sent to you, because you are invited to vote in this poll by the poll owner. At least your name or your email address is recorded in this poll. If you want to get removed from this poll, contact the site administrator or the initiator of this poll, where the mail is sent from.')); |
| 305 | 305 | |