wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New domain regexp for WebFinger matching.

Browse Source
This commit is contained in:
Mikael Nordfeldth 2017-04-22 10:51:03 +02:00
parent e98bceec10
commit 0fd83f0028
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/OStatus/OStatusPlugin.php
View File

@ -271,7 +271,7 @@ class OStatusPlugin extends Plugin
$wmatches = array(); $wmatches = array();
// Webfinger matches: @user@example.com or even @user--one.george_orwell@1984.biz // Webfinger matches: @user@example.com or even @user--one.george_orwell@1984.biz
if (preg_match_all('!(?:^|\s+)@((?:\w+[\w\-\_\.]?)*(?:[\w\-\_\.]*\w+)@(?:\w+\-?\w+\.)*\w+(?:\w+\-\w+)*\.\w+)!', if (preg_match_all('/(?:^|\s+)@((?:\w+[\w\-\_\.]?)*(?:[\w\-\_\.]*\w+)@(?:(?!-)[A-Za-z0-9\-]{1,63}(?<!-)\.)+[A-Za-z]{2,10})/',
$text, $text,
$wmatches, $wmatches,
PREG_OFFSET_CAPTURE)) { PREG_OFFSET_CAPTURE)) {