Mirrors
/
nextcloud-server
mirror of https://github.com/nextcloud/server
3
0
Fork 0
Code Releases Activity
Browse Source

Use non-deprecated INTL_IDNA_VARIANT_UTS46 

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
pull/5791/head
Lukas Reschke 8 years ago
committed by Roeland Jago Douma
parent
c78e999b21
commit
70d42afb93
No known key found for this signature in database GPG Key ID: F941078878347C0C
2 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      lib/private/Mail/Mailer.php
  2. 4
      lib/private/Mail/Message.php

2
lib/private/Mail/Mailer.php
View File

@ -170,7 +170,7 @@ class Mailer implements IMailer {
} }
list($name, $domain) = explode('@', $email, 2); list($name, $domain) = explode('@', $email, 2);
$domain = idn_to_ascii($domain);
$domain = idn_to_ascii($domain, 0,INTL_IDNA_VARIANT_UTS46);
return $name.'@'.$domain; return $name.'@'.$domain;
} }

4
lib/private/Mail/Message.php
View File

@ -58,11 +58,11 @@ class Message {
foreach($addresses as $email => $readableName) { foreach($addresses as $email => $readableName) {
if(!is_numeric($email)) { if(!is_numeric($email)) {
list($name, $domain) = explode('@', $email, 2); list($name, $domain) = explode('@', $email, 2);
$domain = idn_to_ascii($domain);
$domain = idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46);
$convertedAddresses[$name.'@'.$domain] = $readableName; $convertedAddresses[$name.'@'.$domain] = $readableName;
} else { } else {
list($name, $domain) = explode('@', $readableName, 2); list($name, $domain) = explode('@', $readableName, 2);
$domain = idn_to_ascii($domain);
$domain = idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46);
$convertedAddresses[$email] = $name.'@'.$domain; $convertedAddresses[$email] = $name.'@'.$domain;
} }
} }

Write Preview
Loading…
Cancel
Save