GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Domain name regular expression into lib/framework.php

Browse Source 
cherry-pick-merge
This commit is contained in:
Mikael Nordfeldth
2017-04-22 11:07:38 +02:00
parent eefbfe746f
commit 5e7a7701b9
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/OStatus/OStatusPlugin.php
View File

@@ -280,7 +280,7 @@ class OStatusPlugin extends Plugin
static function extractWebfingerIds($text)
{
$wmatches = array();
$result = preg_match_all('/(?:^|\s+)@((?:\w+[\w\-\_\.]?)*(?:[\w\-\_\.]*\w+)@(?:(?!-)[A-Za-z0-9\-]{1,63}(?<!-)\.)+[A-Za-z]{2,10})/',
$result = preg_match_all('/(?:^|\s+)@((?:\w+[\w\-\_\.]?)*(?:[\w\-\_\.]*\w+)@'.URL_REGEX_DOMAIN_NAME.')/',
$text,
$wmatches,
PREG_OFFSET_CAPTURE);
@@ -300,7 +300,7 @@ class OStatusPlugin extends Plugin
static function extractUrlMentions($text)
{
$wmatches = array();
$result = preg_match_all('!(?:^|\s+)@((?:\w+\.)*\w+(?:\w+\-\w+)*\.\w+(?:/\w+)*)!',
$result = preg_match_all('!(?:^|\s+)@'.URL_REGEX_DOMAIN_NAME.'(?:/\w+)*)!',
$text,
$wmatches,
PREG_OFFSET_CAPTURE);