the current parse language where available.
==== Changed configuration ====
+* Some external link searches will not work correctly until update.php (or
+ refreshExternallinksIndex.php) is run. These include searches for links using
+ IP addresses, internationalized domain names, and possibly mailto links.
* …
==== Removed configuration ====
* …
=== Other changes in 1.33 ===
+* (T208871) The hard-coded Google search form on the database error page was
+ removed.
* …
== Compatibility ==
'RedisConnectionPool' => __DIR__ . '/includes/libs/redis/RedisConnectionPool.php',
'RedisLockManager' => __DIR__ . '/includes/libs/lockmanager/RedisLockManager.php',
'RedisPubSubFeedEngine' => __DIR__ . '/includes/rcfeed/RedisPubSubFeedEngine.php',
+ 'RefreshExternallinksIndex' => __DIR__ . '/maintenance/refreshExternallinksIndex.php',
'RefreshFileHeaders' => __DIR__ . '/maintenance/refreshFileHeaders.php',
'RefreshImageMetadata' => __DIR__ . '/maintenance/refreshImageMetadata.php',
'RefreshLinks' => __DIR__ . '/maintenance/refreshLinks.php',
$old: old title
$nt: new title
$user: user who does the move
+$reason: string of the reason provided by the user
+&$status: Status object. To abort the move, add a fatal error to this object
+ (i.e. call $status->fatal()).
'TitleMoveStarting': Before moving an article (title), but just after the atomic
DB section starts.
$msg = null;
if ( $data !== null ) {
- $data = FormatJson::decode( $data );
- if ( !is_object( $data ) ) {
+ $data = FormatJson::decode( $data, true );
+ if ( !is_array( $data ) ) {
// @codeCoverageIgnoreStart
wfLogWarning( "Invalid JSON object in comment: $data" );
$data = null;
// @codeCoverageIgnoreEnd
} else {
- $data = (array)$data;
if ( isset( $data['_message'] ) ) {
$msg = self::decodeMessage( $data['_message'] )
->setInterfaceMessageFlag( true );
/**
* Make URL indexes, appropriate for the el_index field of externallinks.
*
+ * @deprecated since 1.33, use LinkFilter::makeIndexes() instead
* @param string $url
* @return array
*/
function wfMakeUrlIndexes( $url ) {
- $bits = wfParseUrl( $url );
-
- // Reverse the labels in the hostname, convert to lower case
- // For emails reverse domainpart only
- if ( $bits['scheme'] == 'mailto' ) {
- $mailparts = explode( '@', $bits['host'], 2 );
- if ( count( $mailparts ) === 2 ) {
- $domainpart = strtolower( implode( '.', array_reverse( explode( '.', $mailparts[1] ) ) ) );
- } else {
- // No domain specified, don't mangle it
- $domainpart = '';
- }
- $reversedHost = $domainpart . '@' . $mailparts[0];
- } else {
- $reversedHost = strtolower( implode( '.', array_reverse( explode( '.', $bits['host'] ) ) ) );
- }
- // Add an extra dot to the end
- // Why? Is it in wrong place in mailto links?
- if ( substr( $reversedHost, -1, 1 ) !== '.' ) {
- $reversedHost .= '.';
- }
- // Reconstruct the pseudo-URL
- $prot = $bits['scheme'];
- $index = $prot . $bits['delimiter'] . $reversedHost;
- // Leave out user and password. Add the port, path, query and fragment
- if ( isset( $bits['port'] ) ) {
- $index .= ':' . $bits['port'];
- }
- if ( isset( $bits['path'] ) ) {
- $index .= $bits['path'];
- } else {
- $index .= '/';
- }
- if ( isset( $bits['query'] ) ) {
- $index .= '?' . $bits['query'];
- }
- if ( isset( $bits['fragment'] ) ) {
- $index .= '#' . $bits['fragment'];
- }
-
- if ( $prot == '' ) {
- return [ "http:$index", "https:$index" ];
- } else {
- return [ $index ];
- }
+ wfDeprecated( __FUNCTION__, '1.33' );
+ return LinkFilter::makeIndexes( $url );
}
/**
* Another cool thing to do would be a web interface for fast spam removal.
*/
class LinkFilter {
+ /**
+ * Increment this when makeIndexes output changes. It'll cause
+ * maintenance/refreshExternallinksIndex.php to run from update.php.
+ */
+ const VERSION = 1;
/**
* Check whether $content contains a link to $filterEntry
/**
* Builds a regex pattern for $filterEntry.
*
+ * @todo This doesn't match the rest of the functionality here.
* @param string $filterEntry URL, if it begins with "*.", it'll be
* replaced to match any subdomain
* @param string $protocol 'http://' or 'https://'
}
/**
- * Make an array to be used for calls to Database::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
- * or domain.com/ but not www.domain.com
- * *.domain.com/x - Produces http://com.domain.%/x%, matches
- * www.domain.com/xy
- * domain.com/x - Produces http://com.domain./x%, matches
- * domain.com/xy but not www.domain.com/xy
+ * Indicate whether LinkFilter IDN support is available
+ * @since 1.33
+ * @return bool
+ */
+ public static function supportsIDN() {
+ return is_callable( 'idn_to_utf8' ) && defined( 'INTL_IDNA_VARIANT_UTS46' );
+ }
+
+ /**
+ * Canonicalize a hostname for el_index
+ * @param string $hose
+ * @return string
+ */
+ private static function indexifyHost( $host ) {
+ // NOTE: If you change the output of this method, you'll probably have to increment self::VERSION!
+
+ // Canonicalize.
+ $host = rawurldecode( $host );
+ if ( $host !== '' && self::supportsIDN() ) {
+ // @todo Add a PHP fallback
+ $tmp = idn_to_utf8( $host, IDNA_DEFAULT, INTL_IDNA_VARIANT_UTS46 );
+ if ( $tmp !== false ) {
+ $host = $tmp;
+ }
+ }
+ $okChars = 'a-zA-Z0-9\\-._~!$&\'()*+,;=';
+ if ( StringUtils::isUtf8( $host ) ) {
+ // Save a little space by not percent-encoding valid UTF-8 bytes
+ $okChars .= '\x80-\xf4';
+ }
+ $host = preg_replace_callback(
+ '<[^' . $okChars . ']>',
+ function ( $m ) {
+ return rawurlencode( $m[0] );
+ },
+ strtolower( $host )
+ );
+
+ // IPv6? RFC 3986 syntax.
+ if ( preg_match( '/^\[([0-9a-f:*]+)\]$/', rawurldecode( $host ), $m ) ) {
+ $ip = $m[1];
+ if ( IP::isValid( $ip ) ) {
+ return 'V6.' . implode( '.', explode( ':', IP::sanitizeIP( $ip ) ) ) . '.';
+ }
+ if ( substr( $ip, -2 ) === ':*' ) {
+ $cutIp = substr( $ip, 0, -2 );
+ if ( IP::isValid( "{$cutIp}::" ) ) {
+ // Wildcard IP doesn't contain "::", so multiple parts can be wild
+ $ct = count( explode( ':', $ip ) ) - 1;
+ return 'V6.' .
+ implode( '.', array_slice( explode( ':', IP::sanitizeIP( "{$cutIp}::" ) ), 0, $ct ) ) .
+ '.*.';
+ }
+ if ( IP::isValid( "{$cutIp}:1" ) ) {
+ // Wildcard IP does contain "::", so only the last part is wild
+ return 'V6.' .
+ substr( implode( '.', explode( ':', IP::sanitizeIP( "{$cutIp}:1" ) ) ), 0, -1 ) .
+ '*.';
+ }
+ }
+ }
+
+ // Regularlize explicit specification of the DNS root.
+ // Browsers seem to do this for IPv4 literals too.
+ if ( substr( $host, -1 ) === '.' ) {
+ $host = substr( $host, 0, -1 );
+ }
+
+ // IPv4?
+ $b = '(?:0*25[0-5]|0*2[0-4][0-9]|0*1[0-9][0-9]|0*[0-9]?[0-9])';
+ if ( preg_match( "/^(?:{$b}\.){3}{$b}$|^(?:{$b}\.){1,3}\*$/", $host ) ) {
+ return 'V4.' . implode( '.', array_map( function ( $v ) {
+ return $v === '*' ? $v : (int)$v;
+ }, explode( '.', $host ) ) ) . '.';
+ }
+
+ // Must be a host name.
+ return implode( '.', array_reverse( explode( '.', $host ) ) ) . '.';
+ }
+
+ /**
+ * Converts a URL into a format for el_index
+ * @since 1.33
+ * @param string $url
+ * @return string[] Usually one entry, but might be two in case of
+ * protocol-relative URLs. Empty array on error.
+ */
+ public static function makeIndexes( $url ) {
+ // NOTE: If you change the output of this method, you'll probably have to increment self::VERSION!
+
+ // NOTE: refreshExternallinksIndex.php assumes that only protocol-relative URLs return more
+ // than one index, and that the indexes for protocol-relative URLs only vary in the "http://"
+ // versus "https://" prefix. If you change that, you'll likely need to update
+ // refreshExternallinksIndex.php accordingly.
+
+ $bits = wfParseUrl( $url );
+ if ( !$bits ) {
+ return [];
+ }
+
+ // Reverse the labels in the hostname, convert to lower case, unless it's an IP.
+ // For emails turn it into "domain.reversed@localpart"
+ if ( $bits['scheme'] == 'mailto' ) {
+ $mailparts = explode( '@', $bits['host'], 2 );
+ if ( count( $mailparts ) === 2 ) {
+ $domainpart = self::indexifyHost( $mailparts[1] );
+ } else {
+ // No @, assume it's a local part with no domain
+ $domainpart = '';
+ }
+ $bits['host'] = $domainpart . '@' . $mailparts[0];
+ } else {
+ $bits['host'] = self::indexifyHost( $bits['host'] );
+ }
+
+ // Reconstruct the pseudo-URL
+ $index = $bits['scheme'] . $bits['delimiter'] . $bits['host'];
+ // Leave out user and password. Add the port, path, query and fragment
+ if ( isset( $bits['port'] ) ) {
+ $index .= ':' . $bits['port'];
+ }
+ if ( isset( $bits['path'] ) ) {
+ $index .= $bits['path'];
+ } else {
+ $index .= '/';
+ }
+ if ( isset( $bits['query'] ) ) {
+ $index .= '?' . $bits['query'];
+ }
+ if ( isset( $bits['fragment'] ) ) {
+ $index .= '#' . $bits['fragment'];
+ }
+
+ if ( $bits['scheme'] == '' ) {
+ return [ "http:$index", "https:$index" ];
+ } else {
+ return [ $index ];
+ }
+ }
+
+ /**
+ * Return query conditions which will match the specified string. There are
+ * several kinds of filter entry:
+ *
+ * *.domain.com - Matches domain.com and www.domain.com
+ * domain.com - Matches domain.com or domain.com/ but not www.domain.com
+ * *.domain.com/x - Matches domain.com/xy or www.domain.com/xy. Also probably matches
+ * domain.com/foobar/xy due to limitations of LIKE syntax.
+ * domain.com/x - Matches domain.com/xy but not www.domain.com/xy
+ * 192.0.2.* - Matches any IP in 192.0.2.0/24. Can also have a path appended.
+ * [2001:db8::*] - Matches any IP in 2001:db8::/112. Can also have a path appended.
+ * [2001:db8:*] - Matches any IP in 2001:db8::/32. Can also have a path appended.
+ * foo@domain.com - With protocol 'mailto:', matches the email address foo@domain.com.
+ * *@domain.com - With protocol 'mailto:', matches any email address at domain.com, but
+ * not subdomains like foo@mail.domain.com
*
* Asterisks in any other location are considered invalid.
*
- * This function does the same as wfMakeUrlIndexes(), except it also takes care
+ * @since 1.33
+ * @param string $filterEntry Filter entry, as described above
+ * @param array $options Options are:
+ * - protocol: (string) Protocol to query (default http://)
+ * - oneWildcard: (bool) Stop at the first wildcard (default false)
+ * - prefix: (string) Field prefix (default 'el'). The query will test
+ * fields '{$prefix}_index' and '{$prefix}_index_60'
+ * - db: (IDatabase|null) Database to use.
+ * @return array|bool Conditions to be used for the query (to be ANDed) or
+ * false on error. To determine if the query is constant on the
+ * el_index_60 field, check whether key 'el_index_60' is set.
+ */
+ public static function getQueryConditions( $filterEntry, array $options = [] ) {
+ $options += [
+ 'protocol' => 'http://',
+ 'oneWildcard' => false,
+ 'prefix' => 'el',
+ 'db' => null,
+ ];
+
+ // First, get the like array
+ $like = self::makeLikeArray( $filterEntry, $options['protocol'] );
+ if ( $like === false ) {
+ return $like;
+ }
+
+ // Get the constant prefix (i.e. everything up to the first wildcard)
+ $trimmedLike = self::keepOneWildcard( $like );
+ if ( $options['oneWildcard'] ) {
+ $like = $trimmedLike;
+ }
+ if ( $trimmedLike[count( $trimmedLike ) - 1] instanceof LikeMatch ) {
+ array_pop( $trimmedLike );
+ }
+ $index = implode( '', $trimmedLike );
+
+ $p = $options['prefix'];
+ $db = $options['db'] ?: wfGetDB( DB_REPLICA );
+
+ // Build the query
+ $l = strlen( $index );
+ if ( $l >= 60 ) {
+ // The constant prefix is larger than el_index_60, so we can use a
+ // constant comparison.
+ return [
+ "{$p}_index_60" => substr( $index, 0, 60 ),
+ "{$p}_index" . $db->buildLike( $like ),
+ ];
+ }
+
+ // The constant prefix is smaller than el_index_60, so we use a LIKE
+ // for a prefix search.
+ return [
+ "{$p}_index_60" . $db->buildLike( [ $index, $db->anyString() ] ),
+ "{$p}_index" . $db->buildLike( $like ),
+ ];
+ }
+
+ /**
+ * Make an array to be used for calls to Database::buildLike(), which
+ * will match the specified string.
+ *
+ * This function does the same as LinkFilter::makeIndexes(), except it also takes care
* of adding wildcards
*
- * @param string $filterEntry Domainparts
+ * @note You probably want self::getQueryConditions() instead
+ * @param string $filterEntry Filter entry, @see self::getQueryConditions()
* @param string $protocol Protocol (default http://)
* @return array|bool Array to be passed to Database::buildLike() or false on error
*/
$target = $protocol . $filterEntry;
$bits = wfParseUrl( $target );
-
- if ( $bits == false ) {
- // Unknown protocol?
+ if ( !$bits ) {
return false;
}
- if ( substr( $bits['host'], 0, 2 ) == '*.' ) {
- $subdomains = true;
- $bits['host'] = substr( $bits['host'], 2 );
- if ( $bits['host'] == '' ) {
- // We don't want to make a clause that will match everything,
- // that could be dangerous
- return false;
- }
- } else {
- $subdomains = false;
- }
-
- // Reverse the labels in the hostname, convert to lower case
- // For emails reverse domainpart only
+ $subdomains = false;
if ( $bits['scheme'] === 'mailto' && strpos( $bits['host'], '@' ) ) {
- // complete email address
- $mailparts = explode( '@', $bits['host'] );
- $domainpart = strtolower( implode( '.', array_reverse( explode( '.', $mailparts[1] ) ) ) );
- $bits['host'] = $domainpart . '@' . $mailparts[0];
- } elseif ( $bits['scheme'] === 'mailto' ) {
- // domainpart of email address only, do not add '.'
- $bits['host'] = strtolower( implode( '.', array_reverse( explode( '.', $bits['host'] ) ) ) );
+ // Email address with domain and non-empty local part
+ $mailparts = explode( '@', $bits['host'], 2 );
+ $domainpart = self::indexifyHost( $mailparts[1] );
+ if ( $mailparts[0] === '*' ) {
+ $subdomains = true;
+ $bits['host'] = $domainpart . '@';
+ } else {
+ $bits['host'] = $domainpart . '@' . $mailparts[0];
+ }
} else {
- $bits['host'] = strtolower( implode( '.', array_reverse( explode( '.', $bits['host'] ) ) ) );
- if ( substr( $bits['host'], -1, 1 ) !== '.' ) {
- $bits['host'] .= '.';
+ // Non-email, or email with only a domain part.
+ $bits['host'] = self::indexifyHost( $bits['host'] );
+ if ( substr( $bits['host'], -3 ) === '.*.' ) {
+ $subdomains = true;
+ $bits['host'] = substr( $bits['host'], 0, -2 );
}
}
* Filters an array returned by makeLikeArray(), removing everything past first
* pattern placeholder.
*
+ * @note You probably want self::getQueryConditions() instead
* @param array $arr Array to filter
* @return array Filtered array
*/
public function move( User $user, $reason, $createRedirect, array $changeTags = [] ) {
global $wgCategoryCollation;
- Hooks::run( 'TitleMove', [ $this->oldTitle, $this->newTitle, $user ] );
+ $status = Status::newGood();
+ Hooks::run( 'TitleMove', [ $this->oldTitle, $this->newTitle, $user, $reason, &$status ] );
+ if ( !$status->isOK() ) {
+ // Move was aborted by the hook
+ return $status;
+ }
// If it is a file, move it first.
// It is done before all other moving stuff is done because it's hard to revert.
}
/**
+ * @deprecated since 1.33, use LinkFilter::getQueryConditions() instead
* @param string|null $query
* @param string|null $protocol
* @return null|string
*/
public function prepareUrlQuerySearchString( $query = null, $protocol = null ) {
+ wfDeprecated( __METHOD__, '1.33' );
$db = $this->getDB();
- if ( !is_null( $query ) || $query != '' ) {
+ if ( $query !== null && $query !== '' ) {
if ( is_null( $protocol ) ) {
$protocol = 'http://';
}
*/
private function run( $resultPageSet = null ) {
$params = $this->extractRequestParams();
+ $db = $this->getDB();
$query = $params['query'];
$protocol = self::getProtocolPrefix( $params['protocol'] );
- $this->addTables( [ 'page', 'externallinks' ] ); // must be in this order for 'USE INDEX'
- $this->addOption( 'USE INDEX', 'el_index' );
+ $this->addTables( [ 'page', 'externallinks' ] );
$this->addWhere( 'page_id=el_from' );
$miser_ns = [];
$this->addWhereFld( 'page_namespace', $params['namespace'] );
}
- // Normalize query to match the normalization applied for the externallinks table
- $query = Parser::normalizeLinkUrl( $query );
+ $orderBy = [];
- $whereQuery = $this->prepareUrlQuerySearchString( $query, $protocol );
+ if ( $query !== null && $query !== '' ) {
+ if ( $protocol === null ) {
+ $protocol = 'http://';
+ }
+
+ // Normalize query to match the normalization applied for the externallinks table
+ $query = Parser::normalizeLinkUrl( $protocol . $query );
+
+ $conds = LinkFilter::getQueryConditions( $query, [
+ 'protocol' => '',
+ 'oneWildcard' => true,
+ 'db' => $db
+ ] );
+ if ( !$conds ) {
+ $this->dieWithError( 'apierror-badquery' );
+ }
+ $this->addWhere( $conds );
+ if ( !isset( $conds['el_index_60'] ) ) {
+ $orderBy[] = 'el_index_60';
+ }
+ } else {
+ $orderBy[] = 'el_index_60';
- if ( $whereQuery !== null ) {
- $this->addWhere( $whereQuery );
+ if ( $protocol !== null ) {
+ $this->addWhere( 'el_index_60' . $db->buildLike( "$protocol", $db->anyString() ) );
+ } else {
+ // We're querying all protocols, filter out duplicate protocol-relative links
+ $this->addWhere( $db->makeList( [
+ 'el_to NOT' . $db->buildLike( '//', $db->anyString() ),
+ 'el_index_60 ' . $db->buildLike( 'http://', $db->anyString() ),
+ ], LIST_OR ) );
+ }
}
+ $orderBy[] = 'el_id';
+ $this->addOption( 'ORDER BY', $orderBy );
+ $this->addFields( $orderBy ); // Make sure
+
$prop = array_flip( $params['prop'] );
$fld_ids = isset( $prop['ids'] );
$fld_title = isset( $prop['title'] );
}
$limit = $params['limit'];
- $offset = $params['offset'];
$this->addOption( 'LIMIT', $limit + 1 );
- if ( isset( $offset ) ) {
- $this->addOption( 'OFFSET', $offset );
+
+ if ( $params['continue'] !== null ) {
+ $cont = explode( '|', $params['continue'] );
+ $this->dieContinueUsageIf( count( $cont ) !== count( $orderBy ) );
+ $i = count( $cont ) - 1;
+ $cond = $orderBy[$i] . ' >= ' . $db->addQuotes( rawurldecode( $cont[$i] ) );
+ while ( $i-- > 0 ) {
+ $field = $orderBy[$i];
+ $v = $db->addQuotes( rawurldecode( $cont[$i] ) );
+ $cond = "($field > $v OR ($field = $v AND $cond))";
+ }
+ $this->addWhere( $cond );
}
$res = $this->select( __METHOD__ );
if ( ++$count > $limit ) {
// We've reached the one extra which shows that there are
// additional pages to be had. Stop here...
- $this->setContinueEnumParameter( 'offset', $offset + $limit );
+ $this->setContinue( $orderBy, $row );
break;
}
}
$fit = $result->addValue( [ 'query', $this->getModuleName() ], null, $vals );
if ( !$fit ) {
- $this->setContinueEnumParameter( 'offset', $offset + $count - 1 );
+ $this->setContinue( $orderBy, $row );
break;
}
} else {
}
}
+ private function setContinue( $orderBy, $row ) {
+ $fields = [];
+ foreach ( $orderBy as $field ) {
+ $fields[] = strtr( $row->$field, [ '%' => '%25', '|' => '%7C' ] );
+ }
+ $this->setContinueEnumParameter( 'continue', implode( '|', $fields ) );
+ }
+
public function getAllowedParams() {
$ret = [
'prop' => [
],
ApiBase::PARAM_HELP_MSG_PER_VALUE => [],
],
- 'offset' => [
- ApiBase::PARAM_TYPE => 'integer',
+ 'continue' => [
ApiBase::PARAM_HELP_MSG => 'api-help-param-continue',
],
'protocol' => [
}
$params = $this->extractRequestParams();
+ $db = $this->getDB();
$query = $params['query'];
$protocol = ApiQueryExtLinksUsage::getProtocolPrefix( $params['protocol'] );
$this->addTables( 'externallinks' );
$this->addWhereFld( 'el_from', array_keys( $this->getPageSet()->getGoodTitles() ) );
- $whereQuery = $this->prepareUrlQuerySearchString( $query, $protocol );
-
- if ( $whereQuery !== null ) {
- $this->addWhere( $whereQuery );
- }
+ $orderBy = [];
// Don't order by el_from if it's constant in the WHERE clause
if ( count( $this->getPageSet()->getGoodTitles() ) != 1 ) {
- $this->addOption( 'ORDER BY', 'el_from' );
+ $orderBy[] = 'el_from';
}
- // If we're querying all protocols, use DISTINCT to avoid repeating protocol-relative links twice
- if ( $protocol === null ) {
- $this->addOption( 'DISTINCT' );
+ if ( $query !== null && $query !== '' ) {
+ if ( $protocol === null ) {
+ $protocol = 'http://';
+ }
+
+ // Normalize query to match the normalization applied for the externallinks table
+ $query = Parser::normalizeLinkUrl( $protocol . $query );
+
+ $conds = LinkFilter::getQueryConditions( $query, [
+ 'protocol' => '',
+ 'oneWildcard' => true,
+ 'db' => $db
+ ] );
+ if ( !$conds ) {
+ $this->dieWithError( 'apierror-badquery' );
+ }
+ $this->addWhere( $conds );
+ if ( !isset( $conds['el_index_60'] ) ) {
+ $orderBy[] = 'el_index_60';
+ }
+ } else {
+ $orderBy[] = 'el_index_60';
+
+ if ( $protocol !== null ) {
+ $this->addWhere( 'el_index_60' . $db->buildLike( "$protocol", $db->anyString() ) );
+ } else {
+ // We're querying all protocols, filter out duplicate protocol-relative links
+ $this->addWhere( $db->makeList( [
+ 'el_to NOT' . $db->buildLike( '//', $db->anyString() ),
+ 'el_index_60 ' . $db->buildLike( 'http://', $db->anyString() ),
+ ], LIST_OR ) );
+ }
}
+ $orderBy[] = 'el_id';
+ $this->addOption( 'ORDER BY', $orderBy );
+ $this->addFields( $orderBy ); // Make sure
+
$this->addOption( 'LIMIT', $params['limit'] + 1 );
- $offset = $params['offset'] ?? 0;
- if ( $offset ) {
- $this->addOption( 'OFFSET', $params['offset'] );
+
+ if ( $params['continue'] !== null ) {
+ $cont = explode( '|', $params['continue'] );
+ $this->dieContinueUsageIf( count( $cont ) !== count( $orderBy ) );
+ $i = count( $cont ) - 1;
+ $cond = $orderBy[$i] . ' >= ' . $db->addQuotes( rawurldecode( $cont[$i] ) );
+ while ( $i-- > 0 ) {
+ $field = $orderBy[$i];
+ $v = $db->addQuotes( rawurldecode( $cont[$i] ) );
+ $cond = "($field > $v OR ($field = $v AND $cond))";
+ }
+ $this->addWhere( $cond );
}
$res = $this->select( __METHOD__ );
if ( ++$count > $params['limit'] ) {
// We've reached the one extra which shows that
// there are additional pages to be had. Stop here...
- $this->setContinueEnumParameter( 'offset', $offset + $params['limit'] );
+ $this->setContinue( $orderBy, $row );
break;
}
$entry = [];
ApiResult::setContentValue( $entry, 'url', $to );
$fit = $this->addPageSubItem( $row->el_from, $entry );
if ( !$fit ) {
- $this->setContinueEnumParameter( 'offset', $offset + $count - 1 );
+ $this->setContinue( $orderBy, $row );
break;
}
}
}
+ private function setContinue( $orderBy, $row ) {
+ $fields = [];
+ foreach ( $orderBy as $field ) {
+ $fields[] = strtr( $row->$field, [ '%' => '%25', '|' => '%7C' ] );
+ }
+ $this->setContinueEnumParameter( 'continue', implode( '|', $fields ) );
+ }
+
public function getCacheMode( $params ) {
return 'public';
}
ApiBase::PARAM_MAX => ApiBase::LIMIT_BIG1,
ApiBase::PARAM_MAX2 => ApiBase::LIMIT_BIG2
],
- 'offset' => [
- ApiBase::PARAM_TYPE => 'integer',
+ 'continue' => [
ApiBase::PARAM_HELP_MSG => 'api-help-param-continue',
],
'protocol' => [
$arr = [];
$diffs = array_diff_key( $this->mExternals, $existing );
foreach ( $diffs as $url => $dummy ) {
- foreach ( wfMakeUrlIndexes( $url ) as $index ) {
+ foreach ( LinkFilter::makeIndexes( $url ) as $index ) {
$arr[] = [
'el_from' => $this->mId,
'el_to' => $url,
htmlspecialchars( $e->getTraceAsString() ) . '</pre>';
}
- $html .= '<hr />';
- $html .= self::googleSearchForm();
$html .= '</body></html>';
echo $html;
}
-
- /**
- * @return string
- */
- private static function googleSearchForm() {
- global $wgSitename, $wgCanonicalServer, $wgRequest;
-
- $usegoogle = htmlspecialchars( self::msg(
- 'dberr-usegoogle',
- 'You can try searching via Google in the meantime.'
- ) );
- $outofdate = htmlspecialchars( self::msg(
- 'dberr-outofdate',
- 'Note that their indexes of our content may be out of date.'
- ) );
- $googlesearch = htmlspecialchars( self::msg( 'searchbutton', 'Search' ) );
- $search = htmlspecialchars( $wgRequest->getVal( 'search' ) );
- $server = htmlspecialchars( $wgCanonicalServer );
- $sitename = htmlspecialchars( $wgSitename );
- $trygoogle = <<<EOT
-<div style="margin: 1.5em">$usegoogle<br />
-<small>$outofdate</small>
-</div>
-<form method="get" action="//www.google.com/search" id="googlesearch">
- <input type="hidden" name="domains" value="$server" />
- <input type="hidden" name="num" value="50" />
- <input type="hidden" name="ie" value="UTF-8" />
- <input type="hidden" name="oe" value="UTF-8" />
- <input type="text" name="q" size="31" maxlength="255" value="$search" />
- <input type="submit" name="btnG" value="$googlesearch" />
- <p>
- <label><input type="radio" name="sitesearch" value="$server" checked="checked" />$sitename</label>
- <label><input type="radio" name="sitesearch" value="" />WWW</label>
- </p>
-</form>
-EOT;
- return $trygoogle;
- }
}
AddRFCandPMIDInterwiki::class,
PopulatePPSortKey::class,
PopulateIpChanges::class,
+ RefreshExternallinksIndex::class,
];
/**
"config-db-wiki-help": "Gitt de Benotzernumm an d'Passwuert an dat benotzt wäert gi fir sech bei den normale Wiki-Operatiounen mat der Datebank ze connectéieren.\nWann et de Kont net gëtt, a wann den Installatiouns-Kont genuch Rechter huet, gëtt dëse Benotzerkont opgemaach mat dem Minimum vu Rechter déi gebraucht gi fir dës Wiki bedreiwen ze kënnen.",
"config-mysql-old": "MySQL $1 oder eng méi nei Versioun gëtt gebraucht, Dir hutt $2.",
"config-db-port": "Port vun der Datebank:",
- "config-db-schema": "Schema fir MediaWiki",
+ "config-db-schema": "Schema fir MediaWiki (keng Bindestrécher)",
"config-db-schema-help": "D'Schemaen hei driwwer si gewéinlech korrekt.\nÄnnert se nëmme wann Dir wësst datt et néideg ass.",
"config-pg-test-error": "Et ass net méiglech d'Datebank '''$1''' ze kontaktéieren: $2",
"config-sqlite-dir": "Repertoire vun den SQLite-Donnéeën",
"config-imagemagick": "Пронађен ImageMagick: <code>$1</code>.\nУмањивање слика ће бити омогућено ако омогућите отпремање.",
"config-gd": "Пронађена је GD уграђена графичка библиотека.\nУмањивање слика ће бити омогућено ако омогућите отпремање.",
"config-no-scaling": "Није могуће пронаћи GD библиотеку или ImageMagick.\nУмањивање слика ће бити онемогућено.",
- "config-using-server": "Користи се име сервера \"<nowiki>$1</nowiki>\".",
- "config-using-uri": "Користи се URL сервера \"<nowiki>$1$2</nowiki>\".",
- "config-uploads-not-safe": "<strong>Упозорење:</strong> Ваш подразумеван фолдер за отпремања <code>$1</code> је подложан извршењу произвољних скрипти.\nИако Медијавики проверава све отпремљене датотеке за безбедоносне претње, препоручује се [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Security#Upload_security да затворите ову безбедоносну рањивост] пре омогућавања отпремања.",
- "config-no-cli-uploads-check": "<strong>Упозорење:</strong> Ваш подразумеван фолдер за отпремање (<code>$1</code>) није проверен на рањивост на произвољно извршавање скрипте током CLI инсталације.",
+ "config-using-server": "Користи се име сервера „<nowiki>$1</nowiki>”.",
+ "config-using-uri": "Користи се URL сервера „<nowiki>$1$2</nowiki>”.",
+ "config-uploads-not-safe": "<strong>Упозорење:</strong> Ваш подразумевани директоријум за отпремања <code>$1</code> је подложан извршењу произвољних скрипти.\nИако Медијавики проверава све отпремљене датотеке за безбедоносне претње, препоручује се [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Security#Upload_security да затворите ову безбедоносну рањивост] пре омогућавања отпремања.",
+ "config-no-cli-uploads-check": "<strong>Упозорење:</strong> Ваш подразумевани директоријум за отпремање (<code>$1</code>) није проверен на рањивост\nна произвољно извршавање скрипте током CLI инсталације.",
"config-db-type": "Тип базе података:",
"config-db-host": "Хост базе података",
"config-db-wiki-settings": "Идентификуј овај вики",
* which returns more comprehensive result in case of an error, and has
* more parsing options.
*
+ * In PHP versions before 7.1, decoding a JSON string containing an empty key
+ * without passing $assoc as true results in a return object with a property
+ * named "_empty_" (because true empty properties were not supported pre-PHP-7.1).
+ * Instead, consider passing $assoc as true to return an associative array.
+ *
+ * But be aware that in all supported PHP versions, decoding an empty JSON object
+ * with $assoc = true returns an array, not an object, breaking round-trip consistency.
+ *
+ * See https://phabricator.wikimedia.org/T206411 for more details on these quirks.
+ *
* @param string $value The JSON string being decoded
* @param bool $assoc When true, returned objects will be converted into associative arrays.
*
* @return string
*/
public static function normalizeLinkUrl( $url ) {
- # First, make sure unsafe characters are encoded
+ # Test for RFC 3986 IPv6 syntax
+ $scheme = '[a-z][a-z0-9+.-]*:';
+ $userinfo = '(?:[a-z0-9\-._~!$&\'()*+,;=:]|%[0-9a-f]{2})*';
+ $ipv6Host = '\\[((?:[0-9a-f:]|%3[0-A]|%[46][1-6])+)\\]';
+ if ( preg_match( "<^(?:{$scheme})?//(?:{$userinfo}@)?{$ipv6Host}(?:[:/?#].*|)$>i", $url, $m ) &&
+ IP::isValid( rawurldecode( $m[1] ) )
+ ) {
+ $isIPv6 = rawurldecode( $m[1] );
+ } else {
+ $isIPv6 = false;
+ }
+
+ # Make sure unsafe characters are encoded
$url = preg_replace_callback( '/[\x00-\x20"<>\[\\\\\]^`{|}\x7F-\xFF]/',
function ( $m ) {
return rawurlencode( $m[0] );
$ret = self::normalizeUrlComponent(
substr( $url, 0, $end ), '"#%<>[\]^`{|}/?' ) . $ret;
+ # Fix IPv6 syntax
+ if ( $isIPv6 !== false ) {
+ $ipv6Host = "%5B({$isIPv6})%5D";
+ $ret = preg_replace(
+ "<^((?:{$scheme})?//(?:{$userinfo}@)?){$ipv6Host}(?=[:/?#]|$)>i",
+ "$1[$2]",
+ $ret
+ );
+ }
+
return $ret;
}
}
}
- $target2 = $target;
+ $target2 = Parser::normalizeLinkUrl( $target );
// Get protocol, default is http://
$protocol = 'http://';
$bits = wfParseUrl( $target );
if ( $target != '' ) {
$this->setParams( [
- 'query' => Parser::normalizeLinkUrl( $target2 ),
+ 'query' => $target2,
'namespace' => $namespace,
'protocol' => $protocol ] );
parent::execute( $par );
return false;
}
- /**
- * Return an appropriately formatted LIKE query and the clause
- *
- * @param string $query Search pattern to search for
- * @param string $prot Protocol, e.g. 'http://'
- *
- * @return array
- */
- static function mungeQuery( $query, $prot ) {
- $field = 'el_index';
- $dbr = wfGetDB( DB_REPLICA );
-
- if ( $query === '*' && $prot !== '' ) {
- // Allow queries like 'ftp://*' to find all ftp links
- $rv = [ $prot, $dbr->anyString() ];
- } else {
- $rv = LinkFilter::makeLikeArray( $query, $prot );
- }
-
- if ( $rv === false ) {
- // LinkFilter doesn't handle wildcard in IP, so we'll have to munge here.
- $pattern = '/^(:?[0-9]{1,3}\.)+\*\s*$|^(:?[0-9]{1,3}\.){3}[0-9]{1,3}:[0-9]*\*\s*$/';
- if ( preg_match( $pattern, $query ) ) {
- $rv = [ $prot . rtrim( $query, " \t*" ), $dbr->anyString() ];
- $field = 'el_to';
- }
- }
-
- return [ $rv, $field ];
- }
-
function linkParameters() {
$params = [];
$params['target'] = $this->mProt . $this->mQuery;
public function getQueryInfo() {
$dbr = wfGetDB( DB_REPLICA );
- // strip everything past first wildcard, so that
- // index-based-only lookup would be done
- list( $this->mungedQuery, $clause ) = self::mungeQuery( $this->mQuery, $this->mProt );
+
+ if ( $this->mQuery === '*' && $this->mProt !== '' ) {
+ $this->mungedQuery = [
+ 'el_index_60' . $dbr->buildLike( $this->mProt, $dbr->anyString() ),
+ ];
+ } else {
+ $this->mungedQuery = LinkFilter::getQueryConditions( $this->mQuery, [
+ 'protocol' => $this->mProt,
+ 'oneWildcard' => true,
+ 'db' => $dbr
+ ] );
+ }
if ( $this->mungedQuery === false ) {
// Invalid query; return no results
return [ 'tables' => 'page', 'fields' => 'page_id', 'conds' => '0=1' ];
}
- $stripped = LinkFilter::keepOneWildcard( $this->mungedQuery );
- $like = $dbr->buildLike( $stripped );
+ $orderBy = [];
+ if ( !isset( $this->mungedQuery['el_index_60'] ) ) {
+ $orderBy[] = 'el_index_60';
+ }
+ $orderBy[] = 'el_id';
+
$retval = [
'tables' => [ 'page', 'externallinks' ],
'fields' => [
'value' => 'el_index',
'url' => 'el_to'
],
- 'conds' => [
- 'page_id = el_from',
- "$clause $like"
- ],
- 'options' => [ 'USE INDEX' => $clause ]
+ 'conds' => array_merge(
+ [
+ 'page_id = el_from',
+ ],
+ $this->mungedQuery
+ ),
+ 'options' => [ 'ORDER BY' => $orderBy ]
];
if ( $this->mNs !== null && !$this->getConfig()->get( 'MiserMode' ) ) {
/**
* Override to squash the ORDER BY.
- * We do a truncated index search, so the optimizer won't trust
- * it as good enough for optimizing sort. The implicit ordering
- * from the scan will usually do well enough for our needs.
+ * Not much point in descending order here.
* @return array
*/
function getOrderFields() {
* @param array $err Error messages. Each item is an error message.
* It may either be a string message name or array message name and
* parameters, like the second argument to OutputPage::wrapWikiMsg().
+ * @param bool $isPermError Whether the error message is about user permissions.
*/
- function showForm( $err ) {
+ function showForm( $err, $isPermError = false ) {
$this->getSkin()->setRelevantTitle( $this->oldTitle );
$out = $this->getOutput();
}
if ( count( $err ) ) {
- $action_desc = $this->msg( 'action-move' )->plain();
- $errMsgHtml = $this->msg( 'permissionserrorstext-withaction',
- count( $err ), $action_desc )->parseAsBlock();
+ if ( $isPermError ) {
+ $action_desc = $this->msg( 'action-move' )->plain();
+ $errMsgHtml = $this->msg( 'permissionserrorstext-withaction',
+ count( $err ), $action_desc )->parseAsBlock();
+ } else {
+ $errMsgHtml = $this->msg( 'cannotmove', count( $err ) )->parseAsBlock();
+ }
if ( count( $err ) == 1 ) {
$errMsg = $err[0];
$permErrors = $nt->getUserPermissionsErrors( 'delete', $user );
if ( count( $permErrors ) ) {
# Only show the first error
- $this->showForm( $permErrors );
+ $this->showForm( $permErrors, true );
return;
}
$permStatus = $mp->checkPermissions( $user, $this->reason );
if ( !$permStatus->isOK() ) {
- $this->showForm( $permStatus->getErrorsArray() );
+ $this->showForm( $permStatus->getErrorsArray(), true );
return;
}
"dellogpage": "Журнал выдаленняў",
"dellogpagetext": "Ніжэй паказаны спіс апошніх выдаленняў.",
"deletionlog": "журнал выдаленняў",
+ "log-name-create": "Журнал стварэння старонак",
+ "log-description-create": "Ніжэй прыведзены спіс апошніх стварэнняў старонак.",
+ "logentry-create-create": "$1 {{GENDER:$2|стварыў|стварыла}} старонку $3",
"reverted": "Адкочана да ранейшай версіі",
"deletecomment": "Прычына:",
"deleteotherreason": "Іншы/дадатковы повад:",
"move-watch": "Watch source page and target page",
"movepagebtn": "Move page",
"pagemovedsub": "Move succeeded",
+ "cannotmove": "The page could not be moved, for the following {{PLURAL:$1|reason|reasons}}:",
"movepage-moved": "<strong>\"$1\" has been moved to \"$2\"</strong>",
"movepage-moved-redirect": "A redirect has been created.",
"movepage-moved-noredirect": "The creation of a redirect has been suppressed.",
"dberr-again": "Try waiting a few minutes and reloading.",
"dberr-info": "(Cannot access the database: $1)",
"dberr-info-hidden": "(Cannot access the database)",
- "dberr-usegoogle": "You can try searching via Google in the meantime.",
- "dberr-outofdate": "Note that their indexes of our content may be out of date.",
- "dberr-cachederror": "This is a cached copy of the requested page, and may not be up to date.",
"htmlform-invalid-input": "There are problems with some of your input.",
"htmlform-select-badoption": "The value you specified is not a valid option.",
"htmlform-int-invalid": "The value you specified is not an integer.",
"AHmed Khaled",
"Caleidoscopic",
"ديفيد",
- "LittlePuppers"
+ "LittlePuppers",
+ "Theklan"
]
},
"tog-underline": "Subrayar los enlaces:",
"ipb-disableusertalk": "Impedir que este usuario edite su propia página de discusión mientras esté bloqueado",
"ipb-change-block": "Rebloquear al usuario con estos datos",
"ipb-confirm": "Confirmar bloqueo",
+ "ipb-pages-label": "Páginas",
"badipaddress": "La dirección IP no tiene el formato correcto.",
"blockipsuccesssub": "Bloqueo realizado con éxito",
"blockipsuccesstext": "\"[[Special:Contributions/$1|$1]]\" ha sido bloqueado.<br />\nVéase la [[Special:BlockList|lista de bloqueos]] para revisarlo.",
"createaccountblock": "creación de cuenta bloqueada",
"emailblock": "correo electrónico bloqueado",
"blocklist-nousertalk": "no puede editar su propia página de discusión",
+ "blocklist-editing": "editando",
"ipblocklist-empty": "La lista de bloqueos está vacía.",
"ipblocklist-no-results": "El nombre de usuario o IP indicado no está bloqueado.",
"blocklink": "bloquear",
"logentry-delete-restore": "$1 hannem {{GENDER:$2|porot haddlam}} pan $3 ($4)",
"logentry-delete-revision": "$1 hannem {{PLURAL:$5|uzolliechem}} disnem $3, hea panar {{GENDER:$2|bodol’la}}: $4",
"revdelete-content-hid": "mozkur lipoila",
- "logentry-move-move": "$1-an $3 panak $4 {{GENDER:$2|haloilea}}",
+ "logentry-move-move": "$1, hannem $3 panak $4 {{GENDER:$2|haloilea}}",
"logentry-move-move-noredirect": "$1, hannem pan $3 savn $4 {{GENDER:$2|haloilam}} punornirdexon dorinastanam",
"logentry-move-move_redir": "$1 hannem pan $3 savn $4 {{GENDER:$2|haloilolo}} punornirdexonavoir",
"logentry-patrol-patrol-auto": "$1-an $3, hea panachem $4, hea uzollniecho paro kelam mhonn apoap {{GENDER:$2|khunnailam}}.",
"tog-shownumberswatching": "Aazahl Benutzer aazeige, wo ne Syten am Aaluege sy (i den Artikelsyte, i de «letschten Änderigen» und i der Beobachtigslischte)",
"tog-oldsig": "Aktuelli Unterschrift:",
"tog-fancysig": "Unterschrift as Wikitext behandle (ohni automatischi Verlinkig)",
- "tog-uselivepreview": "Vorschau sofort aazeige",
+ "tog-uselivepreview": "Vorschau ohni Neilade vu dr Syte aazaige",
"tog-forceeditsummary": "Sag mer s, wänn i s Zämmefassigsfeld läär loss",
"tog-watchlisthideown": "Eigeni Änderige uf d Beobachtigslischt usblände",
"tog-watchlisthidebots": "Bot-Änderige in d Beobachtigslischt usblende",
"tog-watchlisthideminor": "Chlyni Änderige nit in de Beobachtigslischte aazeige",
"tog-watchlisthideliu": "Bearbeitige vu aagmäldete Benutzer usblände",
"tog-watchlistreloadautomatically": "Wänn e Filter gänderet woren isch, d Beobachtigslischt automatisch nei lade (brucht JavaScript)",
+ "tog-watchlistunwatchlinks": "Diräkti Nimi-Beobachte-/Beobachte-Markierige ({{int:Watchlist-unwatch}}/{{int:Watchlist-unwatch-undo}}) zue beobachtete Syte mit Ändrige zuefiege (doderfiur bruucht s JavaScript)",
"tog-watchlisthideanons": "Bearbeitige vu anonyme Benutzer (IP-Adresse) usblände",
"tog-watchlisthidepatrolled": "vum Fäldhieter aagluegti Änderige in dr Beobachtigslischt usblände",
"tog-watchlisthidecategorization": "Kategorisierig vo de Syte nid zeige",
"subcategories": "ကၞါင့်ကါင်ဖါသယ်",
"category-media-header": "အ်ုဆုဂ် \"$1\" ခဝ့် လိက်မေံလ်ုဖး",
"category-empty": "<em>ဆ်ုဆုဂ်ယိုဝ် ခိင်ခါ့အိုဝ် လိက်မေံၜၠါ်လ်ုဖး လ်ုမွာဲၜး မီဒီယ်ုလ်ုဖး လ်ုအှ်ၜး။</em>",
- "hidden-categories": "{{PLURAL:$1|အ်ှကှ်ေသူးထါ့ ကဏ္ဍ|အ်ှကှ်ေသူးထါ့ ကဏ္ဍသယ်}}",
+ "hidden-categories": "{{PLURAL:$1|အ်ှကှ်ေသူးထ အ်ုဆောတ်|အ်ှကှ်ေသူးထ အ်ုဆောတ်လ်ုဖး}}",
"category-subcat-count": "{{PLURAL:$2|ဆ်ုဆုဂ်ယိုဝ် အ်ုဖံင့်လာ ဆ်ုဆုဂ်ကါင်ဖါလှ် အ်ှဝေ့ဍး။ |ဆ်ုဆုဂ်ယိုဝ် ကုံကံင်း $2 ၮါင်း သယ်လ်ုဖးခဝ့် အ်ုဖံင့်လာ {{PLURAL:$1|ဆ်ုဆုဂ်ကါင်ဖါ|ဆ်ုဆုဂ်ကါင်ဖါလ်ုဖး $1 ၮါင်း}} အ်ှဆေဝ်ႋ။}}",
"category-article-count": "{{PLURAL:$2|ဆ်ုဆုဂ်ယိုဝ် အ်ုဖံင့်လာလိက်မေံလှ်အ်ှ။|ကုံကံင်း $2 ခဝ့်ၮှ် ဖံင့်လာ {{PLURAL:$1|လိက်မေံၜၠါ်|လိက်မေံၜၠါ်လ်ုဖး $1 ၮါင်းၮှ်}} ဆ်ုဆုဂ်ဖိုင်ယိုဝ် အ်ှလှ်။}}",
"category-file-count": "{{PLURAL:$2|ဆ်ုဆုဂ်ယိုဝ် အ်ုဖံင့်လာလိက်မေံလှ်အ်ှ။|ကုံကံင်း $2 ခဝ့်ၮှ် ဖံင့်လာ {{PLURAL:$1|လိက်မေံၜၠါ်|လိက်မေံၜၠါ်လ်ုဖး $1 ၮါင်းၮှ်}} ဆ်ုဆုဂ်ဖိုင်ယိုဝ် အ်ှလှ်။}}",
"viewsourcelink": "မ်ုယောဝ်ႋ အ်ုထိုဝ်",
"editsectionhint": "ကၞါင့်ယိုဝ် မ်ုအင်းတင်: $1",
"toc": "ပ်ုယုံ့ခေါဟ်တင်",
- "showtoc": "á\80\8dá\80¯á\80\82á\80ºá\81®ဲ",
+ "showtoc": "á\80\8dá\80¬á\80\8fဲ",
"hidetoc": "အ်ှသူး",
"collapsible-collapse": "မ်ုပေဝ်ႋက္ဍာ",
- "collapsible-expand": "á\80\9cá\80\9dá\80ºá\80\9cá\80²á\80¬",
+ "collapsible-expand": "á\80\99á\80¬á\80\9cá\80¬á\80²",
"confirmable-confirm": "{{GENDER:$1|ၮ်ု}} ထီ့ဆာႋဝး?",
"confirmable-yes": "မွာဲ",
"confirmable-no": "လ်ုမာၜး",
"databaseerror-error": "အ်ုမး: $1",
"badtitle": "လိက်မေံဆ်ုနာႋ",
"badtitletext": "အင်းကိင်ႋလင်ထ လိက်မေံၜၠါ် ခေါဟ်တင်ၮ်ှ လ်ုဖံင်ပၞံင့် (လ်ု) လ်ုအှ်မိင်ၜး (လ်ု) ၰာၰံင်ဘာႋသာ့လ်ုဖး(inter-language or inter-wiki title)အိုဝ် ထိုဝ်ၜုဂ်လင့်မးဝေ့လှ်။",
- "viewsource": "á\80\99á\80ºá\80¯á\80\9aá\80±á\80¬á\80\9dá\80ºá\82\8bá\80¡á\80ºá\80¯á\80\9dá\80®á\80\81á\81\9eá\80¬",
+ "viewsource": "á\80\99á\80ºá\80¯á\80\9aá\80±á\80¬á\80\9dá\80ºá\82\8bá\80¡á\80ºá\80¯á\80\91á\80«á\80º",
"viewsource-title": "$1အှ် အ်ုထိုဝ် မ်ုယောဝ်ႋ",
"viewsourcetext": "လိက်မေံခေါဟ်အိုဝ် အ်ုထိုဝ် ယောဝ်ႋၯံင် ကေဝ်ဍံင်ၮေဝ်လှ်။",
"userlogin-yourname": "က်ုဆာမိင်",
"botpasswords-label-delete": "ထုဂ်ဆိင့်",
"botpasswords-label-resetpassword": "ထုဂ်ဆိင့် ဝီးၜါ်ဖၠုံး",
"passwordreset": "ၜီးၜါ်သင့် မ်ုအင်းတင်",
+ "changeemail-none": "(ပၠဝ်ပြေ)",
"bold_sample": "လိက်ဖၠုံးသိုင့်",
"bold_tip": "လိက်ဖၠုံးသိုင့်",
"italic_sample": "လိက်ဖၠုံးပ်ု",
"updated": "(တါင်သင့်ၰေဝ်)",
"previewnote": "<strong>အ်ုယိုဝ် အ်ုဍံင် ဟ်ုယောဝ်ႋဍာလဝ့်ၮှ် သာ့ၮင်လ်ုၯေဝ်။</strong>\nၮ်ုအင်းလဲါထသယ်ၮှ် လ်ုသိုင့်ကုံဝးဍာ်ၜး။",
"continue-editing": "မ်ုလေဝ် ဆ်ုအင်ႋတင်ႋလင်ႋ",
- "editing": "$1 ၮှ် အင်းတင်ဖှ်ေဝေ့",
+ "editing": "ဆ်ုသံင့်ၜးၯဴ $1",
"creating": "တင်ႋထုင်း $1",
"editingsection": "$1 (ကၞါင့်) အိုဝ် အင်းတင်ဖှ်ေဝေ့။",
"templatesused": "လိက်မေံၜၠါ်ယိုဝ် အင်းမာၮေဝ်ထ {{PLURAL:$1|တန်ပ်ုလိတ်|တန်ပ်ုလိတ်လ်ုဖး}} -",
"rcnotefrom": "ဖံင့်လာႋသယ်ၮှ် <strong>$3၊ $4</strong> ခဝ့် ၯံင် {{PLURAL:$5|ဆ်ုအင်းလဲါ|ဆ်ုအင်းလဲါလ်ုဖး}} မွာဲဆေဝ်ႋ (<strong>$1</strong> ခဝ့်ဍာ် ၮဲဖှ်ေထ)။",
"rclistfrom": "$3 $2 ခဝ့်ၯံင် ဆ်ုအင်းလယ်သင့်သယ်ၮှ် မ်ုၮဲဖှ်ေ",
"rcshowhideminor": "အ်ုဍံင်လ်ုဍောဟ် ဆ်ုအင်းတင်ႋ $1 ၯင်း",
- "rcshowhideminor-show": "á\80\8dá\80¯á\80\82á\80ºá\81®ဲ",
+ "rcshowhideminor-show": "á\80\8dá\80¬á\80\8fဲ",
"rcshowhideminor-hide": "အ်ှသူး",
"rcshowhidebots": "ဘော့သယ် $1သိုဝ်",
- "rcshowhidebots-show": "á\80\8dá\80¯á\80\82á\80ºá\81®ဲ",
+ "rcshowhidebots-show": "á\80\8dá\80¬á\80\8fဲ",
"rcshowhidebots-hide": "အ်ှသူး",
"rcshowhideliu": "တံင်ထာ့အ်ှက်ုစာ စ်ုလေဝ်ကၠယ် $1",
- "rcshowhideliu-show": "á\80\8dá\80¯á\80\82á\80ºá\81®ဲ",
+ "rcshowhideliu-show": "á\80\8dá\80¬á\80\8fဲ",
"rcshowhideliu-hide": "အ်ှသူး",
"rcshowhideanons": "အ်ုမိင်လ်ုအှ် ဆ်ုသုံက်ုဆာႋ $1ၮှ်",
- "rcshowhideanons-show": "á\80\8dá\80¯á\80\82á\80ºá\81®ဲ",
+ "rcshowhideanons-show": "á\80\8dá\80¬á\80\8fဲ",
"rcshowhideanons-hide": "အှ်သူး",
"rcshowhidepatr": "ခိုဝ်ယောဝ်ဆ်ုအင်ႋတင်ႋ $1အိုဝ်",
"rcshowhidemine": "$1 ၮင့်ဆါႋဆ်ုအင်ႋတင်ႋ",
- "rcshowhidemine-show": "á\80\8dá\80¯á\80\82á\80ºá\81®ဲ",
+ "rcshowhidemine-show": "á\80\8dá\80¬á\80\8fဲ",
"rcshowhidemine-hide": "အ်ှသူး",
"rclinks": "$2 မူႋသင့်ဍာဲခါ့ လါင်းခါင့်ဆ်ုအင်းတင်ႋ $1 ၮါင်းၮှ် မ်ုၮဲဖှ်ေ",
"diff": "လ်ုၜးဍံင်",
"hist": "လိက်အုဂ်ကေဝ်",
"hide": "အ်ှသူး",
- "show": "á\80\8dá\80¯á\80\82á\80ºá\81®ဲ",
+ "show": "á\80\8dá\80¬á\80\8fဲ",
"minoreditletter": "အ်ုဍံင်လ်ုဍောဟ်",
"newpageletter": "အ်ုသင့်",
"boteditletter": "ဘော့",
"logentry-newusers-autocreate": "က်ုဆာအ်ုဆ်ုမာ $1 ၮှ် အ်ုဆ်ုမာသိုဝ် {{GENDER:$2|အင်းတင်ထဝေ့}}",
"logentry-upload-upload": "$1 ၮှ် $3 အိုဝ် {{GENDER:$2|upload ဆောဟ်ထါင်ႋ}}",
"logentry-upload-overwrite": "$3 ၮှ်ခဝ့် ဗားရှင်းအ်ုသင့်အိုဝ် $1 {{GENDER:$2|upload ပ္တုံထုင်းထဆေဝ်ႋ}}",
+ "rightsnone": "(ပၠဝ်ပြေ)",
"searchsuggest-search": "{{SITENAME}} ဖိုင် မ်ုအင်းၰူ့",
"duration-days": "$1 {{PLURAL:$1|မူႋသင့်|မူႋသင့်လ်ုဖး}}",
"mw-widgets-titlesmultiselect-placeholder": "ဆူ့ဍုဂ် ဆ်ုအှ်ထါင်...",
"tag-mw-new-redirect": "Sin choán-ia̍h",
"tag-mw-removed-redirect": "Choán-ia̍h the̍h-tiāu",
"tag-mw-changed-redirect-target": "Choán-ia̍h bo̍k-phiau kái-piàn",
+ "logentry-delete-delete": "$1 kā ia̍h-bīn $3 {{GENDER:$2|thâi tiāu}}",
"logentry-delete-delete_redir": "$1 ēng têng-siá lâi kā choán-ia̍h $3 {{GENDER:$2|thâi-tiāu}}",
"logentry-move-move": "$1 {{GENDER:$2|sóa}} $3 chit ia̍h khì $4",
"logentry-move-move_redir": "$1 iōng choán-ia̍h {{GENDER:$2|sóa}} ia̍h-bīn $3 kòe $4",
"categories-submit": "Mostrar",
"categoriespagetext": "{{PLURAL:$1|A seguinte categoria existe na wiki e pode, ou não, ser usada|As seguintes categorias existem na wiki e podem, ou não, ser usadas}}.\nVeja também as [[Special:WantedCategories|categorias desejadas]].",
"categoriesfrom": "Mostrar categorias que comecem por:",
- "deletedcontributions": "Edições eliminadas",
+ "deletedcontributions": "Contribuições eliminadas",
"deletedcontributions-title": "Edições eliminadas",
"sp-deletedcontributions-contribs": "contribuições",
"linksearch": "Pesquisa de hiperligações externas",
"exif-gpsprocessingmethod": "Nome do método de processamento do GPS",
"exif-gpsareainformation": "Nome da área do GPS",
"exif-gpsdatestamp": "Data do GPS",
- "exif-gpsdifferential": "Correcção do diferencial do GPS",
+ "exif-gpsdifferential": "Correção do diferencial do GPS",
"exif-jpegfilecomment": "Comentário de ficheiro JPEG",
"exif-keywords": "Termos-chave",
"exif-worldregioncreated": "Região do mundo onde a fotografia foi tirada",
"exif-scenecapturetype-0": "Padrão",
"exif-scenecapturetype-1": "Paisagem",
"exif-scenecapturetype-2": "Retrato",
- "exif-scenecapturetype-3": "Cena nocturna",
+ "exif-scenecapturetype-3": "Cena noturna",
"exif-gaincontrol-0": "Nenhum",
"exif-gaincontrol-1": "Ganho positivo baixo",
"exif-gaincontrol-2": "Ganho positivo alto",
"ديفيد",
"Daimona Eaytoy",
"A2093064",
- "BadDog"
+ "BadDog",
+ "The Discoverer"
]
},
"sidebar": "{{notranslate}}",
"move-watch": "The text of the checkbox to watch the pages you are moving from and to. If checked, both the destination page and the original page will be added to the watchlist, even if you decide not to leave a redirect behind.\n\nSee also:\n* {{msg-mw|Move-page-legend|legend for the form}}\n* {{msg-mw|newtitle|label for new title}}\n* {{msg-mw|Movereason|label for textarea}}\n* {{msg-mw|Movetalk|label for checkbox}}\n* {{msg-mw|Move-leave-redirect|label for checkbox}}\n* {{msg-mw|Fix-double-redirects|label for checkbox}}\n* {{msg-mw|Move-subpages|label for checkbox}}\n* {{msg-mw|Move-talk-subpages|label for checkbox}}",
"movepagebtn": "Button label on the special 'Move page'.\n\n{{Identical|Move page}}",
"pagemovedsub": "Message displayed as aheader of the body, after successfully moving a page from source to target name.",
+ "cannotmove": "Error message for a generic failure while moving a page, to be used together with a specific error message.\n\nParameters:\n* $1 - the number of reasons that were found why the action cannot be performed.",
"movepage-moved": "Message displayed after successfully moving a page from source to target name.\n\nParameters:\n* $1 - the source page as a link with display name\n* $2 - the target page as a link with display name\n* $3 - (optional) the source page name without a link\n* $4 - (optional) the target page name without a link\nSee also:\n* {{msg-mw|Movepage-moved-redirect}}\n* {{msg-mw|Movepage-moved-noredirect}}",
"movepage-moved-redirect": "See also:\n* {{msg-mw|Movepage-moved}}\n* {{msg-mw|Movepage-moved-noredirect}}",
"movepage-moved-noredirect": "The message is shown after pagemove if checkbox \"{{int:move-leave-redirect}}\" was unselected before moving.\n\nSee also:\n* {{msg-mw|Movepage-moved}}\n* {{msg-mw|Movepage-moved-redirect}}",
"dberr-again": "This message does not allow any wiki nor html markup.",
"dberr-info": "This message does not allow any wiki nor html markup. Parameters:\n* $1 - database server name\nSee also:\n* {{msg-mw|Dberr-info-hidden}} - hides database server name",
"dberr-info-hidden": "This message does not allow any wiki nor html markup.\n\nSee also:\n* {{msg-mw|Dberr-info}} - shows database server name",
- "dberr-usegoogle": "This message does not allow any wiki nor html markup.",
- "dberr-outofdate": "{{doc-singularthey}}\nIn this sentence, '''their''' indexes refers to '''Google's''' indexes. This message does not allow any wiki nor html markup.",
- "dberr-cachederror": "Used as error message at the bottom of the page.",
"htmlform-invalid-input": "Used as error message in HTML forms.\n\n* {{msg-mw|Htmlform-required}}\n* {{msg-mw|Htmlform-float-invalid}}\n* {{msg-mw|Htmlform-int-invalid}}\n* {{msg-mw|Htmlform-int-toolow}}\n* {{msg-mw|Htmlform-int-toohigh}}\n* {{msg-mw|Htmlform-select-badoption}}",
"htmlform-select-badoption": "Used as error message in HTML forms.\n\n* {{msg-mw|Htmlform-invalid-input}}\n* {{msg-mw|Htmlform-required}}\n* {{msg-mw|Htmlform-float-invalid}}\n* {{msg-mw|Htmlform-int-invalid}}\n* {{msg-mw|Htmlform-int-toolow}}\n* {{msg-mw|Htmlform-int-toohigh}}",
"htmlform-int-invalid": "Used as error message in HTML forms.\n\n* {{msg-mw|Htmlform-invalid-input}}\n* {{msg-mw|Htmlform-required}}\n* {{msg-mw|Htmlform-float-invalid}}\n* {{msg-mw|Htmlform-int-toolow}}\n* {{msg-mw|Htmlform-int-toohigh}}\n* {{msg-mw|Htmlform-select-badoption}}",
"htmlform-user-not-exists": "Error message shown if a user with the name provided by the user does not exist. $1 is the username.",
"htmlform-user-not-valid": "Error message shown if the name provided by the user isn't a valid username. $1 is the username.",
"rawmessage": "{{notranslate}} Used to pass arbitrary text as a message specifier array",
- "logentry-delete-delete": "{{Logentry|[[Special:Log/delete]]}}",
+ "logentry-delete-delete": "$1, hannem {{GENDER:$2|kadun udoile}} pan $3",
"logentry-delete-delete_redir": "{{Logentry|[[Special:Log/delete]]}}",
"logentry-delete-restore": "{{Logentry|[[Special:Log/delete]]}}\n* $4 - {{msg-mw|restore-count-revisions}} or {{msg-mw|restore-count-files}}, or a combination with both (e.g. \"3 revision and 1 file\")\n\n'''A note for RTL languages''': if $3 is a name of a page or a file written in a different language, the number in the beginning of $4 may be displayed incorrectly. Consider inserting a word or an RLM between $3 and $4.",
"logentry-delete-restore-nocount": "{{Logentry|[[Special:Log/delete]]}}",
"sp-contributions-uploads": "اپلوڈ کردہ",
"sp-contributions-logs": "لاگز",
"sp-contributions-talk": "ڳالھ مہاڑ",
- "sp-contributions-search": "حصے پاؤݨ آلیاں دی تلاش",
+ "sp-contributions-search": "حصے پاوݨ آلیاں دی ڳول",
"sp-contributions-username": "آئی پی پتہ یا ورتݨ آلا ناں:",
"sp-contributions-toponly": "صرف اوہ تبدیلیاں ݙکھاؤ جیہڑیاں ہُݨے ہُݨے تھیاں ہن۔",
"sp-contributions-newonly": "صرف نویں ورقیاں بݨݨ آلیاں لکھتاں ݙیکھاؤ",
"tooltip-namespace_association": "勾選此核選方塊以包含與選擇命名空間相關的對話或主題命名空間",
"blanknamespace": "(主要)",
"contributions": "{{GENDER:$1|使用者}}貢獻",
- "contributions-title": "$1 的使用者貢獻",
+ "contributions-title": "$1的使用者貢獻",
"mycontris": "貢獻",
"anoncontribs": "貢獻",
- "contribsub2": "{{GENDER:$3|$1}} 的貢獻 ($2)",
+ "contribsub2": "{{GENDER:$3|$1}}的貢獻（$2）",
"contributions-userdoesnotexist": "使用者帳號 \"$1\" 尚未註冊。",
"nocontribs": "沒有找到符合條件的變更。",
"uctop": "(目前)",
$spec = $this->getArg();
- $likes = [];
+ $protConds = [];
foreach ( [ 'http://', 'https://' ] as $prot ) {
- $like = LinkFilter::makeLikeArray( $spec, $prot );
- if ( !$like ) {
+ $conds = LinkFilter::getQueryConditions( $spec, [ 'protocol' => $prot ] );
+ if ( !$conds ) {
$this->fatalError( "Not a valid hostname specification: $spec" );
}
- $likes[$prot] = $like;
+ $protConds[$prot] = $conds;
}
if ( $this->hasOption( 'all' ) ) {
/** @var $dbr Database */
$dbr = $this->getDB( DB_REPLICA, [], $wikiID );
- foreach ( $likes as $like ) {
+ foreach ( $protConds as $conds ) {
$count = $dbr->selectField(
'externallinks',
'COUNT(*)',
- [ 'el_index' . $dbr->buildLike( $like ) ],
+ $conds,
__METHOD__
);
if ( $count ) {
$count = 0;
/** @var $dbr Database */
$dbr = $this->getDB( DB_REPLICA );
- foreach ( $likes as $prot => $like ) {
+ foreach ( $protConds as $prot => $conds ) {
$res = $dbr->select(
'externallinks',
[ 'DISTINCT el_from' ],
- [ 'el_index' . $dbr->buildLike( $like ) ],
+ $conds,
__METHOD__
);
$count = $dbr->numRows( $res );
public function execute() {
global $wgServer;
+
+ // Extract the host and scheme from $wgServer
+ $bits = wfParseUrl( $wgServer );
+ if ( !$bits ) {
+ $this->error( 'Could not parse $wgServer' );
+ exit( 1 );
+ }
+
$this->output( "Deleting self externals from $wgServer\n" );
$db = $this->getDB( DB_MASTER );
- while ( 1 ) {
- $this->commitTransaction( $db, __METHOD__ );
- $q = $db->limitResult( "DELETE /* deleteSelfExternals */ FROM externallinks WHERE el_to"
- . $db->buildLike( $wgServer . '/', $db->anyString() ), $this->getBatchSize() );
- $this->output( "Deleting a batch\n" );
- $db->query( $q );
- if ( !$db->affectedRows() ) {
- return;
+
+ // If it's protocol-relative, we need to do both http and https.
+ // Otherwise, just do the specified scheme.
+ $host = $bits['host'];
+ if ( isset( $bits['port'] ) ) {
+ $host .= ':' . $bits['port'];
+ }
+ if ( $bits['scheme'] != '' ) {
+ $conds = [ LinkFilter::getQueryConditions( $host, [ 'protocol' => $bits['scheme'] . '://' ] ) ];
+ } else {
+ $conds = [
+ LinkFilter::getQueryConditions( $host, [ 'protocol' => 'http://' ] ),
+ LinkFilter::getQueryConditions( $host, [ 'protocol' => 'https://' ] ),
+ ];
+ }
+
+ foreach ( $conds as $cond ) {
+ if ( !$cond ) {
+ continue;
}
+ $cond = $db->makeList( $cond, LIST_AND );
+ do {
+ $this->commitTransaction( $db, __METHOD__ );
+ $q = $db->limitResult( "DELETE /* deleteSelfExternals */ FROM externallinks WHERE $cond",
+ $this->mBatchSize );
+ $this->output( "Deleting a batch\n" );
+ $db->query( $q );
+ } while ( $db->affectedRows() );
}
}
}
-- which allows for fast searching for all pages under example.com with the
-- clause:
-- WHERE el_index LIKE 'http://com.example.%'
+ --
+ -- Note if you enable or disable PHP's intl extension, you'll need to run
+ -- maintenance/refreshExternallinksIndex.php to refresh this field.
el_index nvarchar(450) NOT NULL,
-- This is el_index truncated to 60 bytes to allow for sortable queries that
--- /dev/null
+<?php
+/**
+ * Refresh the externallinks table el_index and el_index_60 from el_to
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Maintenance
+ */
+
+require_once __DIR__ . '/Maintenance.php';
+
+/**
+ * Maintenance script that refreshes the externallinks table el_index and
+ * el_index_60 from el_to
+ *
+ * @ingroup Maintenance
+ * @since 1.33
+ */
+class RefreshExternallinksIndex extends LoggedUpdateMaintenance {
+ public function __construct() {
+ parent::__construct();
+ $this->addDescription(
+ 'Refresh the externallinks table el_index and el_index_60 from el_to' );
+ $this->setBatchSize( 10000 );
+ }
+
+ protected function getUpdateKey() {
+ return static::class
+ . ' v' . LinkFilter::VERSION
+ . ( LinkFilter::supportsIDN() ? '+' : '-' ) . 'IDN';
+ }
+
+ protected function updateSkippedMessage() {
+ return 'externallinks table indexes up to date';
+ }
+
+ protected function doDBUpdates() {
+ $dbw = $this->getDB( DB_MASTER );
+ if ( !$dbw->tableExists( 'externallinks' ) ) {
+ $this->error( "externallinks table does not exist" );
+ return false;
+ }
+ $this->output( "Updating externallinks table index fields\n" );
+
+ $minmax = $dbw->selectRow(
+ 'externallinks',
+ [ 'min' => 'MIN(el_id)', 'max' => 'MAX(el_id)' ],
+ '',
+ __METHOD__
+ );
+
+ $updated = 0;
+ $deleted = 0;
+ $start = $minmax->min - 1;
+ $last = $minmax->max;
+ while ( $start < $last ) {
+ $end = min( $start + $this->mBatchSize, $last );
+ $this->output( "el_id $start - $end of $last\n" );
+ $res = $dbw->select( 'externallinks', [ 'el_id', 'el_to', 'el_index' ],
+ [
+ "el_id > $start",
+ "el_id <= $end",
+ ],
+ __METHOD__,
+ [ 'ORDER BY' => 'el_id' ]
+ );
+ foreach ( $res as $row ) {
+ $newIndexes = LinkFilter::makeIndexes( $row->el_to );
+ if ( !$newIndexes ) {
+ $dbw->delete( 'externallinks', [ 'el_id' => $row->el_id ], __METHOD__ );
+ $deleted++;
+ continue;
+ }
+ if ( in_array( $row->el_index, $newIndexes, true ) ) {
+ continue;
+ }
+
+ if ( count( $newIndexes ) === 1 ) {
+ $newIndex = $newIndexes[0];
+ } else {
+ // Assume the scheme is the only difference between the different $newIndexes.
+ // Keep this row's scheme, assuming there's another row with the other scheme.
+ $newIndex = substr( $row->el_index, 0, strpos( $row->el_index, ':' ) ) .
+ substr( $newIndexes[0], strpos( $newIndexes[0], ':' ) );
+ }
+ $dbw->update( 'externallinks',
+ [
+ 'el_index' => $newIndex,
+ 'el_index_60' => substr( $newIndex, 0, 60 ),
+ ],
+ [ 'el_id' => $row->el_id ],
+ __METHOD__
+ );
+ $updated++;
+ }
+ wfWaitForSlaves();
+ $start = $end;
+ }
+ $this->output( "Done, $updated rows updated, $deleted deleted.\n" );
+
+ return true;
+ }
+}
+
+$maintClass = "RefreshExternallinksIndex";
+require_once RUN_MAINTENANCE_IF_MAIN;
-- which allows for fast searching for all pages under example.com with the
-- clause:
-- WHERE el_index LIKE 'http://com.example.%'
+ --
+ -- Note if you enable or disable PHP's intl extension, you'll need to run
+ -- maintenance/refreshExternallinksIndex.php to refresh this field.
el_index blob NOT NULL,
-- This is el_index truncated to 60 bytes to allow for sortable queries that
];
}
- /**
- * @dataProvider provideMakeUrlIndexes()
- * @covers ::wfMakeUrlIndexes
- */
- public function testMakeUrlIndexes( $url, $expected ) {
- $index = wfMakeUrlIndexes( $url );
- $this->assertEquals( $expected, $index, "wfMakeUrlIndexes(\"$url\")" );
- }
-
- public static function provideMakeUrlIndexes() {
- return [
- // Testcase for T30627
- [
- 'https://example.org/test.cgi?id=12345',
- [ 'https://org.example./test.cgi?id=12345' ]
- ],
- [
- // mailtos are handled special
- // is this really right though? that final . probably belongs earlier?
- 'mailto:wiki@wikimedia.org',
- [ 'mailto:org.wikimedia@wiki.' ]
- ],
-
- // file URL cases per T30627...
- [
- // three slashes: local filesystem path Unix-style
- 'file:///whatever/you/like.txt',
- [ 'file://./whatever/you/like.txt' ]
- ],
- [
- // three slashes: local filesystem path Windows-style
- 'file:///c:/whatever/you/like.txt',
- [ 'file://./c:/whatever/you/like.txt' ]
- ],
- [
- // two slashes: UNC filesystem path Windows-style
- 'file://intranet/whatever/you/like.txt',
- [ 'file://intranet./whatever/you/like.txt' ]
- ],
- // Multiple-slash cases that can sorta work on Mozilla
- // if you hack it just right are kinda pathological,
- // and unreliable cross-platform or on IE which means they're
- // unlikely to appear on intranets.
- // Those will survive the algorithm but with results that
- // are less consistent.
-
- // protocol-relative URL cases per T31854...
- [
- '//example.org/test.cgi?id=12345',
- [
- 'http://org.example./test.cgi?id=12345',
- 'https://org.example./test.cgi?id=12345'
- ]
- ],
- ];
- }
-
/**
* @dataProvider provideWfMatchesDomainList
* @covers ::wfMatchesDomainList
[ 'http://', 'test.com', 'http://name:pass@test.com' ],
[ 'http://', '*.test.com', 'http://a.b.c.test.com/dir/dir/file?a=6' ],
[ null, 'http://*.test.com', 'http://www.test.com' ],
+ [ 'http://', '.test.com', 'http://.test.com' ],
+ [ 'http://', '*..test.com', 'http://foo..test.com' ],
[ 'mailto:', 'name@mail.test123.com', 'mailto:name@mail.test123.com' ],
+ [ 'mailto:', '*@mail.test123.com', 'mailto:name@mail.test123.com' ],
[ '',
'http://name:pass@www.test.com:12345/dir/dir/file.xyz.php#__se__?arg1=_&arg2[]=4rtg',
'http://name:pass@www.test.com:12345/dir/dir/file.xyz.php#__se__?arg1=_&arg2[]=4rtg'
'http://xx23124:__ffdfdef__@www.test.com:12345/dir' ,
'http://name:pass@www.test.com:12345/dir/dir/file.xyz.php#__se__?arg1=_&arg2[]=4rtg'
],
+ [ 'http://', '127.0.0.1', 'http://127.000.000.001' ],
+ [ 'http://', '127.0.0.*', 'http://127.000.000.010' ],
+ [ 'http://', '127.0.*', 'http://127.000.123.010' ],
+ [ 'http://', '127.*', 'http://127.127.127.127' ],
+ [ 'http://', '[0:0:0:0:0:0:0:0001]', 'http://[::1]' ],
+ [ 'http://', '[2001:db8:0:0:*]', 'http://[2001:0DB8::]' ],
+ [ 'http://', '[2001:db8:0:0:*]', 'http://[2001:0DB8::123]' ],
+ [ 'http://', '[2001:db8:0:0:*]', 'http://[2001:0DB8::123:456]' ],
+ [ 'http://', 'xn--f-vgaa.example.com', 'http://fóó.example.com', [ 'idn' => true ] ],
+ [ 'http://', 'xn--f-vgaa.example.com', 'http://f%c3%b3%C3%B3.example.com', [ 'idn' => true ] ],
+ [ 'http://', 'fóó.example.com', 'http://xn--f-vgaa.example.com', [ 'idn' => true ] ],
+ [ 'http://', 'f%c3%b3%C3%B3.example.com', 'http://xn--f-vgaa.example.com', [ 'idn' => true ] ],
+ [ 'http://', 'f%c3%b3%C3%B3.example.com', 'http://fóó.example.com' ],
+ [ 'http://', 'fóó.example.com', 'http://f%c3%b3%C3%B3.example.com' ],
+
+ [ 'http://', 'example.com./foo', 'http://example.com/foo' ],
+ [ 'http://', 'example.com/foo', 'http://example.com./foo' ],
+ [ 'http://', '127.0.0.1./foo', 'http://127.0.0.1/foo' ],
+ [ 'http://', '127.0.0.1/foo', 'http://127.0.0.1./foo' ],
// Tests for false positives
- [ 'http://', 'test.com', 'http://www.test.com', false ],
- [ 'http://', 'www1.test.com', 'http://www.test.com', false ],
- [ 'http://', '*.test.com', 'http://www.test.t.com', false ],
- [ '', 'http://test.com:8080', 'http://www.test.com:8080', false ],
- [ '', 'https://test.com', 'http://test.com', false ],
- [ '', 'http://test.com', 'https://test.com', false ],
- [ 'http://', 'http://test.com', 'http://test.com', false ],
- [ null, 'http://www.test.com', 'http://www.test.com:80', false ],
- [ null, 'http://www.test.com:80', 'http://www.test.com', false ],
- [ null, 'http://*.test.com:80', 'http://www.test.com', false ],
+ [ 'http://', 'test.com', 'http://www.test.com', [ 'found' => false ] ],
+ [ 'http://', 'www1.test.com', 'http://www.test.com', [ 'found' => false ] ],
+ [ 'http://', '*.test.com', 'http://www.test.t.com', [ 'found' => false ] ],
+ [ 'http://', 'test.com', 'http://xtest.com', [ 'found' => false ] ],
+ [ 'http://', '*.test.com', 'http://xtest.com', [ 'found' => false ] ],
+ [ 'http://', '.test.com', 'http://test.com', [ 'found' => false ] ],
+ [ 'http://', '.test.com', 'http://www.test.com', [ 'found' => false ] ],
+ [ 'http://', '*..test.com', 'http://test.com', [ 'found' => false ] ],
+ [ 'http://', '*..test.com', 'http://www.test.com', [ 'found' => false ] ],
+ [ '', 'http://test.com:8080', 'http://www.test.com:8080', [ 'found' => false ] ],
+ [ '', 'https://test.com', 'http://test.com', [ 'found' => false ] ],
+ [ '', 'http://test.com', 'https://test.com', [ 'found' => false ] ],
+ [ 'http://', 'http://test.com', 'http://test.com', [ 'found' => false ] ],
+ [ null, 'http://www.test.com', 'http://www.test.com:80', [ 'found' => false ] ],
+ [ null, 'http://www.test.com:80', 'http://www.test.com', [ 'found' => false ] ],
+ [ null, 'http://*.test.com:80', 'http://www.test.com', [ 'found' => false ] ],
[ '', 'https://gerrit.wikimedia.org/r/#/XXX/status:open,n,z',
- 'https://gerrit.wikimedia.org/r/#/q/status:open,n,z', false ],
+ 'https://gerrit.wikimedia.org/r/#/q/status:open,n,z', [ 'found' => false ] ],
[ '', 'https://*.wikimedia.org/r/#/q/status:open,n,z',
- 'https://gerrit.wikimedia.org/r/#/XXX/status:open,n,z', false ],
- [ 'mailto:', '@test.com', '@abc.test.com', false ],
- [ 'mailto:', 'mail@test.com', 'mail2@test.com', false ],
- [ '', 'mailto:mail@test.com', 'mail2@test.com', false ],
- [ '', 'mailto:@test.com', '@abc.test.com', false ],
- [ 'ftp://', '*.co', 'ftp://www.co.uk', false ],
- [ 'ftp://', '*.co', 'ftp://www.co.m', false ],
- [ 'ftp://', '*.co/dir/', 'ftp://www.co/dir2/', false ],
- [ 'ftp://', 'www.co/dir/', 'ftp://www.co/dir2/', false ],
- [ 'ftp://', 'test.com/dir/', 'ftp://test.com/', false ],
- [ '', 'http://test.com:8080/dir/', 'http://test.com:808/dir/', false ],
- [ '', 'http://test.com/dir/index.html', 'http://test.com/dir/index.php', false ],
+ 'https://gerrit.wikimedia.org/r/#/XXX/status:open,n,z', [ 'found' => false ] ],
+ [ 'mailto:', '@test.com', '@abc.test.com', [ 'found' => false ] ],
+ [ 'mailto:', 'mail@test.com', 'mail2@test.com', [ 'found' => false ] ],
+ [ '', 'mailto:mail@test.com', 'mail2@test.com', [ 'found' => false ] ],
+ [ '', 'mailto:@test.com', '@abc.test.com', [ 'found' => false ] ],
+ [ 'ftp://', '*.co', 'ftp://www.co.uk', [ 'found' => false ] ],
+ [ 'ftp://', '*.co', 'ftp://www.co.m', [ 'found' => false ] ],
+ [ 'ftp://', '*.co/dir/', 'ftp://www.co/dir2/', [ 'found' => false ] ],
+ [ 'ftp://', 'www.co/dir/', 'ftp://www.co/dir2/', [ 'found' => false ] ],
+ [ 'ftp://', 'test.com/dir/', 'ftp://test.com/', [ 'found' => false ] ],
+ [ '', 'http://test.com:8080/dir/', 'http://test.com:808/dir/', [ 'found' => false ] ],
+ [ '', 'http://test.com/dir/index.html', 'http://test.com/dir/index.php', [ 'found' => false ] ],
+ [ 'http://', '127.0.0.*', 'http://127.0.1.0', [ 'found' => false ] ],
+ [ 'http://', '[2001:db8::*]', 'http://[2001:0DB8::123:456]', [ 'found' => false ] ],
// These are false positives too and ideally shouldn't match, but that
// would require using regexes and RLIKE instead of LIKE
- // [ null, 'http://*.test.com', 'http://www.test.com:80', false ],
+ // [ null, 'http://*.test.com', 'http://www.test.com:80', [ 'found' => false ] ],
// [ '', 'https://*.wikimedia.org/r/#/q/status:open,n,z',
- // 'https://gerrit.wikimedia.org/XXX/r/#/q/status:open,n,z', false ],
+ // 'https://gerrit.wikimedia.org/XXX/r/#/q/status:open,n,z', [ 'found' => false ] ],
];
}
* testMakeLikeArrayWithValidPatterns()
*
* Tests whether the LIKE clause produced by LinkFilter::makeLikeArray($pattern, $protocol)
- * will find one of the URL indexes produced by wfMakeUrlIndexes($url)
+ * will find one of the URL indexes produced by LinkFilter::makeIndexes($url)
*
* @dataProvider provideValidPatterns
*
* @param string $protocol Protocol, e.g. 'http://' or 'mailto:'
* @param string $pattern Search pattern to feed to LinkFilter::makeLikeArray
- * @param string $url URL to feed to wfMakeUrlIndexes
- * @param bool $shouldBeFound Should the URL be found? (defaults true)
+ * @param string $url URL to feed to LinkFilter::makeIndexes
+ * @param array $options
+ * - found: (bool) Should the URL be found? (defaults true)
+ * - idn: (bool) Does this test require the idn conversion (default false)
*/
- function testMakeLikeArrayWithValidPatterns( $protocol, $pattern, $url, $shouldBeFound = true ) {
- $indexes = wfMakeUrlIndexes( $url );
+ function testMakeLikeArrayWithValidPatterns( $protocol, $pattern, $url, $options = [] ) {
+ $options += [ 'found' => true, 'idn' => false ];
+ if ( !empty( $options['idn'] ) && !LinkFilter::supportsIDN() ) {
+ $this->markTestSkipped( 'LinkFilter IDN support is not available' );
+ }
+
+ $indexes = LinkFilter::makeIndexes( $url );
$likeArray = LinkFilter::makeLikeArray( $pattern, $protocol );
$this->assertTrue( $likeArray !== false,
$regex = $this->createRegexFromLIKE( $likeArray );
$debugmsg = "Regex: '" . $regex . "'\n";
- $debugmsg .= count( $indexes ) . " index(es) created by wfMakeUrlIndexes():\n";
+ $debugmsg .= count( $indexes ) . " index(es) created by LinkFilter::makeIndexes():\n";
$matches = 0;
$debugmsg .= "\t'$index'\n";
}
- if ( $shouldBeFound ) {
+ if ( !empty( $options['found'] ) ) {
$this->assertTrue(
$matches > 0,
"Search pattern '$protocol$pattern' does not find url '$url' \n$debugmsg"
);
}
+ /**
+ * @dataProvider provideMakeIndexes()
+ * @covers LinkFilter::makeIndexes
+ */
+ public function testMakeIndexes( $url, $expected ) {
+ // Set global so file:// tests can work
+ $this->setMwGlobals( [
+ 'wgUrlProtocols' => [
+ 'http://',
+ 'https://',
+ 'mailto:',
+ '//',
+ 'file://', # Non-default
+ ],
+ ] );
+
+ $index = LinkFilter::makeIndexes( $url );
+ $this->assertEquals( $expected, $index, "LinkFilter::makeIndexes(\"$url\")" );
+ }
+
+ public static function provideMakeIndexes() {
+ return [
+ // Testcase for T30627
+ [
+ 'https://example.org/test.cgi?id=12345',
+ [ 'https://org.example./test.cgi?id=12345' ]
+ ],
+ [
+ // mailtos are handled special
+ 'mailto:wiki@wikimedia.org',
+ [ 'mailto:org.wikimedia.@wiki' ]
+ ],
+ [
+ // mailtos are handled special
+ 'mailto:wiki',
+ [ 'mailto:@wiki' ]
+ ],
+
+ // file URL cases per T30627...
+ [
+ // three slashes: local filesystem path Unix-style
+ 'file:///whatever/you/like.txt',
+ [ 'file://./whatever/you/like.txt' ]
+ ],
+ [
+ // three slashes: local filesystem path Windows-style
+ 'file:///c:/whatever/you/like.txt',
+ [ 'file://./c:/whatever/you/like.txt' ]
+ ],
+ [
+ // two slashes: UNC filesystem path Windows-style
+ 'file://intranet/whatever/you/like.txt',
+ [ 'file://intranet./whatever/you/like.txt' ]
+ ],
+ // Multiple-slash cases that can sorta work on Mozilla
+ // if you hack it just right are kinda pathological,
+ // and unreliable cross-platform or on IE which means they're
+ // unlikely to appear on intranets.
+ // Those will survive the algorithm but with results that
+ // are less consistent.
+
+ // protocol-relative URL cases per T31854...
+ [
+ '//example.org/test.cgi?id=12345',
+ [
+ 'http://org.example./test.cgi?id=12345',
+ 'https://org.example./test.cgi?id=12345'
+ ]
+ ],
+
+ // IP addresses
+ [
+ 'http://192.0.2.0/foo',
+ [ 'http://V4.192.0.2.0./foo' ]
+ ],
+ [
+ 'http://192.0.0002.0/foo',
+ [ 'http://V4.192.0.2.0./foo' ]
+ ],
+ [
+ 'http://[2001:db8::1]/foo',
+ [ 'http://V6.2001.DB8.0.0.0.0.0.1./foo' ]
+ ],
+
+ // Explicit specification of the DNS root
+ [
+ 'http://example.com./foo',
+ [ 'http://com.example./foo' ]
+ ],
+ [
+ 'http://192.0.2.0./foo',
+ [ 'http://V4.192.0.2.0./foo' ]
+ ],
+
+ // Weird edge case
+ [
+ 'http://.example.com/foo',
+ [ 'http://com.example../foo' ]
+ ],
+ ];
+ }
+
+ /**
+ * @dataProvider provideGetQueryConditions
+ * @covers LinkFilter::getQueryConditions
+ */
+ public function testGetQueryConditions( $query, $options, $expected ) {
+ $conds = LinkFilter::getQueryConditions( $query, $options );
+ $this->assertEquals( $expected, $conds );
+ }
+
+ public static function provideGetQueryConditions() {
+ return [
+ 'Basic example' => [
+ 'example.com',
+ [],
+ [
+ 'el_index_60 LIKE \'http://com.example./%\' ESCAPE \'`\' ',
+ 'el_index LIKE \'http://com.example./%\' ESCAPE \'`\' ',
+ ],
+ ],
+ 'Basic example with path' => [
+ 'example.com/foobar',
+ [],
+ [
+ 'el_index_60 LIKE \'http://com.example./foobar%\' ESCAPE \'`\' ',
+ 'el_index LIKE \'http://com.example./foobar%\' ESCAPE \'`\' ',
+ ],
+ ],
+ 'Wildcard domain' => [
+ '*.example.com',
+ [],
+ [
+ 'el_index_60 LIKE \'http://com.example.%\' ESCAPE \'`\' ',
+ 'el_index LIKE \'http://com.example.%\' ESCAPE \'`\' ',
+ ],
+ ],
+ 'Wildcard domain with path' => [
+ '*.example.com/foobar',
+ [],
+ [
+ 'el_index_60 LIKE \'http://com.example.%\' ESCAPE \'`\' ',
+ 'el_index LIKE \'http://com.example.%/foobar%\' ESCAPE \'`\' ',
+ ],
+ ],
+ 'Wildcard domain with path, oneWildcard=true' => [
+ '*.example.com/foobar',
+ [ 'oneWildcard' => true ],
+ [
+ 'el_index_60 LIKE \'http://com.example.%\' ESCAPE \'`\' ',
+ 'el_index LIKE \'http://com.example.%\' ESCAPE \'`\' ',
+ ],
+ ],
+ 'Constant prefix' => [
+ 'example.com/blah/blah/blah/blah/blah/blah/blah/blah/blah/blah?foo=',
+ [],
+ [
+ 'el_index_60' => 'http://com.example./blah/blah/blah/blah/blah/blah/blah/blah/',
+ 'el_index LIKE ' .
+ '\'http://com.example./blah/blah/blah/blah/blah/blah/blah/blah/blah/blah?foo=%\' ' .
+ 'ESCAPE \'`\' ',
+ ],
+ ],
+ 'Bad protocol' => [
+ 'test/',
+ [ 'protocol' => 'invalid://' ],
+ false
+ ],
+ 'Various options' => [
+ 'example.com',
+ [ 'protocol' => 'https://', 'prefix' => 'xx' ],
+ [
+ 'xx_index_60 LIKE \'https://com.example./%\' ESCAPE \'`\' ',
+ 'xx_index LIKE \'https://com.example./%\' ESCAPE \'`\' ',
+ ],
+ ],
+ ];
+ }
+
}
WikiPage::factory( $newTitle )->getRevision()
);
}
+
+ /**
+ * Test for the move operation being aborted via the TitleMove hook
+ */
+ public function testMoveAbortedByTitleMoveHook() {
+ $error = 'Preventing move operation with TitleMove hook.';
+ $this->setTemporaryHook( 'TitleMove',
+ function ( $old, $new, $user, $reason, $status ) use ( $error ) {
+ $status->fatal( $error );
+ }
+ );
+
+ $oldTitle = Title::newFromText( 'Some old title' );
+ WikiPage::factory( $oldTitle )->doEditContent( new WikitextContent( 'foo' ), 'bar' );
+ $newTitle = Title::newFromText( 'A brand new title' );
+ $mp = new MovePage( $oldTitle, $newTitle );
+ $user = User::newFromName( 'TitleMove tester' );
+ $status = $mp->move( $user, 'Reason', true );
+ $this->assertTrue( $status->hasMessage( $error ) );
+ }
}
/**
* Test data for testParseTryFixing.
*
- * Some PHP interpreters use json-c rather than the JSON.org cannonical
+ * Some PHP interpreters use json-c rather than the JSON.org canonical
* parser to avoid being encumbered by the "shall be used for Good, not
* Evil" clause of the JSON.org parser's license. By default, json-c
* parses in a non-strict mode which allows trailing commas for array and
return $cases;
}
+
+ public function provideEmptyJsonKeyStrings() {
+ return [
+ [
+ '{"":"foo"}',
+ '{"":"foo"}',
+ ''
+ ],
+ [
+ '{"_empty_":"foo"}',
+ '{"_empty_":"foo"}',
+ '_empty_' ],
+ [
+ '{"\u005F\u0065\u006D\u0070\u0074\u0079\u005F":"foo"}',
+ '{"_empty_":"foo"}',
+ '_empty_'
+ ],
+ [
+ '{"_empty_":"bar","":"foo"}',
+ '{"_empty_":"bar","":"foo"}',
+ ''
+ ],
+ [
+ '{"":"bar","_empty_":"foo"}',
+ '{"":"bar","_empty_":"foo"}',
+ '_empty_'
+ ]
+ ];
+ }
+
+ /**
+ * @covers FormatJson::encode
+ * @covers FormatJson::decode
+ * @dataProvider provideEmptyJsonKeyStrings
+ * @param string $json
+ *
+ * Decoding behavior with empty keys can be surprising.
+ * See https://phabricator.wikimedia.org/T206411
+ */
+ public function testEmptyJsonKeyArray( $json, $expect, $php71Name ) {
+ // Decoding to array is consistent across supported PHP versions
+ $this->assertSame( $expect, FormatJson::encode(
+ FormatJson::decode( $json, true ) ) );
+
+ // Decoding to object differs between supported PHP versions
+ $obj = FormatJson::decode( $json );
+ if ( version_compare( PHP_VERSION, '7.1', '<' ) ) {
+ $this->assertEquals( 'foo', $obj->_empty_ );
+ } else {
+ $this->assertEquals( 'foo', $obj->{$php71Name} );
+ }
+ }
}
'http://example.org/%23%2F%3F%26%3D%2B%3B?%23%2F%3F%26%3D%2B%3B#%23%2F%3F%26%3D%2B%3B',
'http://example.org/%23%2F%3F&=+;?%23/?%26%3D%2B%3B#%23/?&=+;',
],
+ [
+ 'IPv6 links aren\'t escaped',
+ 'http://[::1]/foobar',
+ 'http://[::1]/foobar',
+ ],
+ [
+ 'non-IPv6 links aren\'t unescaped',
+ 'http://%5B::1%5D/foobar',
+ 'http://%5B::1%5D/foobar',
+ ],
];
}
dépôts / lhc / web / wiklou.git / commitdiff