X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FLinkFilter.php;h=28379c77c4fd131f863a0fc428cab486f7e94d4d;hb=1f5f6a1b3dc38ddf04e273b8c359971de6e3c124;hp=dc4c1256464295443e8db9640cddfc8e3bc5f179;hpb=79d5225c0e864482269e2315f47b899697681e52;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/LinkFilter.php b/includes/LinkFilter.php index dc4c125646..28379c77c4 100644 --- a/includes/LinkFilter.php +++ b/includes/LinkFilter.php @@ -1,9 +1,30 @@ getNativeData(); + $regex = LinkFilter::makeRegex( $filterEntry ); return preg_match( $regex, $text ); } /** - * @static + * Builds a regex pattern for $filterEntry. + * + * @param $filterEntry String: URL, if it begins with "*.", it'll be + * replaced to match any subdomain + * @return String: regex pattern, for preg_match() */ private static function makeRegex( $filterEntry ) { $regex = '!http://'; @@ -33,8 +72,8 @@ class LinkFilter { } /** - * Make a string to go after an SQL LIKE, which will match the specified - * string. There are several kinds of filter entry: + * Make an array to be used for calls to DatabaseBase::buildLike(), which + * will match the specified string. There are several kinds of filter entry: * *.domain.com - Produces http://com.domain.%, matches domain.com * and www.domain.com * domain.com - Produces http://com.domain./%, matches domain.com @@ -45,12 +84,12 @@ class LinkFilter { * domain.com/xy but not www.domain.com/xy * * Asterisks in any other location are considered invalid. - * - * @static + * * @param $filterEntry String: domainparts * @param $prot String: protocol + * @return Array to be passed to DatabaseBase::buildLike() or false on error */ - public static function makeLike( $filterEntry , $prot = 'http://' ) { + public static function makeLikeArray( $filterEntry, $prot = 'http://' ) { $db = wfGetDB( DB_MASTER ); if ( substr( $filterEntry, 0, 2 ) == '*.' ) { $subdomains = true; @@ -79,30 +118,51 @@ class LinkFilter { } // Reverse the labels in the hostname, convert to lower case // For emails reverse domainpart only - if ( $prot == 'mailto:' && strpos($host, '@') ) { - // complete email adress + if ( $prot == 'mailto:' && strpos( $host, '@' ) ) { + // complete email adress $mailparts = explode( '@', $host ); $domainpart = strtolower( implode( '.', array_reverse( explode( '.', $mailparts[1] ) ) ) ); $host = $domainpart . '@' . $mailparts[0]; - $like = $db->escapeLike( "$prot$host" ) . "%"; + $like = array( "$prot$host", $db->anyString() ); } elseif ( $prot == 'mailto:' ) { // domainpart of email adress only. do not add '.' - $host = strtolower( implode( '.', array_reverse( explode( '.', $host ) ) ) ); - $like = $db->escapeLike( "$prot$host" ) . "%"; + $host = strtolower( implode( '.', array_reverse( explode( '.', $host ) ) ) ); + $like = array( "$prot$host", $db->anyString() ); } else { - $host = strtolower( implode( '.', array_reverse( explode( '.', $host ) ) ) ); + $host = strtolower( implode( '.', array_reverse( explode( '.', $host ) ) ) ); if ( substr( $host, -1, 1 ) !== '.' ) { $host .= '.'; } - $like = $db->escapeLike( "$prot$host" ); + $like = array( "$prot$host" ); if ( $subdomains ) { - $like .= '%'; + $like[] = $db->anyString(); } if ( !$subdomains || $path !== '/' ) { - $like .= $db->escapeLike( $path ) . '%'; + $like[] = $path; + $like[] = $db->anyString(); } } return $like; } + + /** + * Filters an array returned by makeLikeArray(), removing everything past first pattern placeholder. + * + * @param $arr array: array to filter + * @return array filtered array + */ + public static function keepOneWildcard( $arr ) { + if( !is_array( $arr ) ) { + return $arr; + } + + foreach( $arr as $key => $value ) { + if ( $value instanceof LikeMatch ) { + return array_slice( $arr, 0, $key + 1 ); + } + } + + return $arr; + } }