Instead of --keep-uploads, use the same option to parserTests.php, but you
must specify a directory with --upload-dir.
* The 'jquery.arrowSteps' ResourceLoader module is now deprecated.
+* IP::isConfiguredProxy() and IP::isTrustedProxy() were removed. Callers should
+ migrate to using the same functions on a ProxyLookup instance, obtainable from
+ MediaWikiServices.
== Compatibility ==
'ConvertExtensionToRegistration' => __DIR__ . '/maintenance/convertExtensionToRegistration.php',
'ConvertLinks' => __DIR__ . '/maintenance/convertLinks.php',
'ConvertUserOptions' => __DIR__ . '/maintenance/convertUserOptions.php',
- 'ConvertableTimestamp' => __DIR__ . '/includes/libs/time/ConvertableTimestamp.php',
'ConverterRule' => __DIR__ . '/languages/ConverterRule.php',
+ 'ConvertibleTimestamp' => __DIR__ . '/includes/libs/time/ConvertibleTimestamp.php',
'Cookie' => __DIR__ . '/includes/libs/Cookie.php',
'CookieJar' => __DIR__ . '/includes/libs/CookieJar.php',
'CopyFileBackend' => __DIR__ . '/maintenance/copyFileBackend.php',
'CsvStatsOutput' => __DIR__ . '/maintenance/language/StatOutputs.php',
'CurlHttpRequest' => __DIR__ . '/includes/HttpFunctions.php',
'DBAccessBase' => __DIR__ . '/includes/dao/DBAccessBase.php',
- 'DBAccessError' => __DIR__ . '/includes/libs/rdbms/exception/DBError.php',
+ 'DBAccessError' => __DIR__ . '/includes/libs/rdbms/exception/DBAccessError.php',
'DBAccessObjectUtils' => __DIR__ . '/includes/dao/DBAccessObjectUtils.php',
'DBConnRef' => __DIR__ . '/includes/libs/rdbms/database/DBConnRef.php',
- 'DBConnectionError' => __DIR__ . '/includes/libs/rdbms/exception/DBError.php',
+ 'DBConnectionError' => __DIR__ . '/includes/libs/rdbms/exception/DBConnectionError.php',
'DBError' => __DIR__ . '/includes/libs/rdbms/exception/DBError.php',
- 'DBExpectedError' => __DIR__ . '/includes/libs/rdbms/exception/DBError.php',
+ 'DBExpectedError' => __DIR__ . '/includes/libs/rdbms/exception/DBExpectedError.php',
'DBFileJournal' => __DIR__ . '/includes/filebackend/filejournal/DBFileJournal.php',
'DBLockManager' => __DIR__ . '/includes/filebackend/lockmanager/DBLockManager.php',
'DBMasterPos' => __DIR__ . '/includes/libs/rdbms/database/position/DBMasterPos.php',
- 'DBQueryError' => __DIR__ . '/includes/libs/rdbms/exception/DBError.php',
- 'DBReadOnlyError' => __DIR__ . '/includes/libs/rdbms/exception/DBError.php',
- 'DBReplicationWaitError' => __DIR__ . '/includes/libs/rdbms/exception/DBError.php',
+ 'DBQueryError' => __DIR__ . '/includes/libs/rdbms/exception/DBQueryError.php',
+ 'DBReadOnlyError' => __DIR__ . '/includes/libs/rdbms/exception/DBReadOnlyError.php',
+ 'DBReplicationWaitError' => __DIR__ . '/includes/libs/rdbms/exception/DBReplicationWaitError.php',
'DBSiteStore' => __DIR__ . '/includes/site/DBSiteStore.php',
- 'DBTransactionError' => __DIR__ . '/includes/libs/rdbms/exception/DBError.php',
- 'DBTransactionSizeError' => __DIR__ . '/includes/libs/rdbms/exception/DBError.php',
- 'DBUnexpectedError' => __DIR__ . '/includes/libs/rdbms/exception/DBError.php',
+ 'DBTransactionError' => __DIR__ . '/includes/libs/rdbms/exception/DBTransactionError.php',
+ 'DBTransactionSizeError' => __DIR__ . '/includes/libs/rdbms/exception/DBTransactionSizeError.php',
+ 'DBUnexpectedError' => __DIR__ . '/includes/libs/rdbms/exception/DBUnexpectedError.php',
'DataUpdate' => __DIR__ . '/includes/deferred/DataUpdate.php',
'Database' => __DIR__ . '/includes/libs/rdbms/database/Database.php',
'DatabaseBase' => __DIR__ . '/includes/libs/rdbms/database/DatabaseBase.php',
'ExternalStoreHttp' => __DIR__ . '/includes/externalstore/ExternalStoreHttp.php',
'ExternalStoreMedium' => __DIR__ . '/includes/externalstore/ExternalStoreMedium.php',
'ExternalStoreMwstore' => __DIR__ . '/includes/externalstore/ExternalStoreMwstore.php',
- 'FSFile' => __DIR__ . '/includes/filebackend/FSFile.php',
+ 'FSFile' => __DIR__ . '/includes/libs/filebackend/FSFile.php',
'FSFileBackend' => __DIR__ . '/includes/filebackend/FSFileBackend.php',
'FSFileBackendDirList' => __DIR__ . '/includes/filebackend/FSFileBackend.php',
'FSFileBackendFileList' => __DIR__ . '/includes/filebackend/FSFileBackend.php',
'FileAwareNodeVisitor' => __DIR__ . '/maintenance/findDeprecated.php',
'FileBackend' => __DIR__ . '/includes/libs/filebackend/FileBackend.php',
'FileBackendDBRepoWrapper' => __DIR__ . '/includes/filerepo/FileBackendDBRepoWrapper.php',
- 'FileBackendError' => __DIR__ . '/includes/libs/filebackend/FileBackendException.php',
- 'FileBackendException' => __DIR__ . '/includes/libs/filebackend/FileBackendException.php',
+ 'FileBackendError' => __DIR__ . '/includes/libs/filebackend/FileBackendError.php',
'FileBackendGroup' => __DIR__ . '/includes/filebackend/FileBackendGroup.php',
'FileBackendMultiWrite' => __DIR__ . '/includes/filebackend/FileBackendMultiWrite.php',
'FileBackendStore' => __DIR__ . '/includes/filebackend/FileBackendStore.php',
'IJobSpecification' => __DIR__ . '/includes/jobqueue/JobSpecification.php',
'ILoadBalancer' => __DIR__ . '/includes/libs/rdbms/loadbalancer/ILoadBalancer.php',
'ILoadMonitor' => __DIR__ . '/includes/libs/rdbms/loadmonitor/ILoadMonitor.php',
- 'IP' => __DIR__ . '/includes/utils/IP.php',
+ 'IP' => __DIR__ . '/includes/libs/IP.php',
'IPSet' => __DIR__ . '/includes/compat/IPSetCompat.php',
'IPTC' => __DIR__ . '/includes/media/IPTC.php',
'IRCColourfulRCFeedFormatter' => __DIR__ . '/includes/rcfeed/IRCColourfulRCFeedFormatter.php',
'MWException' => __DIR__ . '/includes/exception/MWException.php',
'MWExceptionHandler' => __DIR__ . '/includes/exception/MWExceptionHandler.php',
'MWExceptionRenderer' => __DIR__ . '/includes/exception/MWExceptionRenderer.php',
+ 'MWFileProps' => __DIR__ . '/includes/utils/MWFileProps.php',
'MWGrants' => __DIR__ . '/includes/utils/MWGrants.php',
'MWHttpRequest' => __DIR__ . '/includes/HttpFunctions.php',
'MWMemcached' => __DIR__ . '/includes/compat/MemcachedClientCompat.php',
'ProtectedPagesPager' => __DIR__ . '/includes/specials/SpecialProtectedpages.php',
'ProtectedTitlesPager' => __DIR__ . '/includes/specials/pagers/ProtectedTitlesPager.php',
'ProtectionForm' => __DIR__ . '/includes/ProtectionForm.php',
+ 'ProxyLookup' => __DIR__ . '/includes/ProxyLookup.php',
'PruneFileCache' => __DIR__ . '/maintenance/pruneFileCache.php',
'PublishStashedFileJob' => __DIR__ . '/includes/jobqueue/jobs/PublishStashedFileJob.php',
'PurgeAction' => __DIR__ . '/includes/actions/PurgeAction.php',
'SQLiteField' => __DIR__ . '/includes/libs/rdbms/field/SQLiteField.php',
'SVGMetadataExtractor' => __DIR__ . '/includes/media/SVGMetadataExtractor.php',
'SVGReader' => __DIR__ . '/includes/media/SVGMetadataExtractor.php',
- 'SamplingStatsdClient' => __DIR__ . '/includes/libs/SamplingStatsdClient.php',
+ 'SamplingStatsdClient' => __DIR__ . '/includes/libs/stats/SamplingStatsdClient.php',
'Sanitizer' => __DIR__ . '/includes/Sanitizer.php',
'SavepointPostgres' => __DIR__ . '/includes/libs/rdbms/database/utils/SavepointPostgres.php',
'ScopedCallback' => __DIR__ . '/includes/libs/ScopedCallback.php',
'TableDiffFormatter' => __DIR__ . '/includes/diff/TableDiffFormatter.php',
'TablePager' => __DIR__ . '/includes/pager/TablePager.php',
'TagLogFormatter' => __DIR__ . '/includes/logging/TagLogFormatter.php',
- 'TempFSFile' => __DIR__ . '/includes/filebackend/TempFSFile.php',
+ 'TempFSFile' => __DIR__ . '/includes/libs/filebackend/TempFSFile.php',
'TempFileRepo' => __DIR__ . '/includes/filerepo/FileRepo.php',
'TemplateParser' => __DIR__ . '/includes/TemplateParser.php',
'TemplatesOnThisPageFormatter' => __DIR__ . '/includes/TemplatesOnThisPageFormatter.php',
*
* @file
*/
+
+use MediaWiki\MediaWikiServices;
+
class Block {
/** @var string */
public $mReason;
}
$conds = [];
+ $proxyLookup = MediaWikiServices::getInstance()->getProxyLookup();
foreach ( array_unique( $ipChain ) as $ipaddr ) {
# Discard invalid IP addresses. Since XFF can be spoofed and we do not
# necessarily trust the header given to us, make sure that we are only
continue;
}
# Don't check trusted IPs (includes local squids which will be in every request)
- if ( IP::isTrustedProxy( $ipaddr ) ) {
+ if ( $proxyLookup->isTrustedProxy( $ipaddr ) ) {
continue;
}
# Check both the original IP (to check against single blocks), as well as build
}
/**
+ * @deprecated since 1.28, use Parser::escapeWikitext() directly
+ *
* Escapes the given text so that it may be output using addWikiText()
* without any linking, formatting, etc. making its way through. This
* is achieved by substituting certain characters with HTML entities.
* @return string
*/
function wfEscapeWikiText( $text ) {
- global $wgEnableMagicLinks;
- static $repl = null, $repl2 = null;
- if ( $repl === null ) {
- $repl = [
- '"' => '"', '&' => '&', "'" => ''', '<' => '<',
- '=' => '=', '>' => '>', '[' => '[', ']' => ']',
- '{' => '{', '|' => '|', '}' => '}', ';' => ';',
- "\n#" => "\n#", "\r#" => "\r#",
- "\n*" => "\n*", "\r*" => "\r*",
- "\n:" => "\n:", "\r:" => "\r:",
- "\n " => "\n ", "\r " => "\r ",
- "\n\n" => "\n ", "\r\n" => " \n",
- "\n\r" => "\n ", "\r\r" => "\r ",
- "\n\t" => "\n	", "\r\t" => "\r	", // "\n\t\n" is treated like "\n\n"
- "\n----" => "\n----", "\r----" => "\r----",
- '__' => '__', '://' => '://',
- ];
-
- $magicLinks = array_keys( array_filter( $wgEnableMagicLinks ) );
- // We have to catch everything "\s" matches in PCRE
- foreach ( $magicLinks as $magic ) {
- $repl["$magic "] = "$magic ";
- $repl["$magic\t"] = "$magic	";
- $repl["$magic\r"] = "$magic ";
- $repl["$magic\n"] = "$magic ";
- $repl["$magic\f"] = "$magic";
- }
-
- // And handle protocols that don't use "://"
- global $wgUrlProtocols;
- $repl2 = [];
- foreach ( $wgUrlProtocols as $prot ) {
- if ( substr( $prot, -1 ) === ':' ) {
- $repl2[] = preg_quote( substr( $prot, 0, -1 ), '/' );
- }
- }
- $repl2 = $repl2 ? '/\b(' . implode( '|', $repl2 ) . '):/i' : '/^(?!)/';
- }
- $text = substr( strtr( "\n$text", $repl ), 1 );
- $text = preg_replace( $repl2, '$1:', $text );
- return $text;
+ global $wgParser;
+ return $wgParser->escapeWikitext( $text );
}
/**
* @return string|bool String / false The same date in the format specified in $outputtype or false
*/
function wfTimestamp( $outputtype = TS_UNIX, $ts = 0 ) {
- try {
- $timestamp = new MWTimestamp( $ts );
- return $timestamp->getTimestamp( $outputtype );
- } catch ( TimestampException $e ) {
+ $ret = MWTimestamp::convert( $outputtype, $ts );
+ if ( $ret === false ) {
wfDebug( "wfTimestamp() fed bogus time value: TYPE=$outputtype; VALUE=$ts\n" );
- return false;
}
+ return $ret;
}
/**
*/
function wfTimestampNow() {
# return NOW
- return wfTimestamp( TS_MW, time() );
+ return MWTimestamp::now( TS_MW );
}
/**
*
* @since 1.20
*/
-class MWTimestamp extends ConvertableTimestamp {
+class MWTimestamp extends ConvertibleTimestamp {
/**
* Get a timestamp instance in GMT
*
use MediaWiki\Services\NoSuchServiceException;
use MWException;
use ObjectCache;
+use ProxyLookup;
use SearchEngine;
use SearchEngineConfig;
use SearchEngineFactory;
return $this->getService( 'MediaHandlerFactory' );
}
+ /**
+ * @since 1.28
+ * @return ProxyLookup
+ */
+ public function getProxyLookup() {
+ return $this->getService( 'ProxyLookup' );
+ }
+
/**
* @since 1.28
* @return GenderCache
$mime = "application/x-opc+zip";
# TODO: remove the block below, as soon as improveTypeFromExtension is used everywhere
if ( $ext !== true && $ext !== false ) {
- /** This is the mode used by getPropsFromPath
- * These MIME's are stored in the database, where we don't really want
- * x-opc+zip, because we use it only for internal purposes
- */
+ // These MIME's are stored in the database, where we don't really want
+ // x-opc+zip, because we use it only for internal purposes
if ( $this->isMatchingExtension( $ext, $mime ) ) {
/* A known file extension for an OPC file,
* find the proper mime type for that file extension
}
}
+ $type = null;
// Check for entry for full MIME type
if ( $mime ) {
$type = $this->findMediaType( $mime );
--- /dev/null
+<?php
+
+/**
+ * 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
+ */
+
+use IPSet\IPSet;
+
+/**
+ * @since 1.28
+ */
+class ProxyLookup {
+
+ /**
+ * @var string[]
+ */
+ private $proxyServers;
+
+ /**
+ * @var string[]
+ */
+ private $proxyServersComplex;
+
+ /**
+ * @var IPSet|null
+ */
+ private $proxyIPSet;
+
+ /**
+ * @param string[] $proxyServers Simple list of IPs
+ * @param string[] $proxyServersComplex Complex list of IPs/ranges
+ */
+ public function __construct( $proxyServers, $proxyServersComplex ) {
+ $this->proxyServers = $proxyServers;
+ $this->proxyServersComplex = $proxyServersComplex;
+ }
+
+ /**
+ * Checks if an IP matches a proxy we've configured
+ *
+ * @param string $ip
+ * @return bool
+ */
+ public function isConfiguredProxy( $ip ) {
+ // Quick check of known singular proxy servers
+ if ( in_array( $ip, $this->proxyServers ) ) {
+ return true;
+ }
+
+ // Check against addresses and CIDR nets in the complex list
+ if ( !$this->proxyIPSet ) {
+ $this->proxyIPSet = new IPSet( $this->proxyServersComplex );
+ }
+ return $this->proxyIPSet->match( $ip );
+ }
+
+ /**
+ * Checks if an IP is a trusted proxy provider.
+ * Useful to tell if X-Forwarded-For data is possibly bogus.
+ * CDN cache servers for the site are whitelisted.
+ *
+ * @param string $ip
+ * @return bool
+ */
+ public function isTrustedProxy( $ip ) {
+ $trusted = $this->isConfiguredProxy( $ip );
+ Hooks::run( 'IsTrustedProxy', [ &$ip, &$trusted ] );
+ return $trusted;
+ }
+}
);
},
+ 'ProxyLookup' => function( MediaWikiServices $services ) {
+ $mainConfig = $services->getMainConfig();
+ return new ProxyLookup(
+ $mainConfig->get( 'SquidServers' ),
+ $mainConfig->get( 'SquidServersNoPurge' )
+ );
+ },
+
'LinkCache' => function( MediaWikiServices $services ) {
return new LinkCache(
$services->getTitleFormatter(),
* @file
*/
+use MediaWiki\MediaWikiServices;
use MediaWiki\Session\Session;
use MediaWiki\Session\SessionId;
use MediaWiki\Session\SessionManager;
# Append XFF
$forwardedFor = $this->getHeader( 'X-Forwarded-For' );
if ( $forwardedFor !== false ) {
- $isConfigured = IP::isConfiguredProxy( $ip );
+ $proxyLookup = MediaWikiServices::getInstance()->getProxyLookup();
+ $isConfigured = $proxyLookup->isConfiguredProxy( $ip );
$ipchain = array_map( 'trim', explode( ',', $forwardedFor ) );
$ipchain = array_reverse( $ipchain );
array_unshift( $ipchain, $ip );
foreach ( $ipchain as $i => $curIP ) {
$curIP = IP::sanitizeIP( IP::canonicalize( $curIP ) );
if ( !$curIP || !isset( $ipchain[$i + 1] ) || $ipchain[$i + 1] === 'unknown'
- || !IP::isTrustedProxy( $curIP )
+ || !$proxyLookup->isTrustedProxy( $curIP )
) {
break; // IP is not valid/trusted or does not point to anything
}
if (
IP::isPublic( $ipchain[$i + 1] ) ||
$wgUsePrivateIPs ||
- IP::isConfiguredProxy( $curIP ) // bug 48919; treat IP as sane
+ $proxyLookup->isConfiguredProxy( $curIP ) // bug 48919; treat IP as sane
) {
// Follow the next IP according to the proxy
$nextIP = IP::canonicalize( $ipchain[$i + 1] );
// Verified by native speakers
'be' => [ "Ё" ],
'be-tarask' => [ "Ё" ],
+ 'bs' => [ "Č", "Ć", "Dž", "Đ", "Lj", "Nj", "Š", "Ž" ],
+ 'cs' => [ "Č", "Ch", "Ř", "Š", "Ž" ],
'cy' => [ "Ch", "Dd", "Ff", "Ng", "Ll", "Ph", "Rh", "Th" ],
'en' => [],
- // RTL, let's put each letter on a new line
'fa' => [
+ // RTL, let's put each letter on a new line
"آ",
"ء",
"ه",
],
'fi' => [ "Å", "Ä", "Ö" ],
'fr' => [],
+ 'hr' => [ "Č", "Ć", "Dž", "Đ", "Lj", "Nj", "Š", "Ž" ],
+ 'hsb' => [ "Č", "Dź", "Ě", "Ch", "Ł", "Ń", "Ř", "Š", "Ć", "Ž" ],
'hu' => [ "Cs", "Dz", "Dzs", "Gy", "Ly", "Ny", "Ö", "Sz", "Ty", "Ü", "Zs" ],
'is' => [ "Á", "Ð", "É", "Í", "Ó", "Ú", "Ý", "Þ", "Æ", "Ö", "Å" ],
'it' => [],
+ 'lt' => [ "Č", "Š", "Ž" ],
'lv' => [ "Č", "Ģ", "Ķ", "Ļ", "Ņ", "Š", "Ž" ],
+ 'mk' => [ "Ѓ", "Ќ" ],
+ 'nl' => [],
'pl' => [ "Ą", "Ć", "Ę", "Ł", "Ń", "Ó", "Ś", "Ź", "Ż" ],
'pt' => [],
'ru' => [],
+ 'sk' => [ "Ä", "Č", "Ch", "Ô", "Š", "Ž" ],
+ 'sr' => [],
'sv' => [ "Å", "Ä", "Ö" ],
'sv@collation=standard' => [ "Å", "Ä", "Ö" ],
+ 'ta' => [
+ "\xE0\xAE\x82", "ஃ", "க்ஷ", "க்", "ங்", "ச்", "ஞ்", "ட்", "ண்", "த்", "ந்",
+ "ப்", "ம்", "ய்", "ர்", "ல்", "வ்", "ழ்", "ள்", "ற்", "ன்", "ஜ்", "ஶ்", "ஷ்",
+ "ஸ்", "ஹ்", "க்ஷ்"
+ ],
'uk' => [ "Ґ", "Ь" ],
'vi' => [ "Ă", "Â", "Đ", "Ê", "Ô", "Ơ", "Ư" ],
// Not verified, but likely correct
'az' => [ "Ç", "Ə", "Ğ", "İ", "Ö", "Ş", "Ü" ],
'bg' => [],
'br' => [ "Ch", "C'h" ],
- 'bs' => [ "Č", "Ć", "Dž", "Đ", "Lj", "Nj", "Š", "Ž" ],
'ca' => [],
'co' => [],
- 'cs' => [ "Č", "Ch", "Ř", "Š", "Ž" ],
'da' => [ "Æ", "Ø", "Å" ],
'de' => [],
'dsb' => [ "Č", "Ć", "Dź", "Ě", "Ch", "Ł", "Ń", "Ŕ", "Š", "Ś", "Ž", "Ź" ],
'ga' => [],
'gd' => [],
'gl' => [ "Ch", "Ll", "Ñ" ],
- 'hr' => [ "Č", "Ć", "Dž", "Đ", "Lj", "Nj", "Š", "Ž" ],
- 'hsb' => [ "Č", "Dź", "Ě", "Ch", "Ł", "Ń", "Ř", "Š", "Ć", "Ž" ],
'kk' => [ "Ү", "І" ],
'kl' => [ "Æ", "Ø", "Å" ],
'ku' => [ "Ç", "Ê", "Î", "Ş", "Û" ],
'ky' => [ "Ё" ],
'la' => [],
'lb' => [],
- 'lt' => [ "Č", "Š", "Ž" ],
- 'mk' => [ "Ѓ", "Ќ" ],
'mo' => [ "Ă", "Â", "Î", "Ş", "Ţ" ],
'mt' => [ "Ċ", "Ġ", "Għ", "Ħ", "Ż" ],
- 'nl' => [],
'no' => [ "Æ", "Ø", "Å" ],
'oc' => [],
'rm' => [],
'ro' => [ "Ă", "Â", "Î", "Ş", "Ţ" ],
'rup' => [ "Ă", "Â", "Î", "Ľ", "Ń", "Ş", "Ţ" ],
'sco' => [],
- 'sk' => [ "Ä", "Č", "Ch", "Ô", "Š", "Ž" ],
'sl' => [ "Č", "Š", "Ž" ],
'smn' => [ "Á", "Č", "Đ", "Ŋ", "Š", "Ŧ", "Ž", "Æ", "Ø", "Å", "Ä", "Ö" ],
'sq' => [ "Ç", "Dh", "Ë", "Gj", "Ll", "Nj", "Rr", "Sh", "Th", "Xh", "Zh" ],
- 'sr' => [],
- 'ta' => [
- "\xE0\xAE\x82", "ஃ", "க்ஷ", "க்", "ங்", "ச்", "ஞ்", "ட்", "ண்", "த்", "ந்",
- "ப்", "ம்", "ய்", "ர்", "ல்", "வ்", "ழ்", "ள்", "ற்", "ன்", "ஜ்", "ஶ்", "ஷ்",
- "ஸ்", "ஹ்", "க்ஷ்"
- ],
'tk' => [ "Ç", "Ä", "Ž", "Ň", "Ö", "Ş", "Ü", "Ý" ],
'tl' => [ "Ñ", "Ng" ],
'tr' => [ "Ç", "Ğ", "İ", "Ö", "Ş", "Ü" ],
+++ /dev/null
-<?php
-/**
- * Non-directory file on the file system.
- *
- * 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 FileBackend
- */
-
-/**
- * Class representing a non-directory file on the file system
- *
- * @ingroup FileBackend
- */
-class FSFile {
- /** @var string Path to file */
- protected $path;
-
- /** @var string File SHA-1 in base 36 */
- protected $sha1Base36;
-
- /**
- * Sets up the file object
- *
- * @param string $path Path to temporary file on local disk
- */
- public function __construct( $path ) {
- $this->path = $path;
- }
-
- /**
- * Returns the file system path
- *
- * @return string
- */
- public function getPath() {
- return $this->path;
- }
-
- /**
- * Checks if the file exists
- *
- * @return bool
- */
- public function exists() {
- return is_file( $this->path );
- }
-
- /**
- * Get the file size in bytes
- *
- * @return int|bool
- */
- public function getSize() {
- return filesize( $this->path );
- }
-
- /**
- * Get the file's last-modified timestamp
- *
- * @return string|bool TS_MW timestamp or false on failure
- */
- public function getTimestamp() {
- MediaWiki\suppressWarnings();
- $timestamp = filemtime( $this->path );
- MediaWiki\restoreWarnings();
- if ( $timestamp !== false ) {
- $timestamp = wfTimestamp( TS_MW, $timestamp );
- }
-
- return $timestamp;
- }
-
- /**
- * Get an associative array containing information about
- * a file with the given storage path.
- *
- * Resulting array fields include:
- * - fileExists
- * - size (filesize in bytes)
- * - mime (as major/minor)
- * - media_type (value to be used with the MEDIATYPE_xxx constants)
- * - metadata (handler specific)
- * - sha1 (in base 36)
- * - width
- * - height
- * - bits (bitrate)
- * - file-mime
- * - major_mime
- * - minor_mime
- *
- * @param string|bool $ext The file extension, or true to extract it from the filename.
- * Set it to false to ignore the extension.
- * @return array
- */
- public function getProps( $ext = true ) {
- $info = self::placeholderProps();
- $info['fileExists'] = $this->exists();
-
- if ( $info['fileExists'] ) {
- $magic = MimeMagic::singleton();
-
- # get the file extension
- if ( $ext === true ) {
- $ext = self::extensionFromPath( $this->path );
- }
-
- # MIME type according to file contents
- $info['file-mime'] = $magic->guessMimeType( $this->path, false );
- # logical MIME type
- $info['mime'] = $magic->improveTypeFromExtension( $info['file-mime'], $ext );
-
- list( $info['major_mime'], $info['minor_mime'] ) = File::splitMime( $info['mime'] );
- $info['media_type'] = $magic->getMediaType( $this->path, $info['mime'] );
-
- # Get size in bytes
- $info['size'] = $this->getSize();
-
- # Height, width and metadata
- $handler = MediaHandler::getHandler( $info['mime'] );
- if ( $handler ) {
- $tempImage = (object)[]; // XXX (hack for File object)
- /** @noinspection PhpParamsInspection */
- $info['metadata'] = $handler->getMetadata( $tempImage, $this->path );
- /** @noinspection PhpParamsInspection */
- $gis = $handler->getImageSize( $tempImage, $this->path, $info['metadata'] );
- if ( is_array( $gis ) ) {
- $info = $this->extractImageSizeInfo( $gis ) + $info;
- }
- }
- $info['sha1'] = $this->getSha1Base36();
- }
-
- return $info;
- }
-
- /**
- * Placeholder file properties to use for files that don't exist
- *
- * Resulting array fields include:
- * - fileExists
- * - mime (as major/minor)
- * - media_type (value to be used with the MEDIATYPE_xxx constants)
- * - metadata (handler specific)
- * - sha1 (in base 36)
- * - width
- * - height
- * - bits (bitrate)
- *
- * @return array
- */
- public static function placeholderProps() {
- $info = [];
- $info['fileExists'] = false;
- $info['mime'] = null;
- $info['media_type'] = MEDIATYPE_UNKNOWN;
- $info['metadata'] = '';
- $info['sha1'] = '';
- $info['width'] = 0;
- $info['height'] = 0;
- $info['bits'] = 0;
-
- return $info;
- }
-
- /**
- * Exract image size information
- *
- * @param array $gis
- * @return array
- */
- protected function extractImageSizeInfo( array $gis ) {
- $info = [];
- # NOTE: $gis[2] contains a code for the image type. This is no longer used.
- $info['width'] = $gis[0];
- $info['height'] = $gis[1];
- if ( isset( $gis['bits'] ) ) {
- $info['bits'] = $gis['bits'];
- } else {
- $info['bits'] = 0;
- }
-
- return $info;
- }
-
- /**
- * Get a SHA-1 hash of a file in the local filesystem, in base-36 lower case
- * encoding, zero padded to 31 digits.
- *
- * 160 log 2 / log 36 = 30.95, so the 160-bit hash fills 31 digits in base 36
- * fairly neatly.
- *
- * @param bool $recache
- * @return bool|string False on failure
- */
- public function getSha1Base36( $recache = false ) {
- if ( $this->sha1Base36 !== null && !$recache ) {
- return $this->sha1Base36;
- }
-
- MediaWiki\suppressWarnings();
- $this->sha1Base36 = sha1_file( $this->path );
- MediaWiki\restoreWarnings();
-
- if ( $this->sha1Base36 !== false ) {
- $this->sha1Base36 = Wikimedia\base_convert( $this->sha1Base36, 16, 36, 31 );
- }
-
- return $this->sha1Base36;
- }
-
- /**
- * Get the final file extension from a file system path
- *
- * @param string $path
- * @return string
- */
- public static function extensionFromPath( $path ) {
- $i = strrpos( $path, '.' );
-
- return strtolower( $i ? substr( $path, $i + 1 ) : '' );
- }
-
- /**
- * Get an associative array containing information about a file in the local filesystem.
- *
- * @param string $path Absolute local filesystem path
- * @param string|bool $ext The file extension, or true to extract it from the filename.
- * Set it to false to ignore the extension.
- * @return array
- */
- public static function getPropsFromPath( $path, $ext = true ) {
- $fsFile = new self( $path );
-
- return $fsFile->getProps( $ext );
- }
-
- /**
- * Get a SHA-1 hash of a file in the local filesystem, in base-36 lower case
- * encoding, zero padded to 31 digits.
- *
- * 160 log 2 / log 36 = 30.95, so the 160-bit hash fills 31 digits in base 36
- * fairly neatly.
- *
- * @param string $path
- * @return bool|string False on failure
- */
- public static function getSha1Base36FromPath( $path ) {
- $fsFile = new self( $path );
-
- return $fsFile->getSha1Base36();
- }
-}
}
if ( !empty( $params['async'] ) ) { // deferred
- $tempFile = TempFSFile::factory( 'create_', 'tmp' );
+ $tempFile = TempFSFile::factory( 'create_', 'tmp', $this->tmpDirectory );
if ( !$tempFile ) {
$status->fatal( 'backend-fail-create', $params['dst'] );
} else {
// Create a new temporary file with the same extension...
$ext = FileBackend::extensionFromPath( $src );
- $tmpFile = TempFSFile::factory( 'localcopy_', $ext );
+ $tmpFile = TempFSFile::factory( 'localcopy_', $ext, $this->tmpDirectory );
if ( !$tmpFile ) {
$tmpFiles[$src] = null;
} else {
*
* @param array $configs
* @param string|null $readOnlyReason
- * @throws FileBackendException
+ * @throws InvalidArgumentException
*/
protected function register( array $configs, $readOnlyReason = null ) {
foreach ( $configs as $config ) {
if ( !isset( $config['name'] ) ) {
- throw new FileBackendException( "Cannot register a backend with no name." );
+ throw new InvalidArgumentException( "Cannot register a backend with no name." );
}
$name = $config['name'];
if ( isset( $this->backends[$name] ) ) {
- throw new FileBackendException( "Backend with name `{$name}` already registered." );
+ throw new LogicException( "Backend with name `{$name}` already registered." );
} elseif ( !isset( $config['class'] ) ) {
- throw new FileBackendException( "Backend with name `{$name}` has no class." );
+ throw new InvalidArgumentException( "Backend with name `{$name}` has no class." );
}
$class = $config['class'];
*
* @param string $name
* @return FileBackend
- * @throws FileBackendException
+ * @throws InvalidArgumentException
*/
public function get( $name ) {
if ( !isset( $this->backends[$name] ) ) {
- throw new FileBackendException( "No backend defined with the name `$name`." );
+ throw new InvalidArgumentException( "No backend defined with the name `$name`." );
}
// Lazy-load the actual backend instance
if ( !isset( $this->backends[$name]['instance'] ) ) {
$config['wanCache'] = ObjectCache::getMainWANInstance();
$config['mimeCallback'] = [ $this, 'guessMimeInternal' ];
$config['statusWrapper'] = [ 'Status', 'wrap' ];
+ $config['tmpDirectory'] = wfTempDir();
$this->backends[$name]['instance'] = new $class( $config );
}
*
* @param string $name
* @return array
- * @throws FileBackendException
+ * @throws InvalidArgumentException
*/
public function config( $name ) {
if ( !isset( $this->backends[$name] ) ) {
- throw new FileBackendException( "No backend defined with the name `$name`." );
+ throw new InvalidArgumentException( "No backend defined with the name `$name`." );
}
$class = $this->backends[$name]['class'];
if ( !$type && $fsPath ) {
$type = $magic->guessMimeType( $fsPath, false );
} elseif ( !$type && strlen( $content ) ) {
- $tmpFile = TempFSFile::factory( 'mime_' );
+ $tmpFile = TempFSFile::factory( 'mime_', '', wfTempDir() );
file_put_contents( $tmpFile->getPath(), $content );
$type = $magic->guessMimeType( $tmpFile->getPath(), false );
}
}
$name = $config['name'];
if ( isset( $namesUsed[$name] ) ) { // don't break FileOp predicates
- throw new FileBackendError( "Two or more backends defined with the name $name." );
+ throw new LogicException( "Two or more backends defined with the name $name." );
}
$namesUsed[$name] = 1;
// Alter certain sub-backend settings for sanity
$config['wikiId'] = $this->wikiId; // use the proxy backend wiki ID
if ( !empty( $config['isMultiMaster'] ) ) {
if ( $this->masterIndex >= 0 ) {
- throw new FileBackendError( 'More than one master backend defined.' );
+ throw new LogicException( 'More than one master backend defined.' );
}
$this->masterIndex = $index; // this is the "master"
$config['fileJournal'] = $this->fileJournal; // log under proxy backend
}
// Create sub-backend object
if ( !isset( $config['class'] ) ) {
- throw new FileBackendError( 'No class given for a backend config.' );
+ throw new InvalidArgumentException( 'No class given for a backend config.' );
}
$class = $config['class'];
$this->backends[$index] = new $class( $config );
}
if ( $this->masterIndex < 0 ) { // need backends and must have a master
- throw new FileBackendError( 'No master backend defined.' );
+ throw new LogicException( 'No master backend defined.' );
}
if ( $this->readIndex < 0 ) {
$this->readIndex = $this->masterIndex; // default
foreach ( $fileOpHandles as $fileOpHandle ) {
if ( !( $fileOpHandle instanceof FileBackendStoreOpHandle ) ) {
- throw new FileBackendError( "Given a non-FileBackendStoreOpHandle object." );
+ throw new InvalidArgumentException( "Got a non-FileBackendStoreOpHandle object." );
} elseif ( $fileOpHandle->backend->getName() !== $this->getName() ) {
- throw new FileBackendError( "Given a FileBackendStoreOpHandle for the wrong backend." );
+ throw new InvalidArgumentException(
+ "Got a FileBackendStoreOpHandle for the wrong backend." );
}
}
$res = $this->doExecuteOpHandlesInternal( $fileOpHandles );
*/
protected function doExecuteOpHandlesInternal( array $fileOpHandles ) {
if ( count( $fileOpHandles ) ) {
- throw new FileBackendError( "This backend supports no asynchronous operations." );
+ throw new LogicException( "Backend does not support asynchronous operations." );
}
return [];
if ( isset( $params[$name] ) ) {
$this->params[$name] = $params[$name];
} else {
- throw new FileBackendError( "File operation missing parameter '$name'." );
+ throw new InvalidArgumentException( "File operation missing parameter '$name'." );
}
}
foreach ( $optional as $name ) {
} else {
// Create a new temporary file with the same extension...
$ext = FileBackend::extensionFromPath( $src );
- $fsFile = TempFSFile::factory( 'localcopy_', $ext );
+ $fsFile = TempFSFile::factory( 'localcopy_', $ext, $this->tmpDirectory );
if ( $fsFile ) {
$bytes = file_put_contents( $fsFile->getPath(), $this->files[$src]['data'] );
if ( $bytes !== strlen( $this->files[$src]['data'] ) ) {
// Get source file extension
$ext = FileBackend::extensionFromPath( $path );
// Create a new temporary file...
- $tmpFile = TempFSFile::factory( 'localcopy_', $ext );
+ $tmpFile = TempFSFile::factory( 'localcopy_', $ext, $this->tmpDirectory );
if ( $tmpFile ) {
$handle = fopen( $tmpFile->getPath(), 'wb' );
if ( $handle ) {
+++ /dev/null
-<?php
-/**
- * Location holder of files stored temporarily
- *
- * 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 FileBackend
- */
-
-/**
- * This class is used to hold the location and do limited manipulation
- * of files stored temporarily (this will be whatever wfTempDir() returns)
- *
- * @ingroup FileBackend
- */
-class TempFSFile extends FSFile {
- /** @var bool Garbage collect the temp file */
- protected $canDelete = false;
-
- /** @var array Map of (path => 1) for paths to delete on shutdown */
- protected static $pathsCollect = null;
-
- public function __construct( $path ) {
- parent::__construct( $path );
-
- if ( self::$pathsCollect === null ) {
- self::$pathsCollect = [];
- register_shutdown_function( [ __CLASS__, 'purgeAllOnShutdown' ] );
- }
- }
-
- /**
- * Make a new temporary file on the file system.
- * Temporary files may be purged when the file object falls out of scope.
- *
- * @param string $prefix
- * @param string $extension Optional file extension
- * @param string|null $tmpDirectory Optional parent directory
- * @return TempFSFile|null
- */
- public static function factory( $prefix, $extension = '', $tmpDirectory = null ) {
- $ext = ( $extension != '' ) ? ".{$extension}" : '';
-
- $attempts = 5;
- while ( $attempts-- ) {
- $hex = sprintf( '%06x%06x', mt_rand( 0, 0xffffff ), mt_rand( 0, 0xffffff ) );
- if ( !is_string( $tmpDirectory ) ) {
- $tmpDirectory = self::getUsableTempDirectory();
- }
- $path = wfTempDir() . '/' . $prefix . $hex . $ext;
- MediaWiki\suppressWarnings();
- $newFileHandle = fopen( $path, 'x' );
- MediaWiki\restoreWarnings();
- if ( $newFileHandle ) {
- fclose( $newFileHandle );
- $tmpFile = new self( $path );
- $tmpFile->autocollect();
- // Safely instantiated, end loop.
- return $tmpFile;
- }
- }
-
- // Give up
- return null;
- }
-
- /**
- * @return string Filesystem path to a temporary directory
- * @throws RuntimeException
- */
- public static function getUsableTempDirectory() {
- $tmpDir = array_map( 'getenv', [ 'TMPDIR', 'TMP', 'TEMP' ] );
- $tmpDir[] = sys_get_temp_dir();
- $tmpDir[] = ini_get( 'upload_tmp_dir' );
- foreach ( $tmpDir as $tmp ) {
- if ( $tmp != '' && is_dir( $tmp ) && is_writable( $tmp ) ) {
- return $tmp;
- }
- }
-
- // PHP on Windows will detect C:\Windows\Temp as not writable even though PHP can write to
- // it so create a directory within that called 'mwtmp' with a suffix of the user running
- // the current process.
- // The user is included as if various scripts are run by different users they will likely
- // not be able to access each others temporary files.
- if ( strtoupper( substr( PHP_OS, 0, 3 ) ) === 'WIN' ) {
- $tmp = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'mwtmp-' . get_current_user();
- if ( !file_exists( $tmp ) ) {
- mkdir( $tmp );
- }
- if ( is_dir( $tmp ) && is_writable( $tmp ) ) {
- return $tmp;
- }
- }
-
- throw new RuntimeException(
- 'No writable temporary directory could be found. ' .
- 'Please explicitly specify a writable directory in configuration.' );
- }
-
- /**
- * Purge this file off the file system
- *
- * @return bool Success
- */
- public function purge() {
- $this->canDelete = false; // done
- MediaWiki\suppressWarnings();
- $ok = unlink( $this->path );
- MediaWiki\restoreWarnings();
-
- unset( self::$pathsCollect[$this->path] );
-
- return $ok;
- }
-
- /**
- * Clean up the temporary file only after an object goes out of scope
- *
- * @param object $object
- * @return TempFSFile This object
- */
- public function bind( $object ) {
- if ( is_object( $object ) ) {
- if ( !isset( $object->tempFSFileReferences ) ) {
- // Init first since $object might use __get() and return only a copy variable
- $object->tempFSFileReferences = [];
- }
- $object->tempFSFileReferences[] = $this;
- }
-
- return $this;
- }
-
- /**
- * Set flag to not clean up after the temporary file
- *
- * @return TempFSFile This object
- */
- public function preserve() {
- $this->canDelete = false;
-
- unset( self::$pathsCollect[$this->path] );
-
- return $this;
- }
-
- /**
- * Set flag clean up after the temporary file
- *
- * @return TempFSFile This object
- */
- public function autocollect() {
- $this->canDelete = true;
-
- self::$pathsCollect[$this->path] = 1;
-
- return $this;
- }
-
- /**
- * Try to make sure that all files are purged on error
- *
- * This method should only be called internally
- */
- public static function purgeAllOnShutdown() {
- foreach ( self::$pathsCollect as $path ) {
- MediaWiki\suppressWarnings();
- unlink( $path );
- MediaWiki\restoreWarnings();
- }
- }
-
- /**
- * Cleans up after the temporary file by deleting it
- */
- function __destruct() {
- if ( $this->canDelete ) {
- $this->purge();
- }
- }
-}
"{$repoName}-deleted" => $deletedDir
],
'fileMode' => $fileMode,
+ 'tmpDirectory' => wfTempDir()
] );
// Update repo config to use this backend
$info['backend'] = $backend;
* @return array
*/
public function getFileProps( $virtualUrl ) {
- $path = $this->resolveToStoragePath( $virtualUrl );
+ $fsFile = $this->getLocalReference( $virtualUrl );
+ $mwProps = new MWFileProps( MimeMagic::singleton() );
+ if ( $fsFile ) {
+ $props = $mwProps->getPropsFromPath( $fsFile->getPath(), true );
+ } else {
+ $props = $mwProps->newPlaceholderProps();
+ }
- return $this->backend->getFileProps( [ 'src' => $path ] );
+ return $props;
}
/**
return $repo->getFileProps( $fileName );
} else {
- return FSFile::getPropsFromPath( $fileName );
+ $mwProps = new MWFileProps( MimeMagic::singleton() );
+
+ return $mwProps->getPropsFromPath( $fileName, true );
}
}
) {
$props = $this->repo->getFileProps( $srcPath );
} else {
- $props = FSFile::getPropsFromPath( $srcPath );
+ $mwProps = new MWFileProps( MimeMagic::singleton() );
+ $props = $mwProps->getPropsFromPath( $srcPath, true );
}
}
}
/**
- * @param DatabaseBase $db
+ * @param Database $db
* @param bool $shared
* @param Maintenance $maintenance
*
* @throws MWException
* @return DatabaseUpdater
*/
- public static function newForDB( &$db, $shared = false, $maintenance = null ) {
+ public static function newForDB( Database $db, $shared = false, $maintenance = null ) {
$type = $db->getType();
if ( in_array( $type, Installer::getDBTypes() ) ) {
$class = ucfirst( $type ) . 'Updater';
}
}
+ /**
+ * Get appropriate schema variables in the current database connection.
+ *
+ * This should be called after any request data has been imported, but before
+ * any write operations to the database. The result should be passed to the DB
+ * setSchemaVars() method.
+ *
+ * @return array
+ * @since 1.28
+ */
+ public function getSchemaVars() {
+ return []; // DB-type specific
+ }
+
/**
* Do all the updates
*
public function doUpdates( $what = [ 'core', 'extensions', 'stats' ] ) {
global $wgVersion;
+ $this->db->setSchemaVars( $this->getSchemaVars() );
+
$what = array_flip( $what );
$this->skipSchema = isset( $what['noschema'] ) || $this->fileHandle !== null;
if ( isset( $what['core'] ) ) {
'Making rev_page_id index non-unique'
);
}
+
+ public function getSchemaVars() {
+ global $wgDBTableOptions;
+
+ $vars = [];
+ $vars['wgDBTableOptions'] = str_replace( 'TYPE', 'ENGINE', $wgDBTableOptions );
+ $vars['wgDBTableOptions'] = str_replace(
+ 'CHARSET=mysql4',
+ 'CHARSET=binary',
+ $vars['wgDBTableOptions']
+ );
+
+ return $vars;
+ }
}
"config-page-existingwiki": "Съществуващо уики",
"config-help-restart": "Необходимо е потвърждение за изтриване на всички въведени и съхранени данни и започване отначало на процеса по инсталация.",
"config-restart": "Да, започване отначало",
- "config-welcome": "=== Ð\9fÑ\80овеÑ\80ка на Ñ\81Ñ\80едаÑ\82а ===\nЩе бÑ\8aдаÑ\82 извÑ\8aÑ\80Ñ\88ени оÑ\81новни пÑ\80овеÑ\80ки, коиÑ\82о да Ñ\83Ñ\81Ñ\82ановÑ\8fÑ\82 дали Ñ\81Ñ\80едаÑ\82а е подÑ\85одÑ\8fÑ\89а за инсталиране на МедияУики.\nАко е необходима помощ по време на инсталацията, резултатите от направените проверки трябва също да бъдат предоставени.",
+ "config-welcome": "=== Ð\9fÑ\80овеÑ\80ка на Ñ\83Ñ\81ловиÑ\8fÑ\82а ===\nЩе бÑ\8aдаÑ\82 извÑ\8aÑ\80Ñ\88ени оÑ\81новни пÑ\80овеÑ\80ки, коиÑ\82о да Ñ\83Ñ\81Ñ\82ановÑ\8fÑ\82 дали Ñ\83Ñ\81ловиÑ\8fÑ\82а Ñ\81а подÑ\85одÑ\8fÑ\89и за инсталиране на МедияУики.\nАко е необходима помощ по време на инсталацията, резултатите от направените проверки трябва също да бъдат предоставени.",
"config-copyright": "=== Авторски права и условия ===\n\n$1\n\nТази програма е свободен софтуер, който може да се променя и/или разпространява според Общия публичен лиценз на GNU, както е публикуван от Free Software Foundation във версия на Лиценза 2 или по-късна версия.\n\nТази програма се разпространява с надеждата, че ще е полезна, но <strong>без каквито и да е гаранции</strong>; без дори косвена гаранция за <strong>продаваемост</strong> или <strong>прогодност за конкретна употреба</strong> .\nЗа повече подробности се препоръчва преглеждането на Общия публичен лиценз на GNU.\n\nКъм програмата трябва да е приложено <doclink href=Copying>копие на Общия публичен лиценз на GNU</doclink>; ако не, можете да пишете на Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA, или да [http://www.gnu.org/copyleft/gpl.html го прочетете онлайн].",
"config-sidebar": "* [https://www.mediawiki.org Сайт на МедияУики]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Contents Наръчник на потребителя]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Contents Наръчник на администратора]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ ЧЗВ]\n----\n* <doclink href=Readme>Документация</doclink>\n* <doclink href=ReleaseNotes>Бележки за версията</doclink>\n* <doclink href=Copying>Авторски права</doclink>\n* <doclink href=UpgradeDoc>Обновяване</doclink>",
"config-env-good": "Средата беше проверена.\nИнсталирането на МедияУики е възможно.",
"config-help": "помощ",
"config-nofile": "Файлът „$1“ не може да бъде открит. Да не е бил изтрит?",
"config-extension-link": "Знаете ли, че това уики поддържа [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Extensions разширения]?\n\nМожете да разгледате [https://www.mediawiki.org/wiki/Special:MyLanguage/Category:Extensions_by_category разширенията по категория] или [https://www.mediawiki.org/wiki/Extension_Matrix Матрицата на разширенията] за пълен списък на разширенията.",
- "mainpagetext": "<strong>УикиÑ\82о беше успешно инсталирано.</strong>",
+ "mainpagetext": "<strong>Ð\9cедиÑ\8fУики беше успешно инсталирано.</strong>",
"mainpagedocfooter": "Разгледайте [https://meta.wikimedia.org/wiki/Help:Contents ръководството] за подробна информация относно използването на уики софтуера.\n\n== Първи стъпки ==\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings Настройки за конфигуриране]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ ЧЗВ за МедияУики]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Пощенски списък относно нови версии на МедияУики]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Localisation#Translation_resources Локализиране на МедияУики]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Combating_spam Научете как да се справяте със спама във вашето уики]"
}
--- /dev/null
+<?php
+/**
+ * Functions and constants to play with IP addresses and ranges
+ *
+ * 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
+ * @author Antoine Musso "<hashar at free dot fr>", Aaron Schulz
+ */
+
+use IPSet\IPSet;
+
+// Some regex definition to "play" with IP address and IP address blocks
+
+// An IPv4 address is made of 4 bytes from x00 to xFF which is d0 to d255
+define( 'RE_IP_BYTE', '(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|0?[0-9]?[0-9])' );
+define( 'RE_IP_ADD', RE_IP_BYTE . '\.' . RE_IP_BYTE . '\.' . RE_IP_BYTE . '\.' . RE_IP_BYTE );
+// An IPv4 block is an IP address and a prefix (d1 to d32)
+define( 'RE_IP_PREFIX', '(3[0-2]|[12]?\d)' );
+define( 'RE_IP_BLOCK', RE_IP_ADD . '\/' . RE_IP_PREFIX );
+
+// An IPv6 address is made up of 8 words (each x0000 to xFFFF).
+// However, the "::" abbreviation can be used on consecutive x0000 words.
+define( 'RE_IPV6_WORD', '([0-9A-Fa-f]{1,4})' );
+define( 'RE_IPV6_PREFIX', '(12[0-8]|1[01][0-9]|[1-9]?\d)' );
+define( 'RE_IPV6_ADD',
+ '(?:' . // starts with "::" (including "::")
+ ':(?::|(?::' . RE_IPV6_WORD . '){1,7})' .
+ '|' . // ends with "::" (except "::")
+ RE_IPV6_WORD . '(?::' . RE_IPV6_WORD . '){0,6}::' .
+ '|' . // contains one "::" in the middle (the ^ makes the test fail if none found)
+ RE_IPV6_WORD . '(?::((?(-1)|:))?' . RE_IPV6_WORD . '){1,6}(?(-2)|^)' .
+ '|' . // contains no "::"
+ RE_IPV6_WORD . '(?::' . RE_IPV6_WORD . '){7}' .
+ ')'
+);
+// An IPv6 block is an IP address and a prefix (d1 to d128)
+define( 'RE_IPV6_BLOCK', RE_IPV6_ADD . '\/' . RE_IPV6_PREFIX );
+// For IPv6 canonicalization (NOT for strict validation; these are quite lax!)
+define( 'RE_IPV6_GAP', ':(?:0+:)*(?::(?:0+:)*)?' );
+define( 'RE_IPV6_V4_PREFIX', '0*' . RE_IPV6_GAP . '(?:ffff:)?' );
+
+// This might be useful for regexps used elsewhere, matches any IPv4 or IPv6 address or network
+define( 'IP_ADDRESS_STRING',
+ '(?:' .
+ RE_IP_ADD . '(?:\/' . RE_IP_PREFIX . ')?' . // IPv4
+ '|' .
+ RE_IPV6_ADD . '(?:\/' . RE_IPV6_PREFIX . ')?' . // IPv6
+ ')'
+);
+
+/**
+ * A collection of public static functions to play with IP address
+ * and IP blocks.
+ */
+class IP {
+ /** @var IPSet */
+ private static $proxyIpSet = null;
+
+ /**
+ * Determine if a string is as valid IP address or network (CIDR prefix).
+ * SIIT IPv4-translated addresses are rejected.
+ * @note canonicalize() tries to convert translated addresses to IPv4.
+ *
+ * @param string $ip Possible IP address
+ * @return bool
+ */
+ public static function isIPAddress( $ip ) {
+ return (bool)preg_match( '/^' . IP_ADDRESS_STRING . '$/', $ip );
+ }
+
+ /**
+ * Given a string, determine if it as valid IP in IPv6 only.
+ * @note Unlike isValid(), this looks for networks too.
+ *
+ * @param string $ip Possible IP address
+ * @return bool
+ */
+ public static function isIPv6( $ip ) {
+ return (bool)preg_match( '/^' . RE_IPV6_ADD . '(?:\/' . RE_IPV6_PREFIX . ')?$/', $ip );
+ }
+
+ /**
+ * Given a string, determine if it as valid IP in IPv4 only.
+ * @note Unlike isValid(), this looks for networks too.
+ *
+ * @param string $ip Possible IP address
+ * @return bool
+ */
+ public static function isIPv4( $ip ) {
+ return (bool)preg_match( '/^' . RE_IP_ADD . '(?:\/' . RE_IP_PREFIX . ')?$/', $ip );
+ }
+
+ /**
+ * Validate an IP address. Ranges are NOT considered valid.
+ * SIIT IPv4-translated addresses are rejected.
+ * @note canonicalize() tries to convert translated addresses to IPv4.
+ *
+ * @param string $ip
+ * @return bool True if it is valid
+ */
+ public static function isValid( $ip ) {
+ return ( preg_match( '/^' . RE_IP_ADD . '$/', $ip )
+ || preg_match( '/^' . RE_IPV6_ADD . '$/', $ip ) );
+ }
+
+ /**
+ * Validate an IP Block (valid address WITH a valid prefix).
+ * SIIT IPv4-translated addresses are rejected.
+ * @note canonicalize() tries to convert translated addresses to IPv4.
+ *
+ * @param string $ipblock
+ * @return bool True if it is valid
+ */
+ public static function isValidBlock( $ipblock ) {
+ return ( preg_match( '/^' . RE_IPV6_BLOCK . '$/', $ipblock )
+ || preg_match( '/^' . RE_IP_BLOCK . '$/', $ipblock ) );
+ }
+
+ /**
+ * Convert an IP into a verbose, uppercase, normalized form.
+ * Both IPv4 and IPv6 addresses are trimmed. Additionally,
+ * IPv6 addresses in octet notation are expanded to 8 words;
+ * IPv4 addresses have leading zeros, in each octet, removed.
+ *
+ * @param string $ip IP address in quad or octet form (CIDR or not).
+ * @return string
+ */
+ public static function sanitizeIP( $ip ) {
+ $ip = trim( $ip );
+ if ( $ip === '' ) {
+ return null;
+ }
+ /* If not an IP, just return trimmed value, since sanitizeIP() is called
+ * in a number of contexts where usernames are supplied as input.
+ */
+ if ( !self::isIPAddress( $ip ) ) {
+ return $ip;
+ }
+ if ( self::isIPv4( $ip ) ) {
+ // Remove leading 0's from octet representation of IPv4 address
+ $ip = preg_replace( '/(?:^|(?<=\.))0+(?=[1-9]|0\.|0$)/', '', $ip );
+ return $ip;
+ }
+ // Remove any whitespaces, convert to upper case
+ $ip = strtoupper( $ip );
+ // Expand zero abbreviations
+ $abbrevPos = strpos( $ip, '::' );
+ if ( $abbrevPos !== false ) {
+ // We know this is valid IPv6. Find the last index of the
+ // address before any CIDR number (e.g. "a:b:c::/24").
+ $CIDRStart = strpos( $ip, "/" );
+ $addressEnd = ( $CIDRStart !== false )
+ ? $CIDRStart - 1
+ : strlen( $ip ) - 1;
+ // If the '::' is at the beginning...
+ if ( $abbrevPos == 0 ) {
+ $repeat = '0:';
+ $extra = ( $ip == '::' ) ? '0' : ''; // for the address '::'
+ $pad = 9; // 7+2 (due to '::')
+ // If the '::' is at the end...
+ } elseif ( $abbrevPos == ( $addressEnd - 1 ) ) {
+ $repeat = ':0';
+ $extra = '';
+ $pad = 9; // 7+2 (due to '::')
+ // If the '::' is in the middle...
+ } else {
+ $repeat = ':0';
+ $extra = ':';
+ $pad = 8; // 6+2 (due to '::')
+ }
+ $ip = str_replace( '::',
+ str_repeat( $repeat, $pad - substr_count( $ip, ':' ) ) . $extra,
+ $ip
+ );
+ }
+ // Remove leading zeros from each bloc as needed
+ $ip = preg_replace( '/(^|:)0+(' . RE_IPV6_WORD . ')/', '$1$2', $ip );
+
+ return $ip;
+ }
+
+ /**
+ * Prettify an IP for display to end users.
+ * This will make it more compact and lower-case.
+ *
+ * @param string $ip
+ * @return string
+ */
+ public static function prettifyIP( $ip ) {
+ $ip = self::sanitizeIP( $ip ); // normalize (removes '::')
+ if ( self::isIPv6( $ip ) ) {
+ // Split IP into an address and a CIDR
+ if ( strpos( $ip, '/' ) !== false ) {
+ list( $ip, $cidr ) = explode( '/', $ip, 2 );
+ } else {
+ list( $ip, $cidr ) = [ $ip, '' ];
+ }
+ // Get the largest slice of words with multiple zeros
+ $offset = 0;
+ $longest = $longestPos = false;
+ while ( preg_match(
+ '!(?:^|:)0(?::0)+(?:$|:)!', $ip, $m, PREG_OFFSET_CAPTURE, $offset
+ ) ) {
+ list( $match, $pos ) = $m[0]; // full match
+ if ( strlen( $match ) > strlen( $longest ) ) {
+ $longest = $match;
+ $longestPos = $pos;
+ }
+ $offset = ( $pos + strlen( $match ) ); // advance
+ }
+ if ( $longest !== false ) {
+ // Replace this portion of the string with the '::' abbreviation
+ $ip = substr_replace( $ip, '::', $longestPos, strlen( $longest ) );
+ }
+ // Add any CIDR back on
+ if ( $cidr !== '' ) {
+ $ip = "{$ip}/{$cidr}";
+ }
+ // Convert to lower case to make it more readable
+ $ip = strtolower( $ip );
+ }
+
+ return $ip;
+ }
+
+ /**
+ * Given a host/port string, like one might find in the host part of a URL
+ * per RFC 2732, split the hostname part and the port part and return an
+ * array with an element for each. If there is no port part, the array will
+ * have false in place of the port. If the string was invalid in some way,
+ * false is returned.
+ *
+ * This was easy with IPv4 and was generally done in an ad-hoc way, but
+ * with IPv6 it's somewhat more complicated due to the need to parse the
+ * square brackets and colons.
+ *
+ * A bare IPv6 address is accepted despite the lack of square brackets.
+ *
+ * @param string $both The string with the host and port
+ * @return array|false Array normally, false on certain failures
+ */
+ public static function splitHostAndPort( $both ) {
+ if ( substr( $both, 0, 1 ) === '[' ) {
+ if ( preg_match( '/^\[(' . RE_IPV6_ADD . ')\](?::(?P<port>\d+))?$/', $both, $m ) ) {
+ if ( isset( $m['port'] ) ) {
+ return [ $m[1], intval( $m['port'] ) ];
+ } else {
+ return [ $m[1], false ];
+ }
+ } else {
+ // Square bracket found but no IPv6
+ return false;
+ }
+ }
+ $numColons = substr_count( $both, ':' );
+ if ( $numColons >= 2 ) {
+ // Is it a bare IPv6 address?
+ if ( preg_match( '/^' . RE_IPV6_ADD . '$/', $both ) ) {
+ return [ $both, false ];
+ } else {
+ // Not valid IPv6, but too many colons for anything else
+ return false;
+ }
+ }
+ if ( $numColons >= 1 ) {
+ // Host:port?
+ $bits = explode( ':', $both );
+ if ( preg_match( '/^\d+/', $bits[1] ) ) {
+ return [ $bits[0], intval( $bits[1] ) ];
+ } else {
+ // Not a valid port
+ return false;
+ }
+ }
+
+ // Plain hostname
+ return [ $both, false ];
+ }
+
+ /**
+ * Given a host name and a port, combine them into host/port string like
+ * you might find in a URL. If the host contains a colon, wrap it in square
+ * brackets like in RFC 2732. If the port matches the default port, omit
+ * the port specification
+ *
+ * @param string $host
+ * @param int $port
+ * @param bool|int $defaultPort
+ * @return string
+ */
+ public static function combineHostAndPort( $host, $port, $defaultPort = false ) {
+ if ( strpos( $host, ':' ) !== false ) {
+ $host = "[$host]";
+ }
+ if ( $defaultPort !== false && $port == $defaultPort ) {
+ return $host;
+ } else {
+ return "$host:$port";
+ }
+ }
+
+ /**
+ * Convert an IPv4 or IPv6 hexadecimal representation back to readable format
+ *
+ * @param string $hex Number, with "v6-" prefix if it is IPv6
+ * @return string Quad-dotted (IPv4) or octet notation (IPv6)
+ */
+ public static function formatHex( $hex ) {
+ if ( substr( $hex, 0, 3 ) == 'v6-' ) { // IPv6
+ return self::hexToOctet( substr( $hex, 3 ) );
+ } else { // IPv4
+ return self::hexToQuad( $hex );
+ }
+ }
+
+ /**
+ * Converts a hexadecimal number to an IPv6 address in octet notation
+ *
+ * @param string $ip_hex Pure hex (no v6- prefix)
+ * @return string (of format a:b:c:d:e:f:g:h)
+ */
+ public static function hexToOctet( $ip_hex ) {
+ // Pad hex to 32 chars (128 bits)
+ $ip_hex = str_pad( strtoupper( $ip_hex ), 32, '0', STR_PAD_LEFT );
+ // Separate into 8 words
+ $ip_oct = substr( $ip_hex, 0, 4 );
+ for ( $n = 1; $n < 8; $n++ ) {
+ $ip_oct .= ':' . substr( $ip_hex, 4 * $n, 4 );
+ }
+ // NO leading zeroes
+ $ip_oct = preg_replace( '/(^|:)0+(' . RE_IPV6_WORD . ')/', '$1$2', $ip_oct );
+
+ return $ip_oct;
+ }
+
+ /**
+ * Converts a hexadecimal number to an IPv4 address in quad-dotted notation
+ *
+ * @param string $ip_hex Pure hex
+ * @return string (of format a.b.c.d)
+ */
+ public static function hexToQuad( $ip_hex ) {
+ // Pad hex to 8 chars (32 bits)
+ $ip_hex = str_pad( strtoupper( $ip_hex ), 8, '0', STR_PAD_LEFT );
+ // Separate into four quads
+ $s = '';
+ for ( $i = 0; $i < 4; $i++ ) {
+ if ( $s !== '' ) {
+ $s .= '.';
+ }
+ $s .= base_convert( substr( $ip_hex, $i * 2, 2 ), 16, 10 );
+ }
+
+ return $s;
+ }
+
+ /**
+ * Determine if an IP address really is an IP address, and if it is public,
+ * i.e. not RFC 1918 or similar
+ *
+ * @param string $ip
+ * @return bool
+ */
+ public static function isPublic( $ip ) {
+ static $privateSet = null;
+ if ( !$privateSet ) {
+ $privateSet = new IPSet( [
+ '10.0.0.0/8', # RFC 1918 (private)
+ '172.16.0.0/12', # RFC 1918 (private)
+ '192.168.0.0/16', # RFC 1918 (private)
+ '0.0.0.0/8', # this network
+ '127.0.0.0/8', # loopback
+ 'fc00::/7', # RFC 4193 (local)
+ '0:0:0:0:0:0:0:1', # loopback
+ '169.254.0.0/16', # link-local
+ 'fe80::/10', # link-local
+ ] );
+ }
+ return !$privateSet->match( $ip );
+ }
+
+ /**
+ * Return a zero-padded upper case hexadecimal representation of an IP address.
+ *
+ * Hexadecimal addresses are used because they can easily be extended to
+ * IPv6 support. To separate the ranges, the return value from this
+ * function for an IPv6 address will be prefixed with "v6-", a non-
+ * hexadecimal string which sorts after the IPv4 addresses.
+ *
+ * @param string $ip Quad dotted/octet IP address.
+ * @return string|bool False on failure
+ */
+ public static function toHex( $ip ) {
+ if ( self::isIPv6( $ip ) ) {
+ $n = 'v6-' . self::IPv6ToRawHex( $ip );
+ } elseif ( self::isIPv4( $ip ) ) {
+ // T62035/T97897: An IP with leading 0's fails in ip2long sometimes (e.g. *.08),
+ // also double/triple 0 needs to be changed to just a single 0 for ip2long.
+ $ip = self::sanitizeIP( $ip );
+ $n = ip2long( $ip );
+ if ( $n < 0 ) {
+ $n += pow( 2, 32 );
+ # On 32-bit platforms (and on Windows), 2^32 does not fit into an int,
+ # so $n becomes a float. We convert it to string instead.
+ if ( is_float( $n ) ) {
+ $n = (string)$n;
+ }
+ }
+ if ( $n !== false ) {
+ # Floating points can handle the conversion; faster than Wikimedia\base_convert()
+ $n = strtoupper( str_pad( base_convert( $n, 10, 16 ), 8, '0', STR_PAD_LEFT ) );
+ }
+ } else {
+ $n = false;
+ }
+
+ return $n;
+ }
+
+ /**
+ * Given an IPv6 address in octet notation, returns a pure hex string.
+ *
+ * @param string $ip Octet ipv6 IP address.
+ * @return string|bool Pure hex (uppercase); false on failure
+ */
+ private static function IPv6ToRawHex( $ip ) {
+ $ip = self::sanitizeIP( $ip );
+ if ( !$ip ) {
+ return false;
+ }
+ $r_ip = '';
+ foreach ( explode( ':', $ip ) as $v ) {
+ $r_ip .= str_pad( $v, 4, 0, STR_PAD_LEFT );
+ }
+
+ return $r_ip;
+ }
+
+ /**
+ * Convert a network specification in CIDR notation
+ * to an integer network and a number of bits
+ *
+ * @param string $range IP with CIDR prefix
+ * @return array(int or string, int)
+ */
+ public static function parseCIDR( $range ) {
+ if ( self::isIPv6( $range ) ) {
+ return self::parseCIDR6( $range );
+ }
+ $parts = explode( '/', $range, 2 );
+ if ( count( $parts ) != 2 ) {
+ return [ false, false ];
+ }
+ list( $network, $bits ) = $parts;
+ $network = ip2long( $network );
+ if ( $network !== false && is_numeric( $bits ) && $bits >= 0 && $bits <= 32 ) {
+ if ( $bits == 0 ) {
+ $network = 0;
+ } else {
+ $network &= ~( ( 1 << ( 32 - $bits ) ) - 1 );
+ }
+ # Convert to unsigned
+ if ( $network < 0 ) {
+ $network += pow( 2, 32 );
+ }
+ } else {
+ $network = false;
+ $bits = false;
+ }
+
+ return [ $network, $bits ];
+ }
+
+ /**
+ * Given a string range in a number of formats,
+ * return the start and end of the range in hexadecimal.
+ *
+ * Formats are:
+ * 1.2.3.4/24 CIDR
+ * 1.2.3.4 - 1.2.3.5 Explicit range
+ * 1.2.3.4 Single IP
+ *
+ * 2001:0db8:85a3::7344/96 CIDR
+ * 2001:0db8:85a3::7344 - 2001:0db8:85a3::7344 Explicit range
+ * 2001:0db8:85a3::7344 Single IP
+ * @param string $range IP range
+ * @return array(string, string)
+ */
+ public static function parseRange( $range ) {
+ // CIDR notation
+ if ( strpos( $range, '/' ) !== false ) {
+ if ( self::isIPv6( $range ) ) {
+ return self::parseRange6( $range );
+ }
+ list( $network, $bits ) = self::parseCIDR( $range );
+ if ( $network === false ) {
+ $start = $end = false;
+ } else {
+ $start = sprintf( '%08X', $network );
+ $end = sprintf( '%08X', $network + pow( 2, ( 32 - $bits ) ) - 1 );
+ }
+ // Explicit range
+ } elseif ( strpos( $range, '-' ) !== false ) {
+ list( $start, $end ) = array_map( 'trim', explode( '-', $range, 2 ) );
+ if ( self::isIPv6( $start ) && self::isIPv6( $end ) ) {
+ return self::parseRange6( $range );
+ }
+ if ( self::isIPv4( $start ) && self::isIPv4( $end ) ) {
+ $start = self::toHex( $start );
+ $end = self::toHex( $end );
+ if ( $start > $end ) {
+ $start = $end = false;
+ }
+ } else {
+ $start = $end = false;
+ }
+ } else {
+ # Single IP
+ $start = $end = self::toHex( $range );
+ }
+ if ( $start === false || $end === false ) {
+ return [ false, false ];
+ } else {
+ return [ $start, $end ];
+ }
+ }
+
+ /**
+ * Convert a network specification in IPv6 CIDR notation to an
+ * integer network and a number of bits
+ *
+ * @param string $range
+ *
+ * @return array(string, int)
+ */
+ private static function parseCIDR6( $range ) {
+ # Explode into <expanded IP,range>
+ $parts = explode( '/', IP::sanitizeIP( $range ), 2 );
+ if ( count( $parts ) != 2 ) {
+ return [ false, false ];
+ }
+ list( $network, $bits ) = $parts;
+ $network = self::IPv6ToRawHex( $network );
+ if ( $network !== false && is_numeric( $bits ) && $bits >= 0 && $bits <= 128 ) {
+ if ( $bits == 0 ) {
+ $network = "0";
+ } else {
+ # Native 32 bit functions WONT work here!!!
+ # Convert to a padded binary number
+ $network = Wikimedia\base_convert( $network, 16, 2, 128 );
+ # Truncate the last (128-$bits) bits and replace them with zeros
+ $network = str_pad( substr( $network, 0, $bits ), 128, 0, STR_PAD_RIGHT );
+ # Convert back to an integer
+ $network = Wikimedia\base_convert( $network, 2, 10 );
+ }
+ } else {
+ $network = false;
+ $bits = false;
+ }
+
+ return [ $network, (int)$bits ];
+ }
+
+ /**
+ * Given a string range in a number of formats, return the
+ * start and end of the range in hexadecimal. For IPv6.
+ *
+ * Formats are:
+ * 2001:0db8:85a3::7344/96 CIDR
+ * 2001:0db8:85a3::7344 - 2001:0db8:85a3::7344 Explicit range
+ * 2001:0db8:85a3::7344/96 Single IP
+ *
+ * @param string $range
+ *
+ * @return array(string, string)
+ */
+ private static function parseRange6( $range ) {
+ # Expand any IPv6 IP
+ $range = IP::sanitizeIP( $range );
+ // CIDR notation...
+ if ( strpos( $range, '/' ) !== false ) {
+ list( $network, $bits ) = self::parseCIDR6( $range );
+ if ( $network === false ) {
+ $start = $end = false;
+ } else {
+ $start = Wikimedia\base_convert( $network, 10, 16, 32, false );
+ # Turn network to binary (again)
+ $end = Wikimedia\base_convert( $network, 10, 2, 128 );
+ # Truncate the last (128-$bits) bits and replace them with ones
+ $end = str_pad( substr( $end, 0, $bits ), 128, 1, STR_PAD_RIGHT );
+ # Convert to hex
+ $end = Wikimedia\base_convert( $end, 2, 16, 32, false );
+ # see toHex() comment
+ $start = "v6-$start";
+ $end = "v6-$end";
+ }
+ // Explicit range notation...
+ } elseif ( strpos( $range, '-' ) !== false ) {
+ list( $start, $end ) = array_map( 'trim', explode( '-', $range, 2 ) );
+ $start = self::toHex( $start );
+ $end = self::toHex( $end );
+ if ( $start > $end ) {
+ $start = $end = false;
+ }
+ } else {
+ # Single IP
+ $start = $end = self::toHex( $range );
+ }
+ if ( $start === false || $end === false ) {
+ return [ false, false ];
+ } else {
+ return [ $start, $end ];
+ }
+ }
+
+ /**
+ * Determine if a given IPv4/IPv6 address is in a given CIDR network
+ *
+ * @param string $addr The address to check against the given range.
+ * @param string $range The range to check the given address against.
+ * @return bool Whether or not the given address is in the given range.
+ *
+ * @note This can return unexpected results for invalid arguments!
+ * Make sure you pass a valid IP address and IP range.
+ */
+ public static function isInRange( $addr, $range ) {
+ $hexIP = self::toHex( $addr );
+ list( $start, $end ) = self::parseRange( $range );
+
+ return ( strcmp( $hexIP, $start ) >= 0 &&
+ strcmp( $hexIP, $end ) <= 0 );
+ }
+
+ /**
+ * Determines if an IP address is a list of CIDR a.b.c.d/n ranges.
+ *
+ * @since 1.25
+ *
+ * @param string $ip the IP to check
+ * @param array $ranges the IP ranges, each element a range
+ *
+ * @return bool true if the specified adress belongs to the specified range; otherwise, false.
+ */
+ public static function isInRanges( $ip, $ranges ) {
+ foreach ( $ranges as $range ) {
+ if ( self::isInRange( $ip, $range ) ) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Convert some unusual representations of IPv4 addresses to their
+ * canonical dotted quad representation.
+ *
+ * This currently only checks a few IPV4-to-IPv6 related cases. More
+ * unusual representations may be added later.
+ *
+ * @param string $addr Something that might be an IP address
+ * @return string|null Valid dotted quad IPv4 address or null
+ */
+ public static function canonicalize( $addr ) {
+ // remove zone info (bug 35738)
+ $addr = preg_replace( '/\%.*/', '', $addr );
+
+ if ( self::isValid( $addr ) ) {
+ return $addr;
+ }
+ // Turn mapped addresses from ::ce:ffff:1.2.3.4 to 1.2.3.4
+ if ( strpos( $addr, ':' ) !== false && strpos( $addr, '.' ) !== false ) {
+ $addr = substr( $addr, strrpos( $addr, ':' ) + 1 );
+ if ( self::isIPv4( $addr ) ) {
+ return $addr;
+ }
+ }
+ // IPv6 loopback address
+ $m = [];
+ if ( preg_match( '/^0*' . RE_IPV6_GAP . '1$/', $addr, $m ) ) {
+ return '127.0.0.1';
+ }
+ // IPv4-mapped and IPv4-compatible IPv6 addresses
+ if ( preg_match( '/^' . RE_IPV6_V4_PREFIX . '(' . RE_IP_ADD . ')$/i', $addr, $m ) ) {
+ return $m[1];
+ }
+ if ( preg_match( '/^' . RE_IPV6_V4_PREFIX . RE_IPV6_WORD .
+ ':' . RE_IPV6_WORD . '$/i', $addr, $m )
+ ) {
+ return long2ip( ( hexdec( $m[1] ) << 16 ) + hexdec( $m[2] ) );
+ }
+
+ return null; // give up
+ }
+
+ /**
+ * Gets rid of unneeded numbers in quad-dotted/octet IP strings
+ * For example, 127.111.113.151/24 -> 127.111.113.0/24
+ * @param string $range IP address to normalize
+ * @return string
+ */
+ public static function sanitizeRange( $range ) {
+ list( /*...*/, $bits ) = self::parseCIDR( $range );
+ list( $start, /*...*/ ) = self::parseRange( $range );
+ $start = self::formatHex( $start );
+ if ( $bits === false ) {
+ return $start; // wasn't actually a range
+ }
+
+ return "$start/$bits";
+ }
+
+ /**
+ * Returns the subnet of a given IP
+ *
+ * @param string $ip
+ * @return string|false
+ */
+ public static function getSubnet( $ip ) {
+ $matches = [];
+ $subnet = false;
+ if ( IP::isIPv6( $ip ) ) {
+ $parts = IP::parseRange( "$ip/64" );
+ $subnet = $parts[0];
+ } elseif ( preg_match( '/^(\d+\.\d+\.\d+)\.\d+$/', $ip, $matches ) ) {
+ // IPv4
+ $subnet = $matches[1];
+ }
+ return $subnet;
+ }
+}
+++ /dev/null
-<?php
-/**
- * Copyright 2015
- *
- * 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
- */
-
-use Liuggio\StatsdClient\StatsdClient;
-use Liuggio\StatsdClient\Entity\StatsdData;
-use Liuggio\StatsdClient\Entity\StatsdDataInterface;
-
-/**
- * A statsd client that applies the sampling rate to the data items before sending them.
- *
- * @since 1.26
- */
-class SamplingStatsdClient extends StatsdClient {
- protected $samplingRates = [];
-
- /**
- * Sampling rates as an associative array of patterns and rates.
- * Patterns are Unix shell patterns (e.g. 'MediaWiki.api.*').
- * Rates are sampling probabilities (e.g. 0.1 means 1 in 10 events are sampled).
- * @param array $samplingRates
- * @since 1.28
- */
- public function setSamplingRates( array $samplingRates ) {
- $this->samplingRates = $samplingRates;
- }
-
- /**
- * Sets sampling rate for all items in $data.
- * The sample rate specified in a StatsdData entity overrides the sample rate specified here.
- *
- * {@inheritDoc}
- */
- public function appendSampleRate( $data, $sampleRate = 1 ) {
- $samplingRates = $this->samplingRates;
- if ( !$samplingRates && $sampleRate !== 1 ) {
- $samplingRates = [ '*' => $sampleRate ];
- }
- if ( $samplingRates ) {
- array_walk( $data, function( $item ) use ( $samplingRates ) {
- /** @var $item StatsdData */
- foreach ( $samplingRates as $pattern => $rate ) {
- if ( fnmatch( $pattern, $item->getKey(), FNM_NOESCAPE ) ) {
- $item->setSampleRate( $item->getSampleRate() * $rate );
- break;
- }
- }
- } );
- }
-
- return $data;
- }
-
- /*
- * Send the metrics over UDP
- * Sample the metrics according to their sample rate and send the remaining ones.
- *
- * @param StatsdDataInterface|StatsdDataInterface[] $data message(s) to sent
- * strings are not allowed here as sampleData requires a StatsdDataInterface
- * @param int $sampleRate
- *
- * @return integer the data sent in bytes
- */
- public function send( $data, $sampleRate = 1 ) {
- if ( !is_array( $data ) ) {
- $data = [ $data ];
- }
- if ( !$data ) {
- return;
- }
- foreach ( $data as $item ) {
- if ( !( $item instanceof StatsdDataInterface ) ) {
- throw new InvalidArgumentException(
- 'SamplingStatsdClient does not accept stringified messages' );
- }
- }
-
- // add sampling
- $data = $this->appendSampleRate( $data, $sampleRate );
- $data = $this->sampleData( $data );
-
- $data = array_map( 'strval', $data );
-
- // reduce number of packets
- if ( $this->getReducePacket() ) {
- $data = $this->reduceCount( $data );
- }
-
- // failures in any of this should be silently ignored if ..
- $written = 0;
- try {
- $fp = $this->getSender()->open();
- if ( !$fp ) {
- return;
- }
- foreach ( $data as $message ) {
- $written += $this->getSender()->write( $fp, $message );
- }
- $this->getSender()->close( $fp );
- } catch ( Exception $e ) {
- $this->throwException( $e );
- }
-
- return $written;
- }
-
- /**
- * Throw away some of the data according to the sample rate.
- * @param StatsdDataInterface[] $data
- * @return StatsdDataInterface[]
- * @throws LogicException
- */
- protected function sampleData( $data ) {
- $newData = [];
- $mt_rand_max = mt_getrandmax();
- foreach ( $data as $item ) {
- $samplingRate = $item->getSampleRate();
- if ( $samplingRate <= 0.0 || $samplingRate > 1.0 ) {
- throw new LogicException( 'Sampling rate shall be within ]0, 1]' );
- }
- if (
- $samplingRate === 1 ||
- ( mt_rand() / $mt_rand_max <= $samplingRate )
- ) {
- $newData[] = $item;
- }
- }
- return $newData;
- }
-
- /**
- * {@inheritDoc}
- */
- protected function throwException( Exception $exception ) {
- if ( !$this->getFailSilently() ) {
- throw $exception;
- }
- }
-}
--- /dev/null
+<?php
+/**
+ * Non-directory file on the file system.
+ *
+ * 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 FileBackend
+ */
+
+/**
+ * Class representing a non-directory file on the file system
+ *
+ * @ingroup FileBackend
+ */
+class FSFile {
+ /** @var string Path to file */
+ protected $path;
+
+ /** @var string File SHA-1 in base 36 */
+ protected $sha1Base36;
+
+ /**
+ * Sets up the file object
+ *
+ * @param string $path Path to temporary file on local disk
+ */
+ public function __construct( $path ) {
+ $this->path = $path;
+ }
+
+ /**
+ * Returns the file system path
+ *
+ * @return string
+ */
+ public function getPath() {
+ return $this->path;
+ }
+
+ /**
+ * Checks if the file exists
+ *
+ * @return bool
+ */
+ public function exists() {
+ return is_file( $this->path );
+ }
+
+ /**
+ * Get the file size in bytes
+ *
+ * @return int|bool
+ */
+ public function getSize() {
+ return filesize( $this->path );
+ }
+
+ /**
+ * Get the file's last-modified timestamp
+ *
+ * @return string|bool TS_MW timestamp or false on failure
+ */
+ public function getTimestamp() {
+ MediaWiki\suppressWarnings();
+ $timestamp = filemtime( $this->path );
+ MediaWiki\restoreWarnings();
+ if ( $timestamp !== false ) {
+ $timestamp = wfTimestamp( TS_MW, $timestamp );
+ }
+
+ return $timestamp;
+ }
+
+ /**
+ * Get an associative array containing information about
+ * a file with the given storage path.
+ *
+ * Resulting array fields include:
+ * - fileExists
+ * - size (filesize in bytes)
+ * - mime (as major/minor)
+ * - file-mime (as major/minor)
+ * - sha1 (in base 36)
+ * - major_mime
+ * - minor_mime
+ *
+ * @param string|bool $ext The file extension, or true to extract it from the filename.
+ * Set it to false to ignore the extension. Currently unused.
+ * @return array
+ */
+ public function getProps( $ext = true ) {
+ $info = self::placeholderProps();
+ $info['fileExists'] = $this->exists();
+
+ if ( $info['fileExists'] ) {
+ $info['size'] = $this->getSize(); // bytes
+ $info['sha1'] = $this->getSha1Base36();
+
+ $mime = mime_content_type( $this->path );
+ # MIME type according to file contents
+ $info['file-mime'] = ( $mime === false ) ? 'unknown/unknown' : $mime;
+ # logical MIME type
+ $info['mime'] = $mime;
+
+ if ( strpos( $mime, '/' ) !== false ) {
+ list( $info['major_mime'], $info['minor_mime'] ) = explode( '/', $mime, 2 );
+ } else {
+ list( $info['major_mime'], $info['minor_mime'] ) = [ $mime, 'unknown' ];
+ }
+ }
+
+ return $info;
+ }
+
+ /**
+ * Placeholder file properties to use for files that don't exist
+ *
+ * Resulting array fields include:
+ * - fileExists
+ * - size (filesize in bytes)
+ * - mime (as major/minor)
+ * - file-mime (as major/minor)
+ * - sha1 (in base 36)
+ * - major_mime
+ * - minor_mime
+ *
+ * @return array
+ */
+ public static function placeholderProps() {
+ $info = [];
+ $info['fileExists'] = false;
+ $info['size'] = 0;
+ $info['file-mime'] = null;
+ $info['major_mime'] = null;
+ $info['minor_mime'] = null;
+ $info['mime'] = null;
+ $info['sha1'] = '';
+
+ return $info;
+ }
+
+ /**
+ * Exract image size information
+ *
+ * @param array $gis
+ * @return array
+ */
+ protected function extractImageSizeInfo( array $gis ) {
+ $info = [];
+ # NOTE: $gis[2] contains a code for the image type. This is no longer used.
+ $info['width'] = $gis[0];
+ $info['height'] = $gis[1];
+ if ( isset( $gis['bits'] ) ) {
+ $info['bits'] = $gis['bits'];
+ } else {
+ $info['bits'] = 0;
+ }
+
+ return $info;
+ }
+
+ /**
+ * Get a SHA-1 hash of a file in the local filesystem, in base-36 lower case
+ * encoding, zero padded to 31 digits.
+ *
+ * 160 log 2 / log 36 = 30.95, so the 160-bit hash fills 31 digits in base 36
+ * fairly neatly.
+ *
+ * @param bool $recache
+ * @return bool|string False on failure
+ */
+ public function getSha1Base36( $recache = false ) {
+ if ( $this->sha1Base36 !== null && !$recache ) {
+ return $this->sha1Base36;
+ }
+
+ MediaWiki\suppressWarnings();
+ $this->sha1Base36 = sha1_file( $this->path );
+ MediaWiki\restoreWarnings();
+
+ if ( $this->sha1Base36 !== false ) {
+ $this->sha1Base36 = Wikimedia\base_convert( $this->sha1Base36, 16, 36, 31 );
+ }
+
+ return $this->sha1Base36;
+ }
+
+ /**
+ * Get the final file extension from a file system path
+ *
+ * @param string $path
+ * @return string
+ */
+ public static function extensionFromPath( $path ) {
+ $i = strrpos( $path, '.' );
+
+ return strtolower( $i ? substr( $path, $i + 1 ) : '' );
+ }
+
+ /**
+ * Get an associative array containing information about a file in the local filesystem.
+ *
+ * @param string $path Absolute local filesystem path
+ * @param string|bool $ext The file extension, or true to extract it from the filename.
+ * Set it to false to ignore the extension.
+ * @return array
+ */
+ public static function getPropsFromPath( $path, $ext = true ) {
+ $fsFile = new self( $path );
+
+ return $fsFile->getProps( $ext );
+ }
+
+ /**
+ * Get a SHA-1 hash of a file in the local filesystem, in base-36 lower case
+ * encoding, zero padded to 31 digits.
+ *
+ * 160 log 2 / log 36 = 30.95, so the 160-bit hash fills 31 digits in base 36
+ * fairly neatly.
+ *
+ * @param string $path
+ * @return bool|string False on failure
+ */
+ public static function getSha1Base36FromPath( $path ) {
+ $fsFile = new self( $path );
+
+ return $fsFile->getSha1Base36();
+ }
+}
/** @var int How many operations can be done in parallel */
protected $concurrency;
+ /** @var string Temporary file directory */
+ protected $tmpDirectory;
+
/** @var LockManager */
protected $lockManager;
* - parallelize : When to do file operations in parallel (when possible).
* Allowed values are "implicit", "explicit" and "off".
* - concurrency : How many file operations can be done in parallel.
- * @throws FileBackendException
+ * - tmpDirectory : Directory to use for temporary files. If this is not set or null,
+ * then the backend will try to discover a usable temporary directory.
+ * @throws InvalidArgumentException
*/
public function __construct( array $config ) {
$this->name = $config['name'];
$this->wikiId = $config['wikiId']; // e.g. "my_wiki-en_"
if ( !preg_match( '!^[a-zA-Z0-9-_]{1,255}$!', $this->name ) ) {
- throw new FileBackendException( "Backend name '{$this->name}' is invalid." );
+ throw new InvalidArgumentException( "Backend name '{$this->name}' is invalid." );
} elseif ( !is_string( $this->wikiId ) ) {
- throw new FileBackendException( "Backend wiki ID not provided for '{$this->name}'." );
+ throw new InvalidArgumentException( "Backend wiki ID not provided for '{$this->name}'." );
}
$this->lockManager = isset( $config['lockManager'] )
? $config['lockManager']
? (int)$config['concurrency']
: 50;
$this->statusWrapper = isset( $config['statusWrapper'] ) ? $config['statusWrapper'] : null;
+ $this->tmpDirectory = isset( $config['tmpDirectory'] ) ? $config['tmpDirectory'] : null;
}
/**
$type = strtolower( $type );
if ( !in_array( $type, [ 'inline', 'attachment' ] ) ) {
- throw new FileBackendError( "Invalid Content-Disposition type '$type'." );
+ throw new InvalidArgumentException( "Invalid Content-Disposition type '$type'." );
}
$parts[] = $type;
--- /dev/null
+<?php
+/**
+ * File backend exception for checked exceptions (e.g. I/O errors)
+ *
+ * @ingroup FileBackend
+ * @since 1.22
+ */
+class FileBackendError extends Exception {
+}
+++ /dev/null
-<?php
-/**
- * Generic file backend exception for checked and unexpected (e.g. config) exceptions
- *
- * @ingroup FileBackend
- * @since 1.23
- */
-class FileBackendException extends Exception {
-}
-
-/**
- * File backend exception for checked exceptions (e.g. I/O errors)
- *
- * @ingroup FileBackend
- * @since 1.22
- */
-class FileBackendError extends FileBackendException {
-}
--- /dev/null
+<?php
+/**
+ * Location holder of files stored temporarily
+ *
+ * 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 FileBackend
+ */
+
+/**
+ * This class is used to hold the location and do limited manipulation
+ * of files stored temporarily (this will be whatever wfTempDir() returns)
+ *
+ * @ingroup FileBackend
+ */
+class TempFSFile extends FSFile {
+ /** @var bool Garbage collect the temp file */
+ protected $canDelete = false;
+
+ /** @var array Map of (path => 1) for paths to delete on shutdown */
+ protected static $pathsCollect = null;
+
+ public function __construct( $path ) {
+ parent::__construct( $path );
+
+ if ( self::$pathsCollect === null ) {
+ self::$pathsCollect = [];
+ register_shutdown_function( [ __CLASS__, 'purgeAllOnShutdown' ] );
+ }
+ }
+
+ /**
+ * Make a new temporary file on the file system.
+ * Temporary files may be purged when the file object falls out of scope.
+ *
+ * @param string $prefix
+ * @param string $extension Optional file extension
+ * @param string|null $tmpDirectory Optional parent directory
+ * @return TempFSFile|null
+ */
+ public static function factory( $prefix, $extension = '', $tmpDirectory = null ) {
+ $ext = ( $extension != '' ) ? ".{$extension}" : '';
+
+ $attempts = 5;
+ while ( $attempts-- ) {
+ $hex = sprintf( '%06x%06x', mt_rand( 0, 0xffffff ), mt_rand( 0, 0xffffff ) );
+ if ( !is_string( $tmpDirectory ) ) {
+ $tmpDirectory = self::getUsableTempDirectory();
+ }
+ $path = wfTempDir() . '/' . $prefix . $hex . $ext;
+ MediaWiki\suppressWarnings();
+ $newFileHandle = fopen( $path, 'x' );
+ MediaWiki\restoreWarnings();
+ if ( $newFileHandle ) {
+ fclose( $newFileHandle );
+ $tmpFile = new self( $path );
+ $tmpFile->autocollect();
+ // Safely instantiated, end loop.
+ return $tmpFile;
+ }
+ }
+
+ // Give up
+ return null;
+ }
+
+ /**
+ * @return string Filesystem path to a temporary directory
+ * @throws RuntimeException
+ */
+ public static function getUsableTempDirectory() {
+ $tmpDir = array_map( 'getenv', [ 'TMPDIR', 'TMP', 'TEMP' ] );
+ $tmpDir[] = sys_get_temp_dir();
+ $tmpDir[] = ini_get( 'upload_tmp_dir' );
+ foreach ( $tmpDir as $tmp ) {
+ if ( $tmp != '' && is_dir( $tmp ) && is_writable( $tmp ) ) {
+ return $tmp;
+ }
+ }
+
+ // PHP on Windows will detect C:\Windows\Temp as not writable even though PHP can write to
+ // it so create a directory within that called 'mwtmp' with a suffix of the user running
+ // the current process.
+ // The user is included as if various scripts are run by different users they will likely
+ // not be able to access each others temporary files.
+ if ( strtoupper( substr( PHP_OS, 0, 3 ) ) === 'WIN' ) {
+ $tmp = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'mwtmp-' . get_current_user();
+ if ( !file_exists( $tmp ) ) {
+ mkdir( $tmp );
+ }
+ if ( is_dir( $tmp ) && is_writable( $tmp ) ) {
+ return $tmp;
+ }
+ }
+
+ throw new RuntimeException(
+ 'No writable temporary directory could be found. ' .
+ 'Please explicitly specify a writable directory in configuration.' );
+ }
+
+ /**
+ * Purge this file off the file system
+ *
+ * @return bool Success
+ */
+ public function purge() {
+ $this->canDelete = false; // done
+ MediaWiki\suppressWarnings();
+ $ok = unlink( $this->path );
+ MediaWiki\restoreWarnings();
+
+ unset( self::$pathsCollect[$this->path] );
+
+ return $ok;
+ }
+
+ /**
+ * Clean up the temporary file only after an object goes out of scope
+ *
+ * @param object $object
+ * @return TempFSFile This object
+ */
+ public function bind( $object ) {
+ if ( is_object( $object ) ) {
+ if ( !isset( $object->tempFSFileReferences ) ) {
+ // Init first since $object might use __get() and return only a copy variable
+ $object->tempFSFileReferences = [];
+ }
+ $object->tempFSFileReferences[] = $this;
+ }
+
+ return $this;
+ }
+
+ /**
+ * Set flag to not clean up after the temporary file
+ *
+ * @return TempFSFile This object
+ */
+ public function preserve() {
+ $this->canDelete = false;
+
+ unset( self::$pathsCollect[$this->path] );
+
+ return $this;
+ }
+
+ /**
+ * Set flag clean up after the temporary file
+ *
+ * @return TempFSFile This object
+ */
+ public function autocollect() {
+ $this->canDelete = true;
+
+ self::$pathsCollect[$this->path] = 1;
+
+ return $this;
+ }
+
+ /**
+ * Try to make sure that all files are purged on error
+ *
+ * This method should only be called internally
+ */
+ public static function purgeAllOnShutdown() {
+ foreach ( self::$pathsCollect as $path ) {
+ MediaWiki\suppressWarnings();
+ unlink( $path );
+ MediaWiki\restoreWarnings();
+ }
+ }
+
+ /**
+ * Cleans up after the temporary file by deleting it
+ */
+ function __destruct() {
+ if ( $this->canDelete ) {
+ $this->purge();
+ }
+ }
+}
$this->trxProfiler = $params['trxProfiler'];
$this->connLogger = $params['connLogger'];
$this->queryLogger = $params['queryLogger'];
+ $this->errorLogger = $params['errorLogger'];
// Set initial dummy domain until open() sets the final DB/prefix
$this->currentDomain = DatabaseDomain::newUnspecified();
$useIndexes = ( isset( $options['USE INDEX'] ) && is_array( $options['USE INDEX'] ) )
? $options['USE INDEX']
: [];
- $ignoreIndexes = ( isset( $options['IGNORE INDEX'] ) && is_array( $options['IGNORE INDEX'] ) )
+ $ignoreIndexes = (
+ isset( $options['IGNORE INDEX'] ) &&
+ is_array( $options['IGNORE INDEX'] )
+ )
? $options['IGNORE INDEX']
: [];
if ( is_array( $table ) ) {
$from = ' FROM ' .
- $this->tableNamesWithIndexClauseOrJOIN( $table, $useIndexes, $ignoreIndexes, $join_conds );
+ $this->tableNamesWithIndexClauseOrJOIN(
+ $table, $useIndexes, $ignoreIndexes, $join_conds );
} elseif ( $table != '' ) {
if ( $table[0] == ' ' ) {
$from = ' FROM ' . $table;
} else {
$from = ' FROM ' .
- $this->tableNamesWithIndexClauseOrJOIN( [ $table ], $useIndexes, $ignoreIndexes, [] );
+ $this->tableNamesWithIndexClauseOrJOIN(
+ [ $table ], $useIndexes, $ignoreIndexes, [] );
}
} else {
$from = '';
if ( is_array( $conds ) ) {
$conds = $this->makeList( $conds, self::LIST_AND );
}
- $sql = "SELECT $startOpts $vars $from $useIndex $ignoreIndex WHERE $conds $preLimitTail";
+ $sql = "SELECT $startOpts $vars $from $useIndex $ignoreIndex " .
+ "WHERE $conds $preLimitTail";
} else {
$sql = "SELECT $startOpts $vars $from $useIndex $ignoreIndex $preLimitTail";
}
}
}
if ( isset( $ignore_index[$alias] ) ) { // has IGNORE INDEX?
- $ignore = $this->ignoreIndexClause( implode( ',', (array)$ignore_index[$alias] ) );
+ $ignore = $this->ignoreIndexClause(
+ implode( ',', (array)$ignore_index[$alias] ) );
if ( $ignore != '' ) {
$tableClause .= ' ' . $ignore;
}
* @return string
*/
protected function indexName( $index ) {
- // Backwards-compatibility hack
- $renamed = [
- 'ar_usertext_timestamp' => 'usertext_timestamp',
- 'un_user_id' => 'user_id',
- 'un_user_ip' => 'user_ip',
- ];
-
- if ( isset( $renamed[$index] ) ) {
- return $renamed[$index];
- } else {
- return $index;
- }
+ return $index;
}
public function addQuotes( $s ) {
$srcTable = $this->tableName( $srcTable );
}
- $sql = "INSERT $insertOptions INTO $destTable (" . implode( ',', array_keys( $varMap ) ) . ')' .
+ $sql = "INSERT $insertOptions" .
+ " INTO $destTable (" . implode( ',', array_keys( $varMap ) ) . ')' .
" SELECT $startOpts " . implode( ',', $varMap ) .
" FROM $srcTable $useIndex $ignoreIndex ";
}
} else {
if ( !$this->mTrxLevel ) {
- $this->queryLogger->error( "$fname: No transaction to commit, something got out of sync." );
+ $this->queryLogger->error(
+ "$fname: No transaction to commit, something got out of sync." );
return; // nothing to do
} elseif ( $this->mTrxAutomatic ) {
// @TODO: make this an exception at some point
}
public function timestamp( $ts = 0 ) {
- $t = new ConvertableTimestamp( $ts );
+ $t = new ConvertibleTimestamp( $ts );
// Let errors bubble up to avoid putting garbage in the DB
return $t->getTimestamp( TS_MW );
}
* @throws Exception
*/
public function sourceFile(
- $filename, $lineCallback = false, $resultCallback = false, $fname = false, $inputCallback = false
+ $filename,
+ $lineCallback = false,
+ $resultCallback = false,
+ $fname = false,
+ $inputCallback = false
) {
MediaWiki\suppressWarnings();
$fp = fopen( $filename, 'r' );
}
try {
- $error = $this->sourceStream( $fp, $lineCallback, $resultCallback, $fname, $inputCallback );
+ $error = $this->sourceStream(
+ $fp, $lineCallback, $resultCallback, $fname, $inputCallback );
} catch ( Exception $e ) {
fclose( $fp );
throw $e;
* @param bool|callable $inputCallback Optional function called for each complete query sent
* @return bool|string
*/
- public function sourceStream( $fp, $lineCallback = false, $resultCallback = false,
- $fname = __METHOD__, $inputCallback = false
+ public function sourceStream(
+ $fp,
+ $lineCallback = false,
+ $resultCallback = false,
+ $fname = __METHOD__,
+ $inputCallback = false
) {
$cmd = '';
if ( $done || feof( $fp ) ) {
$cmd = $this->replaceVars( $cmd );
- if ( ( $inputCallback && call_user_func( $inputCallback, $cmd ) ) || !$inputCallback ) {
+ if ( !$inputCallback || call_user_func( $inputCallback, $cmd ) ) {
$res = $this->query( $cmd, $fname );
if ( $resultCallback ) {
public function streamStatementEnd( &$sql, &$newLine ) {
if ( $this->delimiter ) {
$prev = $newLine;
- $newLine = preg_replace( '/' . preg_quote( $this->delimiter, '/' ) . '$/', '', $newLine );
+ $newLine = preg_replace(
+ '/' . preg_quote( $this->delimiter, '/' ) . '$/', '', $newLine );
if ( $newLine != $prev ) {
return true;
}
return 'infinity';
}
- try {
- $t = new ConvertableTimestamp( $expiry );
-
- return $t->getTimestamp( $format );
- } catch ( TimestampException $e ) {
- return false;
- }
+ return ConvertibleTimestamp::convert( $format, $expiry );
}
public function setBigSelects( $value = true ) {
// Open a new connection resource without messing with the old one
$this->mOpened = false;
$this->mConn = false;
- $this->mTrxLevel = 0; // no trx anymore
+ $this->mTrxEndCallbacks = []; // don't copy
+ $this->handleSessionLoss(); // no trx or locks anymore
$this->open( $this->mServer, $this->mUser, $this->mPassword, $this->mDBname );
$this->lastPing = microtime( true );
}
return $this->query( "DROP TABLE IF EXISTS " . $this->tableName( $tableName ), $fName );
}
- /**
- * @return array
- */
- protected function getDefaultSchemaVars() {
- $vars = parent::getDefaultSchemaVars();
- $vars['wgDBTableOptions'] = str_replace( 'TYPE', 'ENGINE', $GLOBALS['wgDBTableOptions'] );
- $vars['wgDBTableOptions'] = str_replace(
- 'CHARSET=mysql4',
- 'CHARSET=binary',
- $vars['wgDBTableOptions']
- );
-
- return $vars;
- }
-
/**
* Get status information from SHOW STATUS in an associative array
*
}
function timestamp( $ts = 0 ) {
- $ct = new ConvertableTimestamp( $ts );
+ $ct = new ConvertibleTimestamp( $ts );
return $ct->getTimestamp( TS_POSTGRES );
}
}
/**
- * Determine default schema for MediaWiki core
+ * Determine default schema for the current application
* Adjust this session schema search path if desired schema exists
* and is not alread there.
*
}
/**
- * Return schema name fore core MediaWiki tables
+ * Return schema name for core application tables
*
* @since 1.19
* @return string Core schema name
return str_replace( '"', '', parent::tableName( $name, $format ) );
}
- /**
- * Index names have DB scope
- *
- * @param string $index
- * @return string
- */
- protected function indexName( $index ) {
- return $index;
- }
-
/**
* This must be called after nextSequenceVal
*
public function getServerInfo();
/**
- * Turns buffering of SQL result sets on (true) or off (false). Default is
- * "on".
+ * Turns buffering of SQL result sets on (true) or off (false). Default is "on".
*
* Unbuffered queries are very troublesome in MySQL:
*
* - If another query is executed while the first query is being read
* out, the first query is killed. This means you can't call normal
- * MediaWiki functions while you are reading an unbuffered query result
- * from a normal wfGetDB() connection.
+ * Database functions while you are reading an unbuffered query result
+ * from a normal Database connection.
*
* - Unbuffered queries cause the MySQL server to use large amounts of
* memory and to hold broad locks which block other queries.
*
* - OFFSET: Skip this many rows at the start of the result set. OFFSET
* with LIMIT can theoretically be used for paging through a result set,
- * but this is discouraged in MediaWiki for performance reasons.
+ * but this is discouraged for performance reasons.
*
* - LIMIT: Integer: return at most this many rows. The rows are sorted
* and then the first rows are taken until the limit is reached. LIMIT
* The goal of this function is to create an atomic section of SQL queries
* without having to start a new transaction if it already exists.
*
- * Atomic sections are more strict than transactions. With transactions,
- * attempting to begin a new transaction when one is already running results
- * in MediaWiki issuing a brief warning and doing an implicit commit. All
- * atomic levels *must* be explicitly closed using IDatabase::endAtomic(),
+ * All atomic levels *must* be explicitly closed using IDatabase::endAtomic(),
* and any database transactions cannot be began or committed until all atomic
* levels are closed. There is no such thing as implicitly opening or closing
* an atomic section.
$result = sqlsrv_fetch_object( $res );
}
- // MediaWiki expects us to return boolean false when there are no more rows instead of null
+ // Return boolean false when there are no more rows instead of null
if ( $result === null ) {
return false;
}
$result = sqlsrv_fetch_array( $res );
}
- // MediaWiki expects us to return boolean false when there are no more rows instead of null
+ // Return boolean false when there are no more rows instead of null
if ( $result === null ) {
return false;
}
--- /dev/null
+<?php
+/**
+ * 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 Database
+ */
+
+/**
+ * Exception class for attempted DB access
+ * @ingroup Database
+ */
+class DBAccessError extends DBUnexpectedError {
+ public function __construct() {
+ parent::__construct( "Database access has been disabled." );
+ }
+}
--- /dev/null
+<?php
+/**
+ * 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 Database
+ */
+
+/**
+ * @ingroup Database
+ */
+class DBConnectionError extends DBExpectedError {
+ /**
+ * @param IDatabase $db Object throwing the error
+ * @param string $error Error text
+ */
+ function __construct( IDatabase $db = null, $error = 'unknown error' ) {
+ $msg = 'Cannot access the database';
+ if ( trim( $error ) != '' ) {
+ $msg .= ": $error";
+ }
+
+ parent::__construct( $db, $msg );
+ }
+}
<?php
/**
- * This file contains database error classes.
- *
* 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
parent::__construct( $error );
}
}
-
-/**
- * Base class for the more common types of database errors. These are known to occur
- * frequently, so we try to give friendly error messages for them.
- *
- * @ingroup Database
- * @since 1.23
- */
-class DBExpectedError extends DBError implements MessageSpecifier {
- /** @var string[] Message parameters */
- protected $params;
-
- function __construct( IDatabase $db = null, $error, array $params = [] ) {
- parent::__construct( $db, $error );
- $this->params = $params;
- }
-
- public function getKey() {
- return 'databaseerror-text';
- }
-
- public function getParams() {
- return $this->params;
- }
-}
-
-/**
- * @ingroup Database
- */
-class DBConnectionError extends DBExpectedError {
- /**
- * @param IDatabase $db Object throwing the error
- * @param string $error Error text
- */
- function __construct( IDatabase $db = null, $error = 'unknown error' ) {
- $msg = 'Cannot access the database';
- if ( trim( $error ) != '' ) {
- $msg .= ": $error";
- }
-
- parent::__construct( $db, $msg );
- }
-}
-
-/**
- * @ingroup Database
- */
-class DBQueryError extends DBExpectedError {
- /** @var string */
- public $error;
- /** @var integer */
- public $errno;
- /** @var string */
- public $sql;
- /** @var string */
- public $fname;
-
- /**
- * @param IDatabase $db
- * @param string $error
- * @param int|string $errno
- * @param string $sql
- * @param string $fname
- */
- function __construct( IDatabase $db, $error, $errno, $sql, $fname ) {
- if ( $db instanceof DatabaseBase && $db->wasConnectionError( $errno ) ) {
- $message = "A connection error occured. \n" .
- "Query: $sql\n" .
- "Function: $fname\n" .
- "Error: $errno $error\n";
- } else {
- $message = "A database error has occurred. Did you forget to run " .
- "maintenance/update.php after upgrading? See: " .
- "https://www.mediawiki.org/wiki/Manual:Upgrading#Run_the_update_script\n" .
- "Query: $sql\n" .
- "Function: $fname\n" .
- "Error: $errno $error\n";
- }
- parent::__construct( $db, $message );
-
- $this->error = $error;
- $this->errno = $errno;
- $this->sql = $sql;
- $this->fname = $fname;
- }
-}
-
-/**
- * @ingroup Database
- */
-class DBReadOnlyError extends DBExpectedError {
-}
-
-/**
- * @ingroup Database
- */
-class DBTransactionError extends DBExpectedError {
-}
-
-/**
- * @ingroup Database
- */
-class DBTransactionSizeError extends DBTransactionError {
- function getKey() {
- return 'transaction-duration-limit-exceeded';
- }
-}
-
-/**
- * Exception class for replica DB wait timeouts
- * @ingroup Database
- */
-class DBReplicationWaitError extends DBExpectedError {
-}
-
-/**
- * @ingroup Database
- */
-class DBUnexpectedError extends DBError {
-}
-
-/**
- * Exception class for attempted DB access
- * @ingroup Database
- */
-class DBAccessError extends DBUnexpectedError {
- public function __construct() {
- parent::__construct( "Mediawiki tried to access the database via wfGetDB(). " .
- "This is not allowed, because database access has been disabled." );
- }
-}
-
--- /dev/null
+<?php
+/**
+ * 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 Database
+ */
+
+/**
+ * Base class for the more common types of database errors. These are known to occur
+ * frequently, so we try to give friendly error messages for them.
+ *
+ * @ingroup Database
+ * @since 1.23
+ */
+class DBExpectedError extends DBError implements MessageSpecifier {
+ /** @var string[] Message parameters */
+ protected $params;
+
+ function __construct( IDatabase $db = null, $error, array $params = [] ) {
+ parent::__construct( $db, $error );
+ $this->params = $params;
+ }
+
+ public function getKey() {
+ return 'databaseerror-text';
+ }
+
+ public function getParams() {
+ return $this->params;
+ }
+}
--- /dev/null
+<?php
+/**
+ * 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 Database
+ */
+
+/**
+ * @ingroup Database
+ */
+class DBQueryError extends DBExpectedError {
+ /** @var string */
+ public $error;
+ /** @var integer */
+ public $errno;
+ /** @var string */
+ public $sql;
+ /** @var string */
+ public $fname;
+
+ /**
+ * @param IDatabase $db
+ * @param string $error
+ * @param int|string $errno
+ * @param string $sql
+ * @param string $fname
+ */
+ function __construct( IDatabase $db, $error, $errno, $sql, $fname ) {
+ if ( $db instanceof DatabaseBase && $db->wasConnectionError( $errno ) ) {
+ $message = "A connection error occured. \n" .
+ "Query: $sql\n" .
+ "Function: $fname\n" .
+ "Error: $errno $error\n";
+ } else {
+ $message = "A database query error has occurred. Did you forget to run " .
+ "your application's database schema updater after upgrading? \n" .
+ "Query: $sql\n" .
+ "Function: $fname\n" .
+ "Error: $errno $error\n";
+ }
+
+ parent::__construct( $db, $message );
+
+ $this->error = $error;
+ $this->errno = $errno;
+ $this->sql = $sql;
+ $this->fname = $fname;
+ }
+}
--- /dev/null
+<?php
+/**
+ * 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 Database
+ */
+
+/**
+ * @ingroup Database
+ */
+class DBReadOnlyError extends DBExpectedError {
+}
--- /dev/null
+<?php
+/**
+ * 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 Database
+ */
+
+/**
+ * Exception class for replica DB wait timeouts
+ * @ingroup Database
+ */
+class DBReplicationWaitError extends DBExpectedError {
+}
+
--- /dev/null
+<?php
+/**
+ * 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 Database
+ */
+
+/**
+ * @ingroup Database
+ */
+class DBTransactionError extends DBExpectedError {
+}
--- /dev/null
+<?php
+/**
+ * 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 Database
+ */
+
+/**
+ * @ingroup Database
+ */
+class DBTransactionSizeError extends DBTransactionError {
+ function getKey() {
+ return 'transaction-duration-limit-exceeded';
+ }
+}
--- /dev/null
+<?php
+/**
+ * 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 Database
+ */
+
+/**
+ * @ingroup Database
+ */
+class DBUnexpectedError extends DBError {
+}
* should be ignored
*/
return;
+ } elseif ( $conn instanceof DBConnRef ) {
+ // DBConnRef already handles calling reuseConnection() and only passes the live
+ // Database instance to this method. Any caller passing in a DBConnRef is broken.
+ $this->connLogger->error( __METHOD__ . ": got DBConnRef instance.\n" .
+ ( new RuntimeException() )->getTraceAsString() );
+
+ return;
}
$domain = $conn->getDomainID();
--- /dev/null
+<?php
+/**
+ * Copyright 2015
+ *
+ * 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
+ */
+
+use Liuggio\StatsdClient\StatsdClient;
+use Liuggio\StatsdClient\Entity\StatsdData;
+use Liuggio\StatsdClient\Entity\StatsdDataInterface;
+
+/**
+ * A statsd client that applies the sampling rate to the data items before sending them.
+ *
+ * @since 1.26
+ */
+class SamplingStatsdClient extends StatsdClient {
+ protected $samplingRates = [];
+
+ /**
+ * Sampling rates as an associative array of patterns and rates.
+ * Patterns are Unix shell patterns (e.g. 'MediaWiki.api.*').
+ * Rates are sampling probabilities (e.g. 0.1 means 1 in 10 events are sampled).
+ * @param array $samplingRates
+ * @since 1.28
+ */
+ public function setSamplingRates( array $samplingRates ) {
+ $this->samplingRates = $samplingRates;
+ }
+
+ /**
+ * Sets sampling rate for all items in $data.
+ * The sample rate specified in a StatsdData entity overrides the sample rate specified here.
+ *
+ * {@inheritDoc}
+ */
+ public function appendSampleRate( $data, $sampleRate = 1 ) {
+ $samplingRates = $this->samplingRates;
+ if ( !$samplingRates && $sampleRate !== 1 ) {
+ $samplingRates = [ '*' => $sampleRate ];
+ }
+ if ( $samplingRates ) {
+ array_walk( $data, function( $item ) use ( $samplingRates ) {
+ /** @var $item StatsdData */
+ foreach ( $samplingRates as $pattern => $rate ) {
+ if ( fnmatch( $pattern, $item->getKey(), FNM_NOESCAPE ) ) {
+ $item->setSampleRate( $item->getSampleRate() * $rate );
+ break;
+ }
+ }
+ } );
+ }
+
+ return $data;
+ }
+
+ /*
+ * Send the metrics over UDP
+ * Sample the metrics according to their sample rate and send the remaining ones.
+ *
+ * @param StatsdDataInterface|StatsdDataInterface[] $data message(s) to sent
+ * strings are not allowed here as sampleData requires a StatsdDataInterface
+ * @param int $sampleRate
+ *
+ * @return integer the data sent in bytes
+ */
+ public function send( $data, $sampleRate = 1 ) {
+ if ( !is_array( $data ) ) {
+ $data = [ $data ];
+ }
+ if ( !$data ) {
+ return;
+ }
+ foreach ( $data as $item ) {
+ if ( !( $item instanceof StatsdDataInterface ) ) {
+ throw new InvalidArgumentException(
+ 'SamplingStatsdClient does not accept stringified messages' );
+ }
+ }
+
+ // add sampling
+ $data = $this->appendSampleRate( $data, $sampleRate );
+ $data = $this->sampleData( $data );
+
+ $data = array_map( 'strval', $data );
+
+ // reduce number of packets
+ if ( $this->getReducePacket() ) {
+ $data = $this->reduceCount( $data );
+ }
+
+ // failures in any of this should be silently ignored if ..
+ $written = 0;
+ try {
+ $fp = $this->getSender()->open();
+ if ( !$fp ) {
+ return;
+ }
+ foreach ( $data as $message ) {
+ $written += $this->getSender()->write( $fp, $message );
+ }
+ $this->getSender()->close( $fp );
+ } catch ( Exception $e ) {
+ $this->throwException( $e );
+ }
+
+ return $written;
+ }
+
+ /**
+ * Throw away some of the data according to the sample rate.
+ * @param StatsdDataInterface[] $data
+ * @return StatsdDataInterface[]
+ * @throws LogicException
+ */
+ protected function sampleData( $data ) {
+ $newData = [];
+ $mt_rand_max = mt_getrandmax();
+ foreach ( $data as $item ) {
+ $samplingRate = $item->getSampleRate();
+ if ( $samplingRate <= 0.0 || $samplingRate > 1.0 ) {
+ throw new LogicException( 'Sampling rate shall be within ]0, 1]' );
+ }
+ if (
+ $samplingRate === 1 ||
+ ( mt_rand() / $mt_rand_max <= $samplingRate )
+ ) {
+ $newData[] = $item;
+ }
+ }
+ return $newData;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected function throwException( Exception $exception ) {
+ if ( !$this->getFailSilently() ) {
+ throw $exception;
+ }
+ }
+}
+++ /dev/null
-<?php
-/**
- * Creation, parsing, and conversion of timestamps.
- *
- * 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
- * @since 1.20
- * @author Tyler Romeo, 2012
- */
-
-/**
- * Library for creating, parsing, and converting timestamps. Based on the JS
- * library that does the same thing.
- *
- * @since 1.28
- */
-class ConvertableTimestamp {
- /**
- * Standard gmdate() formats for the different timestamp types.
- */
- private static $formats = [
- TS_UNIX => 'U',
- TS_MW => 'YmdHis',
- TS_DB => 'Y-m-d H:i:s',
- TS_ISO_8601 => 'Y-m-d\TH:i:s\Z',
- TS_ISO_8601_BASIC => 'Ymd\THis\Z',
- TS_EXIF => 'Y:m:d H:i:s', // This shouldn't ever be used, but is included for completeness
- TS_RFC2822 => 'D, d M Y H:i:s',
- TS_ORACLE => 'd-m-Y H:i:s.000000', // Was 'd-M-y h.i.s A' . ' +00:00' before r51500
- TS_POSTGRES => 'Y-m-d H:i:s',
- ];
-
- /**
- * The actual timestamp being wrapped (DateTime object).
- * @var DateTime
- */
- public $timestamp;
-
- /**
- * Make a new timestamp and set it to the specified time,
- * or the current time if unspecified.
- *
- * @param bool|string|int|float|DateTime $timestamp Timestamp to set, or false for current time
- */
- public function __construct( $timestamp = false ) {
- if ( $timestamp instanceof DateTime ) {
- $this->timestamp = $timestamp;
- } else {
- $this->setTimestamp( $timestamp );
- }
- }
-
- /**
- * Set the timestamp to the specified time, or the current time if unspecified.
- *
- * Parse the given timestamp into either a DateTime object or a Unix timestamp,
- * and then store it.
- *
- * @param string|bool $ts Timestamp to store, or false for now
- * @throws TimestampException
- */
- public function setTimestamp( $ts = false ) {
- $m = [];
- $da = [];
- $strtime = '';
-
- // We want to catch 0, '', null... but not date strings starting with a letter.
- if ( !$ts || $ts === "\0\0\0\0\0\0\0\0\0\0\0\0\0\0" ) {
- $uts = time();
- $strtime = "@$uts";
- } elseif ( preg_match( '/^(\d{4})\-(\d\d)\-(\d\d) (\d\d):(\d\d):(\d\d)$/D', $ts, $da ) ) {
- # TS_DB
- } elseif ( preg_match( '/^(\d{4}):(\d\d):(\d\d) (\d\d):(\d\d):(\d\d)$/D', $ts, $da ) ) {
- # TS_EXIF
- } elseif ( preg_match( '/^(\d{4})(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/D', $ts, $da ) ) {
- # TS_MW
- } elseif ( preg_match( '/^(-?\d{1,13})(\.\d+)?$/D', $ts, $m ) ) {
- # TS_UNIX
- $strtime = "@{$m[1]}"; // http://php.net/manual/en/datetime.formats.compound.php
- } elseif ( preg_match( '/^\d{2}-\d{2}-\d{4} \d{2}:\d{2}:\d{2}.\d{6}$/', $ts ) ) {
- # TS_ORACLE // session altered to DD-MM-YYYY HH24:MI:SS.FF6
- $strtime = preg_replace( '/(\d\d)\.(\d\d)\.(\d\d)(\.(\d+))?/', "$1:$2:$3",
- str_replace( '+00:00', 'UTC', $ts ) );
- } elseif ( preg_match(
- '/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(?:\.*\d*)?Z?$/',
- $ts,
- $da
- ) ) {
- # TS_ISO_8601
- } elseif ( preg_match(
- '/^(\d{4})(\d{2})(\d{2})T(\d{2})(\d{2})(\d{2})(?:\.*\d*)?Z?$/',
- $ts,
- $da
- ) ) {
- # TS_ISO_8601_BASIC
- } elseif ( preg_match(
- '/^(\d{4})\-(\d\d)\-(\d\d) (\d\d):(\d\d):(\d\d)\.*\d*[\+\- ](\d\d)$/',
- $ts,
- $da
- ) ) {
- # TS_POSTGRES
- } elseif ( preg_match(
- '/^(\d{4})\-(\d\d)\-(\d\d) (\d\d):(\d\d):(\d\d)\.*\d* GMT$/',
- $ts,
- $da
- ) ) {
- # TS_POSTGRES
- } elseif ( preg_match(
- # Day of week
- '/^[ \t\r\n]*([A-Z][a-z]{2},[ \t\r\n]*)?' .
- # dd Mon yyyy
- '\d\d?[ \t\r\n]*[A-Z][a-z]{2}[ \t\r\n]*\d{2}(?:\d{2})?' .
- # hh:mm:ss
- '[ \t\r\n]*\d\d[ \t\r\n]*:[ \t\r\n]*\d\d[ \t\r\n]*:[ \t\r\n]*\d\d/S',
- $ts
- ) ) {
- # TS_RFC2822, accepting a trailing comment.
- # See http://www.squid-cache.org/mail-archive/squid-users/200307/0122.html / r77171
- # The regex is a superset of rfc2822 for readability
- $strtime = strtok( $ts, ';' );
- } elseif ( preg_match( '/^[A-Z][a-z]{5,8}, \d\d-[A-Z][a-z]{2}-\d{2} \d\d:\d\d:\d\d/', $ts ) ) {
- # TS_RFC850
- $strtime = $ts;
- } elseif ( preg_match( '/^[A-Z][a-z]{2} [A-Z][a-z]{2} +\d{1,2} \d\d:\d\d:\d\d \d{4}/', $ts ) ) {
- # asctime
- $strtime = $ts;
- } else {
- throw new TimestampException( __METHOD__ . ": Invalid timestamp - $ts" );
- }
-
- if ( !$strtime ) {
- $da = array_map( 'intval', $da );
- $da[0] = "%04d-%02d-%02dT%02d:%02d:%02d.00+00:00";
- $strtime = call_user_func_array( "sprintf", $da );
- }
-
- try {
- $final = new DateTime( $strtime, new DateTimeZone( 'GMT' ) );
- } catch ( Exception $e ) {
- throw new TimestampException( __METHOD__ . ': Invalid timestamp format.', $e->getCode(), $e );
- }
-
- if ( $final === false ) {
- throw new TimestampException( __METHOD__ . ': Invalid timestamp format.' );
- }
-
- $this->timestamp = $final;
- }
-
- /**
- * Get the timestamp represented by this object in a certain form.
- *
- * Convert the internal timestamp to the specified format and then
- * return it.
- *
- * @param int $style Constant Output format for timestamp
- * @throws TimestampException
- * @return string The formatted timestamp
- */
- public function getTimestamp( $style = TS_UNIX ) {
- if ( !isset( self::$formats[$style] ) ) {
- throw new TimestampException( __METHOD__ . ': Illegal timestamp output type.' );
- }
-
- $output = $this->timestamp->format( self::$formats[$style] );
-
- if ( ( $style == TS_RFC2822 ) || ( $style == TS_POSTGRES ) ) {
- $output .= ' GMT';
- }
-
- if ( $style == TS_MW && strlen( $output ) !== 14 ) {
- throw new TimestampException( __METHOD__ . ': The timestamp cannot be represented in ' .
- 'the specified format' );
- }
-
- return $output;
- }
-
- /**
- * @return string
- */
- public function __toString() {
- return $this->getTimestamp();
- }
-
- /**
- * Calculate the difference between two ConvertableTimestamp objects.
- *
- * @param ConvertableTimestamp $relativeTo Base time to calculate difference from
- * @return DateInterval|bool The DateInterval object representing the
- * difference between the two dates or false on failure
- */
- public function diff( ConvertableTimestamp $relativeTo ) {
- return $this->timestamp->diff( $relativeTo->timestamp );
- }
-
- /**
- * Set the timezone of this timestamp to the specified timezone.
- *
- * @param string $timezone Timezone to set
- * @throws TimestampException
- */
- public function setTimezone( $timezone ) {
- try {
- $this->timestamp->setTimezone( new DateTimeZone( $timezone ) );
- } catch ( Exception $e ) {
- throw new TimestampException( __METHOD__ . ': Invalid timezone.', $e->getCode(), $e );
- }
- }
-
- /**
- * Get the timezone of this timestamp.
- *
- * @return DateTimeZone The timezone
- */
- public function getTimezone() {
- return $this->timestamp->getTimezone();
- }
-
- /**
- * Format the timestamp in a given format.
- *
- * @param string $format Pattern to format in
- * @return string The formatted timestamp
- */
- public function format( $format ) {
- return $this->timestamp->format( $format );
- }
-}
--- /dev/null
+<?php
+/**
+ * Creation, parsing, and conversion of timestamps.
+ *
+ * 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
+ * @since 1.20
+ * @author Tyler Romeo, 2012
+ */
+
+/**
+ * Library for creating, parsing, and converting timestamps. Based on the JS
+ * library that does the same thing.
+ *
+ * @since 1.28
+ */
+class ConvertibleTimestamp {
+ /**
+ * Standard gmdate() formats for the different timestamp types.
+ */
+ private static $formats = [
+ TS_UNIX => 'U',
+ TS_MW => 'YmdHis',
+ TS_DB => 'Y-m-d H:i:s',
+ TS_ISO_8601 => 'Y-m-d\TH:i:s\Z',
+ TS_ISO_8601_BASIC => 'Ymd\THis\Z',
+ TS_EXIF => 'Y:m:d H:i:s', // This shouldn't ever be used, but is included for completeness
+ TS_RFC2822 => 'D, d M Y H:i:s',
+ TS_ORACLE => 'd-m-Y H:i:s.000000', // Was 'd-M-y h.i.s A' . ' +00:00' before r51500
+ TS_POSTGRES => 'Y-m-d H:i:s',
+ ];
+
+ /**
+ * The actual timestamp being wrapped (DateTime object).
+ * @var DateTime
+ */
+ public $timestamp;
+
+ /**
+ * Make a new timestamp and set it to the specified time,
+ * or the current time if unspecified.
+ *
+ * @param bool|string|int|float|DateTime $timestamp Timestamp to set, or false for current time
+ */
+ public function __construct( $timestamp = false ) {
+ if ( $timestamp instanceof DateTime ) {
+ $this->timestamp = $timestamp;
+ } else {
+ $this->setTimestamp( $timestamp );
+ }
+ }
+
+ /**
+ * Set the timestamp to the specified time, or the current time if unspecified.
+ *
+ * Parse the given timestamp into either a DateTime object or a Unix timestamp,
+ * and then store it.
+ *
+ * @param string|bool $ts Timestamp to store, or false for now
+ * @throws TimestampException
+ */
+ public function setTimestamp( $ts = false ) {
+ $m = [];
+ $da = [];
+ $strtime = '';
+
+ // We want to catch 0, '', null... but not date strings starting with a letter.
+ if ( !$ts || $ts === "\0\0\0\0\0\0\0\0\0\0\0\0\0\0" ) {
+ $uts = time();
+ $strtime = "@$uts";
+ } elseif ( preg_match( '/^(\d{4})\-(\d\d)\-(\d\d) (\d\d):(\d\d):(\d\d)$/D', $ts, $da ) ) {
+ # TS_DB
+ } elseif ( preg_match( '/^(\d{4}):(\d\d):(\d\d) (\d\d):(\d\d):(\d\d)$/D', $ts, $da ) ) {
+ # TS_EXIF
+ } elseif ( preg_match( '/^(\d{4})(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/D', $ts, $da ) ) {
+ # TS_MW
+ } elseif ( preg_match( '/^(-?\d{1,13})(\.\d+)?$/D', $ts, $m ) ) {
+ # TS_UNIX
+ $strtime = "@{$m[1]}"; // http://php.net/manual/en/datetime.formats.compound.php
+ } elseif ( preg_match( '/^\d{2}-\d{2}-\d{4} \d{2}:\d{2}:\d{2}.\d{6}$/', $ts ) ) {
+ # TS_ORACLE // session altered to DD-MM-YYYY HH24:MI:SS.FF6
+ $strtime = preg_replace( '/(\d\d)\.(\d\d)\.(\d\d)(\.(\d+))?/', "$1:$2:$3",
+ str_replace( '+00:00', 'UTC', $ts ) );
+ } elseif ( preg_match(
+ '/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(?:\.*\d*)?Z?$/',
+ $ts,
+ $da
+ ) ) {
+ # TS_ISO_8601
+ } elseif ( preg_match(
+ '/^(\d{4})(\d{2})(\d{2})T(\d{2})(\d{2})(\d{2})(?:\.*\d*)?Z?$/',
+ $ts,
+ $da
+ ) ) {
+ # TS_ISO_8601_BASIC
+ } elseif ( preg_match(
+ '/^(\d{4})\-(\d\d)\-(\d\d) (\d\d):(\d\d):(\d\d)\.*\d*[\+\- ](\d\d)$/',
+ $ts,
+ $da
+ ) ) {
+ # TS_POSTGRES
+ } elseif ( preg_match(
+ '/^(\d{4})\-(\d\d)\-(\d\d) (\d\d):(\d\d):(\d\d)\.*\d* GMT$/',
+ $ts,
+ $da
+ ) ) {
+ # TS_POSTGRES
+ } elseif ( preg_match(
+ # Day of week
+ '/^[ \t\r\n]*([A-Z][a-z]{2},[ \t\r\n]*)?' .
+ # dd Mon yyyy
+ '\d\d?[ \t\r\n]*[A-Z][a-z]{2}[ \t\r\n]*\d{2}(?:\d{2})?' .
+ # hh:mm:ss
+ '[ \t\r\n]*\d\d[ \t\r\n]*:[ \t\r\n]*\d\d[ \t\r\n]*:[ \t\r\n]*\d\d/S',
+ $ts
+ ) ) {
+ # TS_RFC2822, accepting a trailing comment.
+ # See http://www.squid-cache.org/mail-archive/squid-users/200307/0122.html / r77171
+ # The regex is a superset of rfc2822 for readability
+ $strtime = strtok( $ts, ';' );
+ } elseif ( preg_match( '/^[A-Z][a-z]{5,8}, \d\d-[A-Z][a-z]{2}-\d{2} \d\d:\d\d:\d\d/', $ts ) ) {
+ # TS_RFC850
+ $strtime = $ts;
+ } elseif ( preg_match( '/^[A-Z][a-z]{2} [A-Z][a-z]{2} +\d{1,2} \d\d:\d\d:\d\d \d{4}/', $ts ) ) {
+ # asctime
+ $strtime = $ts;
+ } else {
+ throw new TimestampException( __METHOD__ . ": Invalid timestamp - $ts" );
+ }
+
+ if ( !$strtime ) {
+ $da = array_map( 'intval', $da );
+ $da[0] = "%04d-%02d-%02dT%02d:%02d:%02d.00+00:00";
+ $strtime = call_user_func_array( "sprintf", $da );
+ }
+
+ try {
+ $final = new DateTime( $strtime, new DateTimeZone( 'GMT' ) );
+ } catch ( Exception $e ) {
+ throw new TimestampException( __METHOD__ . ': Invalid timestamp format.', $e->getCode(), $e );
+ }
+
+ if ( $final === false ) {
+ throw new TimestampException( __METHOD__ . ': Invalid timestamp format.' );
+ }
+
+ $this->timestamp = $final;
+ }
+
+ /**
+ * Convert a timestamp string to a given format.
+ *
+ * @param int $style Constant Output format for timestamp
+ * @param string $ts Timestamp
+ * @return string|bool Formatted timestamp or false on failure
+ */
+ public static function convert( $style = TS_UNIX, $ts ) {
+ try {
+ $ct = new static( $ts );
+ return $ct->getTimestamp( $style );
+ } catch ( TimestampException $e ) {
+ return false;
+ }
+ }
+
+ /**
+ * Get the current time in the given format
+ *
+ * @param int $style Constant Output format for timestamp
+ * @return string
+ */
+ public static function now( $style = TS_MW ) {
+ return static::convert( $style, time() );
+ }
+
+ /**
+ * Get the timestamp represented by this object in a certain form.
+ *
+ * Convert the internal timestamp to the specified format and then
+ * return it.
+ *
+ * @param int $style Constant Output format for timestamp
+ * @throws TimestampException
+ * @return string The formatted timestamp
+ */
+ public function getTimestamp( $style = TS_UNIX ) {
+ if ( !isset( self::$formats[$style] ) ) {
+ throw new TimestampException( __METHOD__ . ': Illegal timestamp output type.' );
+ }
+
+ $output = $this->timestamp->format( self::$formats[$style] );
+
+ if ( ( $style == TS_RFC2822 ) || ( $style == TS_POSTGRES ) ) {
+ $output .= ' GMT';
+ }
+
+ if ( $style == TS_MW && strlen( $output ) !== 14 ) {
+ throw new TimestampException( __METHOD__ . ': The timestamp cannot be represented in ' .
+ 'the specified format' );
+ }
+
+ return $output;
+ }
+
+ /**
+ * @return string
+ */
+ public function __toString() {
+ return $this->getTimestamp();
+ }
+
+ /**
+ * Calculate the difference between two ConvertableTimestamp objects.
+ *
+ * @param ConvertibleTimestamp $relativeTo Base time to calculate difference from
+ * @return DateInterval|bool The DateInterval object representing the
+ * difference between the two dates or false on failure
+ */
+ public function diff( ConvertibleTimestamp $relativeTo ) {
+ return $this->timestamp->diff( $relativeTo->timestamp );
+ }
+
+ /**
+ * Set the timezone of this timestamp to the specified timezone.
+ *
+ * @param string $timezone Timezone to set
+ * @throws TimestampException
+ */
+ public function setTimezone( $timezone ) {
+ try {
+ $this->timestamp->setTimezone( new DateTimeZone( $timezone ) );
+ } catch ( Exception $e ) {
+ throw new TimestampException( __METHOD__ . ': Invalid timezone.', $e->getCode(), $e );
+ }
+ }
+
+ /**
+ * Get the timezone of this timestamp.
+ *
+ * @return DateTimeZone The timezone
+ */
+ public function getTimezone() {
+ return $this->timestamp->getTimezone();
+ }
+
+ /**
+ * Format the timestamp in a given format.
+ *
+ * @param string $format Pattern to format in
+ * @return string The formatted timestamp
+ */
+ public function format( $format ) {
+ return $this->timestamp->format( $format );
+ }
+}
// We know that if we got to this step, year, month day hour and min must be set
// by virtue of regex not failing.
- $unix = ( new ConvertableTimestamp(
+ $unix = ConvertibleTimestamp::convert( TS_UNIX,
$res[1] . $res[2] . $res[3] . $res[4] . $res[5] . $res[6]
- ) )->getTimestamp( TS_UNIX );
+ );
$offset = intval( substr( $res[7], 1, 2 ) ) * 60 * 60;
$offset += intval( substr( $res[7], 4, 2 ) ) * 60;
if ( substr( $res[7], 0, 1 ) === '-' ) {
$offset = -$offset;
}
- $val = ( new ConvertableTimestamp( $unix + $offset ) )->getTimestamp( TS_EXIF );
+ $val = ConvertibleTimestamp::convert( TS_EXIF, $unix + $offset );
if ( $stripSeconds ) {
// If seconds weren't specified, remove the trailing ':00'.
/**
* Get width and height from the bmp header.
*
- * @param File $image
+ * @param File|FSFile $image
* @param string $filename
* @return array
*/
/**
* Cache an instance of DjVuImage in an Image object, return that instance
*
- * @param File $image
+ * @param File|FSFile $image
* @param string $path
* @return DjVuImage
*/
}
}
- /**
- * @param File $image
- * @param string $path
- * @return bool|array False on failure
- */
function getImageSize( $image, $path ) {
return $this->getDjVuImage( $image, $path )->getImageSize();
}
* Wrapper for base classes ImageHandler::getImageSize() that checks for
* rotation reported from metadata and swaps the sizes to match.
*
- * @param File $image
+ * @param File|FSFile $image
* @param string $path
* @return array
*/
* @note If this is a multipage file, return the width and height of the
* first page.
*
- * @param File $image The image object, or false if there isn't one
+ * @param File|FSFile $image The image object, or false if there isn't one.
+ * Warning, FSFile::getPropsFromPath might pass an FSFile instead of File (!)
* @param string $path The filename
- * @return array Follow the format of PHP getimagesize() internal function.
+ * @return array|bool Follow the format of PHP getimagesize() internal function.
* See http://www.php.net/getimagesize. MediaWiki will only ever use the
* first two array keys (the width and height), and the 'bits' associative
* key. All other array keys are ignored. Returning a 'bits' key is optional
- * as not all formats have a notion of "bitdepth".
+ * as not all formats have a notion of "bitdepth". Returns false on failure.
*/
abstract function getImageSize( $image, $path );
/**
* Get handler-specific metadata which will be saved in the img_metadata field.
*
- * @param File $image The image object, or false if there isn't one.
- * Warning, FSFile::getPropsFromPath might pass an (object)array() instead (!)
+ * @param File|FSFile $image The image object, or false if there isn't one.
+ * Warning, FSFile::getPropsFromPath might pass an FSFile instead of File (!)
* @param string $path The filename
* @return string A string of metadata in php serialized form (Run through serialize())
*/
const BROKEN_FILE = '0';
/**
- * @param File $image
+ * @param File|FSFile $image
* @param string $filename
* @return string
*/
}
/**
- * @param File $file
+ * @param File|FSFile $file
* @param string $path Unused
* @param bool|array $metadata
* @return array
*/
function getImageSize( $file, $path, $metadata = false ) {
- if ( $metadata === false ) {
+ if ( $metadata === false && $file instanceof File ) {
$metadata = $file->getMetadata();
}
$metadata = $this->unpackMetadata( $metadata );
}
/**
- * @param File $file
+ * @param File|FSFile $file
* @param string $filename
* @return string Serialised metadata
*/
}
/**
- * @param File $image
+ * @param File|FSFile $image
* @param string $filename
* @throws MWException
* @return string
*/
function getMetadata( $image, $filename ) {
global $wgShowEXIF;
+
if ( $wgShowEXIF ) {
try {
$meta = BitmapMetadataHandler::Tiff( $filename );
if ( $file === null ) {
$metadata = self::getMetadata( $file, $path );
}
- if ( $metadata === false ) {
+ if ( $metadata === false && $file instanceof File ) {
$metadata = $file->getMetadata();
}
/**
* Get width and height from the XCF header.
*
- * @param File $image
+ * @param File|FSFile $image
* @param string $filename
* @return array
*/
*
* Greyscale files need different command line options.
*
- * @param File $file The image object, or false if there isn't one.
+ * @param File|FSFile $file The image object, or false if there isn't one.
* Warning, FSFile::getPropsFromPath might pass an (object)array() instead (!)
* @param string $filename The filename
* @return string
/**
* Call to WikiPage function for backwards compatibility.
* @see WikiPage::doEdit
+ *
+ * @deprecated since 1.21: use doEditContent() instead.
*/
public function doEdit( $text, $summary, $flags = 0, $baseRevId = false, $user = null ) {
ContentHandler::deprecated( __METHOD__, '1.21' );
if ( is_null( $t ) ) {
return '';
}
- return wfEscapeWikiText( $t->getText() );
+ return $parser->escapeWikitext( $t->getText() );
}
- public static function pagenamee( $parser, $title = null ) {
+ public static function pagenamee( Parser $parser, $title = null ) {
$t = Title::newFromText( $title );
if ( is_null( $t ) ) {
return '';
}
- return wfEscapeWikiText( $t->getPartialURL() );
+ return $parser->escapeWikitext( $t->getPartialURL() );
}
- public static function fullpagename( $parser, $title = null ) {
+ public static function fullpagename( Parser $parser, $title = null ) {
$t = Title::newFromText( $title );
if ( is_null( $t ) || !$t->canTalk() ) {
return '';
}
- return wfEscapeWikiText( $t->getPrefixedText() );
+ return $parser->escapeWikitext( $t->getPrefixedText() );
}
- public static function fullpagenamee( $parser, $title = null ) {
+ public static function fullpagenamee( Parser $parser, $title = null ) {
$t = Title::newFromText( $title );
if ( is_null( $t ) || !$t->canTalk() ) {
return '';
}
- return wfEscapeWikiText( $t->getPrefixedURL() );
+ return $parser->escapeWikitext( $t->getPrefixedURL() );
}
- public static function subpagename( $parser, $title = null ) {
+ public static function subpagename( Parser $parser, $title = null ) {
$t = Title::newFromText( $title );
if ( is_null( $t ) ) {
return '';
}
- return wfEscapeWikiText( $t->getSubpageText() );
+ return $parser->escapeWikitext( $t->getSubpageText() );
}
- public static function subpagenamee( $parser, $title = null ) {
+ public static function subpagenamee( Parser $parser, $title = null ) {
$t = Title::newFromText( $title );
if ( is_null( $t ) ) {
return '';
}
- return wfEscapeWikiText( $t->getSubpageUrlForm() );
+ return $parser->escapeWikitext( $t->getSubpageUrlForm() );
}
- public static function rootpagename( $parser, $title = null ) {
+ public static function rootpagename( Parser $parser, $title = null ) {
$t = Title::newFromText( $title );
if ( is_null( $t ) ) {
return '';
}
- return wfEscapeWikiText( $t->getRootText() );
+ return $parser->escapeWikitext( $t->getRootText() );
}
- public static function rootpagenamee( $parser, $title = null ) {
+ public static function rootpagenamee( Parser $parser, $title = null ) {
$t = Title::newFromText( $title );
if ( is_null( $t ) ) {
return '';
}
- return wfEscapeWikiText( wfUrlencode( str_replace( ' ', '_', $t->getRootText() ) ) );
+ return $parser->escapeWikitext( wfUrlencode( str_replace( ' ', '_', $t->getRootText() ) ) );
}
- public static function basepagename( $parser, $title = null ) {
+ public static function basepagename( Parser $parser, $title = null ) {
$t = Title::newFromText( $title );
if ( is_null( $t ) ) {
return '';
}
- return wfEscapeWikiText( $t->getBaseText() );
+ return $parser->escapeWikitext( $t->getBaseText() );
}
- public static function basepagenamee( $parser, $title = null ) {
+ public static function basepagenamee( Parser $parser, $title = null ) {
$t = Title::newFromText( $title );
if ( is_null( $t ) ) {
return '';
}
- return wfEscapeWikiText( wfUrlencode( str_replace( ' ', '_', $t->getBaseText() ) ) );
+ return $parser->escapeWikitext( wfUrlencode( str_replace( ' ', '_', $t->getBaseText() ) ) );
}
- public static function talkpagename( $parser, $title = null ) {
+ public static function talkpagename( Parser $parser, $title = null ) {
$t = Title::newFromText( $title );
if ( is_null( $t ) || !$t->canTalk() ) {
return '';
}
- return wfEscapeWikiText( $t->getTalkPage()->getPrefixedText() );
+ return $parser->escapeWikitext( $t->getTalkPage()->getPrefixedText() );
}
- public static function talkpagenamee( $parser, $title = null ) {
+ public static function talkpagenamee( Parser $parser, $title = null ) {
$t = Title::newFromText( $title );
if ( is_null( $t ) || !$t->canTalk() ) {
return '';
}
- return wfEscapeWikiText( $t->getTalkPage()->getPrefixedURL() );
+ return $parser->escapeWikitext( $t->getTalkPage()->getPrefixedURL() );
}
- public static function subjectpagename( $parser, $title = null ) {
+ public static function subjectpagename( Parser $parser, $title = null ) {
$t = Title::newFromText( $title );
if ( is_null( $t ) ) {
return '';
}
- return wfEscapeWikiText( $t->getSubjectPage()->getPrefixedText() );
+ return $parser->escapeWikitext( $t->getSubjectPage()->getPrefixedText() );
}
- public static function subjectpagenamee( $parser, $title = null ) {
+ public static function subjectpagenamee( Parser $parser, $title = null ) {
$t = Title::newFromText( $title );
if ( is_null( $t ) ) {
return '';
}
- return wfEscapeWikiText( $t->getSubjectPage()->getPrefixedURL() );
+ return $parser->escapeWikitext( $t->getSubjectPage()->getPrefixedURL() );
}
/**
OutputPage::setupOOUI();
$this->mOutput->setEnableOOUI( true );
}
+
+ /**
+ * Escapes the given text so that it may be output using addWikiText()
+ * without any linking, formatting, etc. making its way through. This
+ * is achieved by substituting certain characters with HTML entities.
+ * As required by the callers, "<nowiki>" is not used.
+ *
+ * @since 1.28
+ *
+ * @param string $text Text to be escaped
+ * @return string
+ */
+ public function escapeWikitext( $text ) {
+ static $repl = null, $repl2 = null;
+ if ( $repl === null ) {
+ $repl = [
+ '"' => '"', '&' => '&', "'" => ''', '<' => '<',
+ '=' => '=', '>' => '>', '[' => '[', ']' => ']',
+ '{' => '{', '|' => '|', '}' => '}', ';' => ';',
+ "\n#" => "\n#", "\r#" => "\r#",
+ "\n*" => "\n*", "\r*" => "\r*",
+ "\n:" => "\n:", "\r:" => "\r:",
+ "\n " => "\n ", "\r " => "\r ",
+ "\n\n" => "\n ", "\r\n" => " \n",
+ "\n\r" => "\n ", "\r\r" => "\r ",
+ "\n\t" => "\n	", "\r\t" => "\r	", // "\n\t\n" is treated like "\n\n"
+ "\n----" => "\n----", "\r----" => "\r----",
+ '__' => '__', '://' => '://',
+ ];
+
+ $magicLinks = array_keys( array_filter( [
+ 'ISBN' => $this->mOptions->getMagicISBNLinks(),
+ 'PMID' => $this->mOptions->getMagicPMIDLinks(),
+ 'RFC' => $this->mOptions->getMagicRFCLinks(),
+ ] ) );
+ // We have to catch everything "\s" matches in PCRE
+ foreach ( $magicLinks as $magic ) {
+ $repl["$magic "] = "$magic ";
+ $repl["$magic\t"] = "$magic	";
+ $repl["$magic\r"] = "$magic ";
+ $repl["$magic\n"] = "$magic ";
+ $repl["$magic\f"] = "$magic";
+ }
+
+ // And handle protocols that don't use "://"
+ global $wgUrlProtocols;
+ $repl2 = [];
+ foreach ( $wgUrlProtocols as $prot ) {
+ if ( substr( $prot, -1 ) === ':' ) {
+ $repl2[] = preg_quote( substr( $prot, 0, -1 ), '/' );
+ }
+ }
+ $repl2 = $repl2 ? '/\b(' . implode( '|', $repl2 ) . '):/i' : '/^(?!)/';
+ }
+ $text = substr( strtr( "\n$text", $repl ), 1 );
+ $text = preg_replace( $repl2, '$1:', $text );
+ return $text;
+ }
}
usort( $wgExtensionCredits[$type], [ $this, 'compare' ] );
foreach ( $wgExtensionCredits[$type] as $extension ) {
- $out .= $this->getCreditsForExtension( $extension );
+ $out .= $this->getCreditsForExtension( $type, $extension );
}
}
* - Description of extension (descriptionmsg or description)
* - List of authors (author) and link to a ((AUTHORS)|(CREDITS))(\.txt)? file if it exists
*
+ * @param string $type Category name of the extension
* @param array $extension
*
* @return string Raw HTML
*/
- public function getCreditsForExtension( array $extension ) {
+ public function getCreditsForExtension( $type, array $extension ) {
$out = $this->getOutput();
// We must obtain the information for all the bits and pieces!
// Finally! Create the table
$html = Html::openElement( 'tr', [
'class' => 'mw-version-ext',
- 'id' => Sanitizer::escapeId( 'mw-version-ext-' . $extension['name'] )
+ 'id' => Sanitizer::escapeId( 'mw-version-ext-' . $type . '-' . $extension['name'] )
]
);
return $status;
}
- $this->mFileProps = FSFile::getPropsFromPath( $this->mTempPath, $this->mFinalExtension );
+ $mwProps = new MWFileProps( MimeMagic::singleton() );
+ $this->mFileProps = $mwProps->getPropsFromPath( $this->mTempPath, $this->mFinalExtension );
$mime = $this->mFileProps['mime'];
if ( $wgVerifyMimeType ) {
# getTitle() sets some internal parameters like $this->mFinalExtension
$this->getTitle();
- $this->mFileProps = FSFile::getPropsFromPath( $this->mTempPath, $this->mFinalExtension );
+ $mwProps = new MWFileProps( MimeMagic::singleton() );
+ $this->mFileProps = $mwProps->getPropsFromPath( $this->mTempPath, $this->mFinalExtension );
# check MIME type, if desired
$mime = $this->mFileProps['file-mime'];
wfDebug( __METHOD__ . " tried to stash file at '$path', but it doesn't exist\n" );
throw new UploadStashBadPathException( "path doesn't exist" );
}
- $fileProps = FSFile::getPropsFromPath( $path );
+
+ $mwProps = new MWFileProps( MimeMagic::singleton() );
+ $fileProps = $mwProps->getPropsFromPath( $path, true );
wfDebug( __METHOD__ . " stashing file at '$path'\n" );
// we will be initializing from some tmpnam files that don't have extensions.
+++ /dev/null
-<?php
-/**
- * Functions and constants to play with IP addresses and ranges
- *
- * 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
- * @author Antoine Musso "<hashar at free dot fr>", Aaron Schulz
- */
-
-use IPSet\IPSet;
-
-// Some regex definition to "play" with IP address and IP address blocks
-
-// An IPv4 address is made of 4 bytes from x00 to xFF which is d0 to d255
-define( 'RE_IP_BYTE', '(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|0?[0-9]?[0-9])' );
-define( 'RE_IP_ADD', RE_IP_BYTE . '\.' . RE_IP_BYTE . '\.' . RE_IP_BYTE . '\.' . RE_IP_BYTE );
-// An IPv4 block is an IP address and a prefix (d1 to d32)
-define( 'RE_IP_PREFIX', '(3[0-2]|[12]?\d)' );
-define( 'RE_IP_BLOCK', RE_IP_ADD . '\/' . RE_IP_PREFIX );
-
-// An IPv6 address is made up of 8 words (each x0000 to xFFFF).
-// However, the "::" abbreviation can be used on consecutive x0000 words.
-define( 'RE_IPV6_WORD', '([0-9A-Fa-f]{1,4})' );
-define( 'RE_IPV6_PREFIX', '(12[0-8]|1[01][0-9]|[1-9]?\d)' );
-define( 'RE_IPV6_ADD',
- '(?:' . // starts with "::" (including "::")
- ':(?::|(?::' . RE_IPV6_WORD . '){1,7})' .
- '|' . // ends with "::" (except "::")
- RE_IPV6_WORD . '(?::' . RE_IPV6_WORD . '){0,6}::' .
- '|' . // contains one "::" in the middle (the ^ makes the test fail if none found)
- RE_IPV6_WORD . '(?::((?(-1)|:))?' . RE_IPV6_WORD . '){1,6}(?(-2)|^)' .
- '|' . // contains no "::"
- RE_IPV6_WORD . '(?::' . RE_IPV6_WORD . '){7}' .
- ')'
-);
-// An IPv6 block is an IP address and a prefix (d1 to d128)
-define( 'RE_IPV6_BLOCK', RE_IPV6_ADD . '\/' . RE_IPV6_PREFIX );
-// For IPv6 canonicalization (NOT for strict validation; these are quite lax!)
-define( 'RE_IPV6_GAP', ':(?:0+:)*(?::(?:0+:)*)?' );
-define( 'RE_IPV6_V4_PREFIX', '0*' . RE_IPV6_GAP . '(?:ffff:)?' );
-
-// This might be useful for regexps used elsewhere, matches any IPv4 or IPv6 address or network
-define( 'IP_ADDRESS_STRING',
- '(?:' .
- RE_IP_ADD . '(?:\/' . RE_IP_PREFIX . ')?' . // IPv4
- '|' .
- RE_IPV6_ADD . '(?:\/' . RE_IPV6_PREFIX . ')?' . // IPv6
- ')'
-);
-
-/**
- * A collection of public static functions to play with IP address
- * and IP blocks.
- */
-class IP {
- /** @var IPSet */
- private static $proxyIpSet = null;
-
- /**
- * Determine if a string is as valid IP address or network (CIDR prefix).
- * SIIT IPv4-translated addresses are rejected.
- * @note canonicalize() tries to convert translated addresses to IPv4.
- *
- * @param string $ip Possible IP address
- * @return bool
- */
- public static function isIPAddress( $ip ) {
- return (bool)preg_match( '/^' . IP_ADDRESS_STRING . '$/', $ip );
- }
-
- /**
- * Given a string, determine if it as valid IP in IPv6 only.
- * @note Unlike isValid(), this looks for networks too.
- *
- * @param string $ip Possible IP address
- * @return bool
- */
- public static function isIPv6( $ip ) {
- return (bool)preg_match( '/^' . RE_IPV6_ADD . '(?:\/' . RE_IPV6_PREFIX . ')?$/', $ip );
- }
-
- /**
- * Given a string, determine if it as valid IP in IPv4 only.
- * @note Unlike isValid(), this looks for networks too.
- *
- * @param string $ip Possible IP address
- * @return bool
- */
- public static function isIPv4( $ip ) {
- return (bool)preg_match( '/^' . RE_IP_ADD . '(?:\/' . RE_IP_PREFIX . ')?$/', $ip );
- }
-
- /**
- * Validate an IP address. Ranges are NOT considered valid.
- * SIIT IPv4-translated addresses are rejected.
- * @note canonicalize() tries to convert translated addresses to IPv4.
- *
- * @param string $ip
- * @return bool True if it is valid
- */
- public static function isValid( $ip ) {
- return ( preg_match( '/^' . RE_IP_ADD . '$/', $ip )
- || preg_match( '/^' . RE_IPV6_ADD . '$/', $ip ) );
- }
-
- /**
- * Validate an IP Block (valid address WITH a valid prefix).
- * SIIT IPv4-translated addresses are rejected.
- * @note canonicalize() tries to convert translated addresses to IPv4.
- *
- * @param string $ipblock
- * @return bool True if it is valid
- */
- public static function isValidBlock( $ipblock ) {
- return ( preg_match( '/^' . RE_IPV6_BLOCK . '$/', $ipblock )
- || preg_match( '/^' . RE_IP_BLOCK . '$/', $ipblock ) );
- }
-
- /**
- * Convert an IP into a verbose, uppercase, normalized form.
- * Both IPv4 and IPv6 addresses are trimmed. Additionally,
- * IPv6 addresses in octet notation are expanded to 8 words;
- * IPv4 addresses have leading zeros, in each octet, removed.
- *
- * @param string $ip IP address in quad or octet form (CIDR or not).
- * @return string
- */
- public static function sanitizeIP( $ip ) {
- $ip = trim( $ip );
- if ( $ip === '' ) {
- return null;
- }
- /* If not an IP, just return trimmed value, since sanitizeIP() is called
- * in a number of contexts where usernames are supplied as input.
- */
- if ( !self::isIPAddress( $ip ) ) {
- return $ip;
- }
- if ( self::isIPv4( $ip ) ) {
- // Remove leading 0's from octet representation of IPv4 address
- $ip = preg_replace( '/(?:^|(?<=\.))0+(?=[1-9]|0\.|0$)/', '', $ip );
- return $ip;
- }
- // Remove any whitespaces, convert to upper case
- $ip = strtoupper( $ip );
- // Expand zero abbreviations
- $abbrevPos = strpos( $ip, '::' );
- if ( $abbrevPos !== false ) {
- // We know this is valid IPv6. Find the last index of the
- // address before any CIDR number (e.g. "a:b:c::/24").
- $CIDRStart = strpos( $ip, "/" );
- $addressEnd = ( $CIDRStart !== false )
- ? $CIDRStart - 1
- : strlen( $ip ) - 1;
- // If the '::' is at the beginning...
- if ( $abbrevPos == 0 ) {
- $repeat = '0:';
- $extra = ( $ip == '::' ) ? '0' : ''; // for the address '::'
- $pad = 9; // 7+2 (due to '::')
- // If the '::' is at the end...
- } elseif ( $abbrevPos == ( $addressEnd - 1 ) ) {
- $repeat = ':0';
- $extra = '';
- $pad = 9; // 7+2 (due to '::')
- // If the '::' is in the middle...
- } else {
- $repeat = ':0';
- $extra = ':';
- $pad = 8; // 6+2 (due to '::')
- }
- $ip = str_replace( '::',
- str_repeat( $repeat, $pad - substr_count( $ip, ':' ) ) . $extra,
- $ip
- );
- }
- // Remove leading zeros from each bloc as needed
- $ip = preg_replace( '/(^|:)0+(' . RE_IPV6_WORD . ')/', '$1$2', $ip );
-
- return $ip;
- }
-
- /**
- * Prettify an IP for display to end users.
- * This will make it more compact and lower-case.
- *
- * @param string $ip
- * @return string
- */
- public static function prettifyIP( $ip ) {
- $ip = self::sanitizeIP( $ip ); // normalize (removes '::')
- if ( self::isIPv6( $ip ) ) {
- // Split IP into an address and a CIDR
- if ( strpos( $ip, '/' ) !== false ) {
- list( $ip, $cidr ) = explode( '/', $ip, 2 );
- } else {
- list( $ip, $cidr ) = [ $ip, '' ];
- }
- // Get the largest slice of words with multiple zeros
- $offset = 0;
- $longest = $longestPos = false;
- while ( preg_match(
- '!(?:^|:)0(?::0)+(?:$|:)!', $ip, $m, PREG_OFFSET_CAPTURE, $offset
- ) ) {
- list( $match, $pos ) = $m[0]; // full match
- if ( strlen( $match ) > strlen( $longest ) ) {
- $longest = $match;
- $longestPos = $pos;
- }
- $offset = ( $pos + strlen( $match ) ); // advance
- }
- if ( $longest !== false ) {
- // Replace this portion of the string with the '::' abbreviation
- $ip = substr_replace( $ip, '::', $longestPos, strlen( $longest ) );
- }
- // Add any CIDR back on
- if ( $cidr !== '' ) {
- $ip = "{$ip}/{$cidr}";
- }
- // Convert to lower case to make it more readable
- $ip = strtolower( $ip );
- }
-
- return $ip;
- }
-
- /**
- * Given a host/port string, like one might find in the host part of a URL
- * per RFC 2732, split the hostname part and the port part and return an
- * array with an element for each. If there is no port part, the array will
- * have false in place of the port. If the string was invalid in some way,
- * false is returned.
- *
- * This was easy with IPv4 and was generally done in an ad-hoc way, but
- * with IPv6 it's somewhat more complicated due to the need to parse the
- * square brackets and colons.
- *
- * A bare IPv6 address is accepted despite the lack of square brackets.
- *
- * @param string $both The string with the host and port
- * @return array|false Array normally, false on certain failures
- */
- public static function splitHostAndPort( $both ) {
- if ( substr( $both, 0, 1 ) === '[' ) {
- if ( preg_match( '/^\[(' . RE_IPV6_ADD . ')\](?::(?P<port>\d+))?$/', $both, $m ) ) {
- if ( isset( $m['port'] ) ) {
- return [ $m[1], intval( $m['port'] ) ];
- } else {
- return [ $m[1], false ];
- }
- } else {
- // Square bracket found but no IPv6
- return false;
- }
- }
- $numColons = substr_count( $both, ':' );
- if ( $numColons >= 2 ) {
- // Is it a bare IPv6 address?
- if ( preg_match( '/^' . RE_IPV6_ADD . '$/', $both ) ) {
- return [ $both, false ];
- } else {
- // Not valid IPv6, but too many colons for anything else
- return false;
- }
- }
- if ( $numColons >= 1 ) {
- // Host:port?
- $bits = explode( ':', $both );
- if ( preg_match( '/^\d+/', $bits[1] ) ) {
- return [ $bits[0], intval( $bits[1] ) ];
- } else {
- // Not a valid port
- return false;
- }
- }
-
- // Plain hostname
- return [ $both, false ];
- }
-
- /**
- * Given a host name and a port, combine them into host/port string like
- * you might find in a URL. If the host contains a colon, wrap it in square
- * brackets like in RFC 2732. If the port matches the default port, omit
- * the port specification
- *
- * @param string $host
- * @param int $port
- * @param bool|int $defaultPort
- * @return string
- */
- public static function combineHostAndPort( $host, $port, $defaultPort = false ) {
- if ( strpos( $host, ':' ) !== false ) {
- $host = "[$host]";
- }
- if ( $defaultPort !== false && $port == $defaultPort ) {
- return $host;
- } else {
- return "$host:$port";
- }
- }
-
- /**
- * Convert an IPv4 or IPv6 hexadecimal representation back to readable format
- *
- * @param string $hex Number, with "v6-" prefix if it is IPv6
- * @return string Quad-dotted (IPv4) or octet notation (IPv6)
- */
- public static function formatHex( $hex ) {
- if ( substr( $hex, 0, 3 ) == 'v6-' ) { // IPv6
- return self::hexToOctet( substr( $hex, 3 ) );
- } else { // IPv4
- return self::hexToQuad( $hex );
- }
- }
-
- /**
- * Converts a hexadecimal number to an IPv6 address in octet notation
- *
- * @param string $ip_hex Pure hex (no v6- prefix)
- * @return string (of format a:b:c:d:e:f:g:h)
- */
- public static function hexToOctet( $ip_hex ) {
- // Pad hex to 32 chars (128 bits)
- $ip_hex = str_pad( strtoupper( $ip_hex ), 32, '0', STR_PAD_LEFT );
- // Separate into 8 words
- $ip_oct = substr( $ip_hex, 0, 4 );
- for ( $n = 1; $n < 8; $n++ ) {
- $ip_oct .= ':' . substr( $ip_hex, 4 * $n, 4 );
- }
- // NO leading zeroes
- $ip_oct = preg_replace( '/(^|:)0+(' . RE_IPV6_WORD . ')/', '$1$2', $ip_oct );
-
- return $ip_oct;
- }
-
- /**
- * Converts a hexadecimal number to an IPv4 address in quad-dotted notation
- *
- * @param string $ip_hex Pure hex
- * @return string (of format a.b.c.d)
- */
- public static function hexToQuad( $ip_hex ) {
- // Pad hex to 8 chars (32 bits)
- $ip_hex = str_pad( strtoupper( $ip_hex ), 8, '0', STR_PAD_LEFT );
- // Separate into four quads
- $s = '';
- for ( $i = 0; $i < 4; $i++ ) {
- if ( $s !== '' ) {
- $s .= '.';
- }
- $s .= base_convert( substr( $ip_hex, $i * 2, 2 ), 16, 10 );
- }
-
- return $s;
- }
-
- /**
- * Determine if an IP address really is an IP address, and if it is public,
- * i.e. not RFC 1918 or similar
- *
- * @param string $ip
- * @return bool
- */
- public static function isPublic( $ip ) {
- static $privateSet = null;
- if ( !$privateSet ) {
- $privateSet = new IPSet( [
- '10.0.0.0/8', # RFC 1918 (private)
- '172.16.0.0/12', # RFC 1918 (private)
- '192.168.0.0/16', # RFC 1918 (private)
- '0.0.0.0/8', # this network
- '127.0.0.0/8', # loopback
- 'fc00::/7', # RFC 4193 (local)
- '0:0:0:0:0:0:0:1', # loopback
- '169.254.0.0/16', # link-local
- 'fe80::/10', # link-local
- ] );
- }
- return !$privateSet->match( $ip );
- }
-
- /**
- * Return a zero-padded upper case hexadecimal representation of an IP address.
- *
- * Hexadecimal addresses are used because they can easily be extended to
- * IPv6 support. To separate the ranges, the return value from this
- * function for an IPv6 address will be prefixed with "v6-", a non-
- * hexadecimal string which sorts after the IPv4 addresses.
- *
- * @param string $ip Quad dotted/octet IP address.
- * @return string|bool False on failure
- */
- public static function toHex( $ip ) {
- if ( self::isIPv6( $ip ) ) {
- $n = 'v6-' . self::IPv6ToRawHex( $ip );
- } elseif ( self::isIPv4( $ip ) ) {
- // T62035/T97897: An IP with leading 0's fails in ip2long sometimes (e.g. *.08),
- // also double/triple 0 needs to be changed to just a single 0 for ip2long.
- $ip = self::sanitizeIP( $ip );
- $n = ip2long( $ip );
- if ( $n < 0 ) {
- $n += pow( 2, 32 );
- # On 32-bit platforms (and on Windows), 2^32 does not fit into an int,
- # so $n becomes a float. We convert it to string instead.
- if ( is_float( $n ) ) {
- $n = (string)$n;
- }
- }
- if ( $n !== false ) {
- # Floating points can handle the conversion; faster than Wikimedia\base_convert()
- $n = strtoupper( str_pad( base_convert( $n, 10, 16 ), 8, '0', STR_PAD_LEFT ) );
- }
- } else {
- $n = false;
- }
-
- return $n;
- }
-
- /**
- * Given an IPv6 address in octet notation, returns a pure hex string.
- *
- * @param string $ip Octet ipv6 IP address.
- * @return string|bool Pure hex (uppercase); false on failure
- */
- private static function IPv6ToRawHex( $ip ) {
- $ip = self::sanitizeIP( $ip );
- if ( !$ip ) {
- return false;
- }
- $r_ip = '';
- foreach ( explode( ':', $ip ) as $v ) {
- $r_ip .= str_pad( $v, 4, 0, STR_PAD_LEFT );
- }
-
- return $r_ip;
- }
-
- /**
- * Convert a network specification in CIDR notation
- * to an integer network and a number of bits
- *
- * @param string $range IP with CIDR prefix
- * @return array(int or string, int)
- */
- public static function parseCIDR( $range ) {
- if ( self::isIPv6( $range ) ) {
- return self::parseCIDR6( $range );
- }
- $parts = explode( '/', $range, 2 );
- if ( count( $parts ) != 2 ) {
- return [ false, false ];
- }
- list( $network, $bits ) = $parts;
- $network = ip2long( $network );
- if ( $network !== false && is_numeric( $bits ) && $bits >= 0 && $bits <= 32 ) {
- if ( $bits == 0 ) {
- $network = 0;
- } else {
- $network &= ~( ( 1 << ( 32 - $bits ) ) - 1 );
- }
- # Convert to unsigned
- if ( $network < 0 ) {
- $network += pow( 2, 32 );
- }
- } else {
- $network = false;
- $bits = false;
- }
-
- return [ $network, $bits ];
- }
-
- /**
- * Given a string range in a number of formats,
- * return the start and end of the range in hexadecimal.
- *
- * Formats are:
- * 1.2.3.4/24 CIDR
- * 1.2.3.4 - 1.2.3.5 Explicit range
- * 1.2.3.4 Single IP
- *
- * 2001:0db8:85a3::7344/96 CIDR
- * 2001:0db8:85a3::7344 - 2001:0db8:85a3::7344 Explicit range
- * 2001:0db8:85a3::7344 Single IP
- * @param string $range IP range
- * @return array(string, string)
- */
- public static function parseRange( $range ) {
- // CIDR notation
- if ( strpos( $range, '/' ) !== false ) {
- if ( self::isIPv6( $range ) ) {
- return self::parseRange6( $range );
- }
- list( $network, $bits ) = self::parseCIDR( $range );
- if ( $network === false ) {
- $start = $end = false;
- } else {
- $start = sprintf( '%08X', $network );
- $end = sprintf( '%08X', $network + pow( 2, ( 32 - $bits ) ) - 1 );
- }
- // Explicit range
- } elseif ( strpos( $range, '-' ) !== false ) {
- list( $start, $end ) = array_map( 'trim', explode( '-', $range, 2 ) );
- if ( self::isIPv6( $start ) && self::isIPv6( $end ) ) {
- return self::parseRange6( $range );
- }
- if ( self::isIPv4( $start ) && self::isIPv4( $end ) ) {
- $start = self::toHex( $start );
- $end = self::toHex( $end );
- if ( $start > $end ) {
- $start = $end = false;
- }
- } else {
- $start = $end = false;
- }
- } else {
- # Single IP
- $start = $end = self::toHex( $range );
- }
- if ( $start === false || $end === false ) {
- return [ false, false ];
- } else {
- return [ $start, $end ];
- }
- }
-
- /**
- * Convert a network specification in IPv6 CIDR notation to an
- * integer network and a number of bits
- *
- * @param string $range
- *
- * @return array(string, int)
- */
- private static function parseCIDR6( $range ) {
- # Explode into <expanded IP,range>
- $parts = explode( '/', IP::sanitizeIP( $range ), 2 );
- if ( count( $parts ) != 2 ) {
- return [ false, false ];
- }
- list( $network, $bits ) = $parts;
- $network = self::IPv6ToRawHex( $network );
- if ( $network !== false && is_numeric( $bits ) && $bits >= 0 && $bits <= 128 ) {
- if ( $bits == 0 ) {
- $network = "0";
- } else {
- # Native 32 bit functions WONT work here!!!
- # Convert to a padded binary number
- $network = Wikimedia\base_convert( $network, 16, 2, 128 );
- # Truncate the last (128-$bits) bits and replace them with zeros
- $network = str_pad( substr( $network, 0, $bits ), 128, 0, STR_PAD_RIGHT );
- # Convert back to an integer
- $network = Wikimedia\base_convert( $network, 2, 10 );
- }
- } else {
- $network = false;
- $bits = false;
- }
-
- return [ $network, (int)$bits ];
- }
-
- /**
- * Given a string range in a number of formats, return the
- * start and end of the range in hexadecimal. For IPv6.
- *
- * Formats are:
- * 2001:0db8:85a3::7344/96 CIDR
- * 2001:0db8:85a3::7344 - 2001:0db8:85a3::7344 Explicit range
- * 2001:0db8:85a3::7344/96 Single IP
- *
- * @param string $range
- *
- * @return array(string, string)
- */
- private static function parseRange6( $range ) {
- # Expand any IPv6 IP
- $range = IP::sanitizeIP( $range );
- // CIDR notation...
- if ( strpos( $range, '/' ) !== false ) {
- list( $network, $bits ) = self::parseCIDR6( $range );
- if ( $network === false ) {
- $start = $end = false;
- } else {
- $start = Wikimedia\base_convert( $network, 10, 16, 32, false );
- # Turn network to binary (again)
- $end = Wikimedia\base_convert( $network, 10, 2, 128 );
- # Truncate the last (128-$bits) bits and replace them with ones
- $end = str_pad( substr( $end, 0, $bits ), 128, 1, STR_PAD_RIGHT );
- # Convert to hex
- $end = Wikimedia\base_convert( $end, 2, 16, 32, false );
- # see toHex() comment
- $start = "v6-$start";
- $end = "v6-$end";
- }
- // Explicit range notation...
- } elseif ( strpos( $range, '-' ) !== false ) {
- list( $start, $end ) = array_map( 'trim', explode( '-', $range, 2 ) );
- $start = self::toHex( $start );
- $end = self::toHex( $end );
- if ( $start > $end ) {
- $start = $end = false;
- }
- } else {
- # Single IP
- $start = $end = self::toHex( $range );
- }
- if ( $start === false || $end === false ) {
- return [ false, false ];
- } else {
- return [ $start, $end ];
- }
- }
-
- /**
- * Determine if a given IPv4/IPv6 address is in a given CIDR network
- *
- * @param string $addr The address to check against the given range.
- * @param string $range The range to check the given address against.
- * @return bool Whether or not the given address is in the given range.
- *
- * @note This can return unexpected results for invalid arguments!
- * Make sure you pass a valid IP address and IP range.
- */
- public static function isInRange( $addr, $range ) {
- $hexIP = self::toHex( $addr );
- list( $start, $end ) = self::parseRange( $range );
-
- return ( strcmp( $hexIP, $start ) >= 0 &&
- strcmp( $hexIP, $end ) <= 0 );
- }
-
- /**
- * Determines if an IP address is a list of CIDR a.b.c.d/n ranges.
- *
- * @since 1.25
- *
- * @param string $ip the IP to check
- * @param array $ranges the IP ranges, each element a range
- *
- * @return bool true if the specified adress belongs to the specified range; otherwise, false.
- */
- public static function isInRanges( $ip, $ranges ) {
- foreach ( $ranges as $range ) {
- if ( self::isInRange( $ip, $range ) ) {
- return true;
- }
- }
- return false;
- }
-
- /**
- * Convert some unusual representations of IPv4 addresses to their
- * canonical dotted quad representation.
- *
- * This currently only checks a few IPV4-to-IPv6 related cases. More
- * unusual representations may be added later.
- *
- * @param string $addr Something that might be an IP address
- * @return string|null Valid dotted quad IPv4 address or null
- */
- public static function canonicalize( $addr ) {
- // remove zone info (bug 35738)
- $addr = preg_replace( '/\%.*/', '', $addr );
-
- if ( self::isValid( $addr ) ) {
- return $addr;
- }
- // Turn mapped addresses from ::ce:ffff:1.2.3.4 to 1.2.3.4
- if ( strpos( $addr, ':' ) !== false && strpos( $addr, '.' ) !== false ) {
- $addr = substr( $addr, strrpos( $addr, ':' ) + 1 );
- if ( self::isIPv4( $addr ) ) {
- return $addr;
- }
- }
- // IPv6 loopback address
- $m = [];
- if ( preg_match( '/^0*' . RE_IPV6_GAP . '1$/', $addr, $m ) ) {
- return '127.0.0.1';
- }
- // IPv4-mapped and IPv4-compatible IPv6 addresses
- if ( preg_match( '/^' . RE_IPV6_V4_PREFIX . '(' . RE_IP_ADD . ')$/i', $addr, $m ) ) {
- return $m[1];
- }
- if ( preg_match( '/^' . RE_IPV6_V4_PREFIX . RE_IPV6_WORD .
- ':' . RE_IPV6_WORD . '$/i', $addr, $m )
- ) {
- return long2ip( ( hexdec( $m[1] ) << 16 ) + hexdec( $m[2] ) );
- }
-
- return null; // give up
- }
-
- /**
- * Gets rid of unneeded numbers in quad-dotted/octet IP strings
- * For example, 127.111.113.151/24 -> 127.111.113.0/24
- * @param string $range IP address to normalize
- * @return string
- */
- public static function sanitizeRange( $range ) {
- list( /*...*/, $bits ) = self::parseCIDR( $range );
- list( $start, /*...*/ ) = self::parseRange( $range );
- $start = self::formatHex( $start );
- if ( $bits === false ) {
- return $start; // wasn't actually a range
- }
-
- return "$start/$bits";
- }
-
- /**
- * Checks if an IP is a trusted proxy provider.
- * Useful to tell if X-Forwarded-For data is possibly bogus.
- * CDN cache servers for the site are whitelisted.
- * @since 1.24
- *
- * @param string $ip
- * @return bool
- */
- public static function isTrustedProxy( $ip ) {
- $trusted = self::isConfiguredProxy( $ip );
- Hooks::run( 'IsTrustedProxy', [ &$ip, &$trusted ] );
- return $trusted;
- }
-
- /**
- * Checks if an IP matches a proxy we've configured
- * @since 1.24
- *
- * @param string $ip
- * @return bool
- */
- public static function isConfiguredProxy( $ip ) {
- global $wgSquidServers, $wgSquidServersNoPurge;
-
- // Quick check of known singular proxy servers
- $trusted = in_array( $ip, $wgSquidServers );
-
- // Check against addresses and CIDR nets in the NoPurge list
- if ( !$trusted ) {
- if ( !self::$proxyIpSet ) {
- self::$proxyIpSet = new IPSet( $wgSquidServersNoPurge );
- }
- $trusted = self::$proxyIpSet->match( $ip );
- }
-
- return $trusted;
- }
-
- /**
- * Clears precomputed data used for proxy support.
- * Use this only for unit tests.
- */
- public static function clearCaches() {
- self::$proxyIpSet = null;
- }
-
- /**
- * Returns the subnet of a given IP
- *
- * @param string $ip
- * @return string|false
- */
- public static function getSubnet( $ip ) {
- $matches = [];
- $subnet = false;
- if ( IP::isIPv6( $ip ) ) {
- $parts = IP::parseRange( "$ip/64" );
- $subnet = $parts[0];
- } elseif ( preg_match( '/^(\d+\.\d+\.\d+)\.\d+$/', $ip, $matches ) ) {
- // IPv4
- $subnet = $matches[1];
- }
- return $subnet;
- }
-}
--- /dev/null
+<?php
+/**
+ * MimeMagic helper functions for detecting and dealing with MIME types.
+ *
+ * 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
+ */
+
+/**
+ * MimeMagic helper wrapper
+ *
+ * @since 1.28
+ */
+class MWFileProps {
+ /** @var MimeMagic */
+ private $magic;
+
+ /**
+ * @param MimeMagic $magic
+ */
+ public function __construct( MimeMagic $magic ) {
+ $this->magic = $magic;
+ }
+
+ /**
+ * Get an associative array containing information about
+ * a file with the given storage path.
+ *
+ * Resulting array fields include:
+ * - fileExists
+ * - size (filesize in bytes)
+ * - mime (as major/minor)
+ * - media_type (value to be used with the MEDIATYPE_xxx constants)
+ * - metadata (handler specific)
+ * - sha1 (in base 36)
+ * - width
+ * - height
+ * - bits (bitrate)
+ * - file-mime
+ * - major_mime
+ * - minor_mime
+ *
+ * @param string $path Filesystem path to a file
+ * @param string|bool $ext The file extension, or true to extract it from the filename.
+ * Set it to false to ignore the extension.
+ * @return array
+ * @since 1.28
+ */
+ public function getPropsFromPath( $path, $ext ) {
+ $fsFile = new FSFile( $path );
+
+ $info = $this->newPlaceholderProps();
+ $info['fileExists'] = $fsFile->exists();
+ if ( $info['fileExists'] ) {
+ $info['size'] = $fsFile->getSize(); // bytes
+ $info['sha1'] = $fsFile->getSha1Base36();
+
+ # MIME type according to file contents
+ $info['file-mime'] = $this->magic->guessMimeType( $path, false );
+ # Logical MIME type
+ $ext = ( $ext === true ) ? FileBackend::extensionFromPath( $path ) : $ext;
+ $info['mime'] = $this->magic->improveTypeFromExtension( $info['file-mime'], $ext );
+
+ list( $info['major_mime'], $info['minor_mime'] ) = File::splitMime( $info['mime'] );
+ $info['media_type'] = $this->magic->getMediaType( $path, $info['mime'] );
+
+ # Height, width and metadata
+ $handler = MediaHandler::getHandler( $info['mime'] );
+ if ( $handler ) {
+ $info['metadata'] = $handler->getMetadata( $fsFile, $path );
+ /** @noinspection PhpMethodParametersCountMismatchInspection */
+ $gis = $handler->getImageSize( $fsFile, $path, $info['metadata'] );
+ if ( is_array( $gis ) ) {
+ $info = $this->extractImageSizeInfo( $gis ) + $info;
+ }
+ }
+ }
+
+ return $info;
+ }
+
+ /**
+ * Exract image size information
+ *
+ * @param array $gis
+ * @return array
+ */
+ private function extractImageSizeInfo( array $gis ) {
+ $info = [];
+ # NOTE: $gis[2] contains a code for the image type. This is no longer used.
+ $info['width'] = $gis[0];
+ $info['height'] = $gis[1];
+ if ( isset( $gis['bits'] ) ) {
+ $info['bits'] = $gis['bits'];
+ } else {
+ $info['bits'] = 0;
+ }
+
+ return $info;
+ }
+
+ /**
+ * Empty place holder props for non-existing files
+ *
+ * Resulting array fields include:
+ * - fileExists
+ * - size (filesize in bytes)
+ * - mime (as major/minor)
+ * - media_type (value to be used with the MEDIATYPE_xxx constants)
+ * - metadata (handler specific)
+ * - sha1 (in base 36)
+ * - width
+ * - height
+ * - bits (bitrate)
+ * - file-mime
+ * - major_mime
+ * - minor_mime
+ *
+ * @return array
+ * @since 1.28
+ */
+ public function newPlaceholderProps() {
+ return FSFile::placeholderProps() + [
+ 'metadata' => '',
+ 'width' => 0,
+ 'height' => 0,
+ 'bits' => 0,
+ 'media_type' => MEDIATYPE_UNKNOWN
+ ];
+ }
+}
"talk": "نقاش",
"views": "معاينة",
"toolbox": "أدوات",
+ "tool-link-userrights": "تغيير مجموعات {{GENDER:$1|المستخدم|المستخدمة}}",
+ "tool-link-emailuser": "أرسل رسالة {{GENDER:$1|لهذا المستخدم|لهذه المستخدمة}}",
"userpage": "طالع صفحة المستخدم",
"projectpage": "طالع صفحة المشروع",
"imagepage": "طالع صفحة الملف",
"passwordreset-emailelement": "Імя ўдзельніка: \n$1\n\nЧасовы пароль: \n$2",
"passwordreset-emailsentemail": "Калі гэты адрас электроннай пошты далучаны да вашага рахунку, тады будзе дасланы ліст пра скідваньне паролю.",
"passwordreset-emailsentusername": "Калі ёсьць адрас электроннай пошты, злучаны з гэтым імем удзельніка, тады будзе дасланы ліст пра скідваньне паролю.",
- "passwordreset-emailsent-capture2": "{{PLURAL:$1|Электронны ліст|Электронныя лісты}} скіданьня паролю {{PLURAL:$1|быў дасланы|былі дасланыя}}. {{PLURAL:$1|Імя ўдзельніка і пароль|Сьпіс імёнаў удзельнікаў і паролі}} паказаныя ніжэй.",
- "passwordreset-emailerror-capture2": "Не атрымалася даслаць {{GENDER:$2|удзельніку|удзельніцы}} ліст электроннай поштай: $1 {{PLURAL:$3|Імя ўдзельніка і пароль|Сьпіс імёнаў удзельнікаў і паролі}} паказаныя ніжэй.",
+ "passwordreset-emailsent-capture2": "{{PLURAL:$1|1=Электронны ліст|Электронныя лісты}} скіданьня паролю {{PLURAL:$1|1=быў дасланы|былі дасланыя}}. {{PLURAL:$1|1=Імя ўдзельніка і пароль|Сьпіс імёнаў удзельнікаў і паролі}} паказаныя тут.",
+ "passwordreset-emailerror-capture2": "Не атрымалася даслаць {{GENDER:$2|удзельніку|удзельніцы}} ліст электроннай поштай: $1 {{PLURAL:$3|1=Імя ўдзельніка і пароль|Сьпіс імёнаў удзельнікаў і паролі}} паказаныя тут.",
"passwordreset-nocaller": "Мусіць быць пададзены той, хто робіць выклік",
"passwordreset-nosuchcaller": "Аўтар выкліку не існуе: $1",
"passwordreset-ignored": "Скіданьне паролю не адбылося. Магчыма, ня быў наладжаны пастаўшчык?",
"talk": "Размовы",
"views": "Віды",
"toolbox": "Прылады",
+ "tool-link-userrights": "Змяніць групы {{GENDER:$1|ўдзельніка|ўдзельніцы}}",
"userpage": "Паказаць старонку ўдзельніка",
"projectpage": "Паказаць старонку праекта",
"imagepage": "Гл. старонку файла",
"expand_templates_generate_xml": "Паказаць дрэва сінтаксічнага аналізу XML",
"expand_templates_generate_rawhtml": "Паказаць зыходны код HTML",
"expand_templates_preview": "Перадпаказ",
+ "expand_templates_input_missing": "Трэба ўвесці хоць які-небудзь тэкст.",
"pagelanguage": "Змяніць мову старонкі",
"pagelang-name": "Старонка",
"pagelang-language": "Мова",
"mediastatistics-header-unknown": "Невядомыя",
"mediastatistics-header-bitmap": "Растравыя выявы",
"mediastatistics-header-drawing": "Рысункі (вектарныя выявы)",
+ "mediastatistics-header-text": "Тэкст",
+ "mediastatistics-header-archive": "Сціснутыя фарматы",
"mediastatistics-header-total": "Усе файлы",
"json-error-state-mismatch": "Недапушчальны або некарэктны JSON",
"json-error-syntax": "Памылка сінтаксісу",
+ "headline-anchor-title": "Спасылка на гэты раздзел",
"special-characters-group-latin": "Лацінскія",
"special-characters-group-latinextended": "Лацінскія дадатковыя",
"special-characters-group-ipa": "IPA",
"mergehistory-empty": "Няма редакции, които могат да бъдат слети.",
"mergehistory-done": "$3 {{PLURAL:$3|версия|версии}} от $1 {{PLURAL:$3|беше успешно слята|бяха успешно слети}} с редакционната история на [[:$2]].",
"mergehistory-fail": "Невъзможно е да се извърши сливане на редакционните истории; проверете страницата и времевите параметри.",
+ "mergehistory-fail-invalid-source": "Изходната страница е невалидна.",
+ "mergehistory-fail-invalid-dest": "Целевата страница е невалидна.",
+ "mergehistory-fail-permission": "Нямате права за обединяване на историята.",
+ "mergehistory-fail-self-merge": "Изходната и целевата страница се еднакви.",
"mergehistory-no-source": "Изходната страница $1 не съществува.",
"mergehistory-no-destination": "Целевата страница $1 не съществува.",
"mergehistory-invalid-source": "Изходната страница трябва да притежава коректно име.",
"grant-editmywatchlist": "редактиране на списъка ви за наблюдение",
"grant-editpage": "Редактиране на съществуващи страници",
"grant-editprotected": "Редактиране на защитени страници",
+ "grant-uploadeditmovefile": "Качване, заменяне и прехвърляне на файлове",
"grant-uploadfile": "Качване на нови файлове",
"grant-basic": "Основни права",
"grant-viewdeleted": "Преглед на изтрити файлове и страници",
"action-viewmywatchlist": "преглед на списъка ви за наблюдение",
"action-viewmyprivateinfo": "преглеждане на личните данни",
"action-editmyprivateinfo": "редактиране на личната си информация",
+ "action-managechangetags": "създаване и (де)активиране на етикети",
+ "action-applychangetags": "прилагане на етикетите заедно с промените ви",
"action-purge": "почисти кеша на тази страница",
"nchanges": "$1 {{PLURAL:$1|промяна|промени}}",
"enhancedrc-since-last-visit": "$1 {{PLURAL:$1|от последното посещение}}",
"apihelp-no-such-module": "Модул \"$1\" не беше намерен.",
"apisandbox": "Пясъчник за API",
"apisandbox-fullscreen": "Разшири полето",
+ "apisandbox-submit": "Направи запитване",
"apisandbox-reset": "Изчистване",
"apisandbox-retry": "Повторен опит",
+ "apisandbox-loading": "Зареждане на информация за API-модул \"$1\"...",
+ "apisandbox-load-error": "Възникна грешка при зареждането на информация за API-модул \"$1\": $2",
+ "apisandbox-no-parameters": "Този API-модул няма параметри.",
+ "apisandbox-helpurls": "Връзки за помощ",
"apisandbox-examples": "Примери",
+ "apisandbox-dynamic-parameters": "Допълнителни параметри",
"apisandbox-dynamic-parameters-add-label": "Добавяне на параметър:",
"apisandbox-dynamic-parameters-add-placeholder": "Име на параметъра",
+ "apisandbox-dynamic-error-exists": "Параметър с име \"$1\" вече съществува.",
"apisandbox-results": "Резултати",
"apisandbox-request-url-label": "URL-адрес на заявката:",
"booksources": "Източници на книги",
"booksources-text": "По-долу е списъкът от връзки към други сайтове, продаващи нови и използвани книги или имащи повече информация за книгите, които търсите:",
"booksources-invalid-isbn": "Предоставеният ISBN изглежда е невалиден; проверете за грешки и копирайте от оригиналния източник.",
"specialloguserlabel": "Изпълнител:",
- "speciallogtitlelabel": "Цел (заглавие или потребител):",
+ "speciallogtitlelabel": "Цел (заглавие или {{ns:user}}:потребителско име за потребител):",
"log": "Дневници",
"logeventslist-submit": "Показване",
"all-logs-page": "Всички публични дневници",
"movenotallowedfile": "Нямате права да премествате файлове.",
"cant-move-user-page": "Нямате нужните права на достъп, за да местите потребителски страници (можете да местите само подстраници).",
"cant-move-to-user-page": "Нямате нужните права на достъп, за да извършвате преместване на страници върху потребителски страници (можете да местите само върху подстраници от потребителското пространство).",
+ "cant-move-category-page": "Нямате необходимите права за преместване на страници на категории.",
+ "cant-move-to-category-page": "Нямате необходимите права за преместване на страница в страница на категория.",
"newtitle": "Ново заглавие:",
"move-watch": "Наблюдаване на страницата",
"movepagebtn": "Преместване",
"tooltip-ca-nstab-category": "Преглед на категорията",
"tooltip-minoredit": "Отбелязване на промяната като малка",
"tooltip-save": "Съхраняване на промените",
+ "tooltip-publish": "Публикуване на промените",
"tooltip-preview": "Предварителен преглед, използвайте го преди да съхраните!",
"tooltip-diff": "Показване на направените от вас промени по текста",
"tooltip-compareselectedversions": "Показване на разликите между двете избрани версии на страницата",
"pageinfo-article-id": "Номер на страницата",
"pageinfo-language": "Език на съдържанието на страницата",
"pageinfo-content-model": "Модел на съдържанието на страницата",
+ "pageinfo-content-model-change": "промяна",
"pageinfo-robot-policy": "Индексиране от роботи",
"pageinfo-robot-index": "Позволено",
"pageinfo-robot-noindex": "Непозволено",
"exif-ycbcrpositioning-1": "Центрирани",
"exif-dc-contributor": "Сътрудници",
"exif-dc-date": "Дата(и)",
+ "exif-dc-publisher": "Издател",
+ "exif-dc-relation": "Свързани медии",
"exif-dc-rights": "Права",
+ "exif-dc-source": "Източник медия",
"exif-dc-type": "Вид медия",
"exif-isospeedratings-overflow": "По-голяма от 65535",
"exif-iimcategory-ace": "Изкуствa, култура и забавление",
"watchlistedit-raw-done": "Списъкът ви за наблюдение беше обновен.",
"watchlistedit-raw-added": "{{PLURAL:$1|1 страница беше добавена|$1 страници бяха добавени}}:",
"watchlistedit-raw-removed": "{{PLURAL:$1|Една страница беше премахната|$1 страници бяха премахнати}}:",
+ "watchlistedit-clear-title": "Изчистване на списъка за наблюдение",
"watchlistedit-clear-legend": "Изчистване на списъка за наблюдение",
"watchlistedit-clear-explain": "Всички заглавия ще бъдат премахнати от списъка ви за наблюдение",
"watchlistedit-clear-titles": "Заглавия:",
"tags-edit-chosen-placeholder": "Избиране на няколко етикета",
"tags-edit-reason": "Причина:",
"tags-edit-revision-submit": "Прилагане на промените към {{PLURAL:$1|тази редакция|$1 редакции}}",
+ "tags-edit-success": "Промените са приложени.",
+ "tags-edit-failure": "Промените не могат да бъдат приложени:\n$1",
"tags-edit-nooldid-title": "Не е зададена версия",
"comparepages": "Сравняване на страници",
"compare-page1": "Страница 1",
"default-skin-not-found-row-disabled": "* <code>$1</code> / $2 (<strong>изключено</strong>)",
"mediastatistics": "Медия статистики",
"mediastatistics-table-mimetype": "MIME тип",
+ "mediastatistics-table-count": "Брой файлове",
+ "mediastatistics-table-totalbytes": "Общ размер",
+ "mediastatistics-header-unknown": "Неизвестно",
"mediastatistics-header-audio": "Аудио",
"mediastatistics-header-video": "Видео",
"mediastatistics-header-total": "Всички файлове",
"talk": "Diskuse",
"views": "Zobrazení",
"toolbox": "Nástroje",
+ "tool-link-userrights": "Změnit uživatelské skupiny {{GENDER:$1|tohoto uživatele|této uživatelky}}",
+ "tool-link-emailuser": "Poslat e-mail {{GENDER:$1|tomuto uživateli|této uživatelce}}",
"userpage": "Prohlédnout si uživatelskou stránku",
"projectpage": "Prohlédnout si stránku projektu",
"imagepage": "Prohlédnout si stránku o souboru",
"passwordreset-emailelement": "Uživatelské jméno: \n$1\n\nDočasné heslo: \n$2",
"passwordreset-emailsentemail": "Pokud je u vašeho účtu nastavena tato e-mailová adresa, bude vám zaslán e-mail pro získání nového hesla.",
"passwordreset-emailsentusername": "Pokud je u tohoto účtu nastavena e-mailová adresa, bude vám zaslán e-mail pro získání nového hesla.",
- "passwordreset-emailsent-capture2": "{{PLURAL:$1|Byl odeslán e-mail|Byly odeslány e-maily}} pro získání nového hesla. {{PLURAL:$1|Uživatelské jméno a heslo jsou zobrazeny|Seznam uživatelských jmen a hesel je zobrazen}} níže.",
- "passwordreset-emailerror-capture2": "{{GENDER:$2|Uživateli|Uživatelce}} se nepodařilo odeslat e-mail: $1 {{PLURAL:$3|Uživatelské jméno a heslo jsou zobrazeny|Seznam uživatelských jmen a hesel je zobrazen}} níže.",
+ "passwordreset-emailsent-capture2": "{{PLURAL:$1|Byl odeslán e-mail|Byly odeslány e-maily}} pro získání nového hesla. Zde {{PLURAL:$1|jsou zobrazeny uživatelské jméno a heslo|je zobrazen seznam uživatelských jmen a hesel}}.",
+ "passwordreset-emailerror-capture2": "{{GENDER:$2|Uživateli|Uživatelce}} se nepodařilo odeslat e-mail: $1 Zde {{PLURAL:$3|jsou zobrazeny uživatelské jméno a heslo|je zobrazen seznam uživatelských jmen a hesel}}.",
"passwordreset-nocaller": "Musí být uveden volající",
"passwordreset-nosuchcaller": "Volající neexistuje: $1",
"passwordreset-ignored": "Žádost o nové heslo nebyla zpracována. Možná není nakonfigurován žádný poskytovatel?",
"passwordreset-emailelement": "Benutzername: \n$1\n\nTemporäres Passwort: \n$2",
"passwordreset-emailsentemail": "Falls diese E-Mail-Adresse mit deinem Benutzerkonto verknüpft ist, wird eine Passwort-Zurücksetzungs-E-Mail versandt.",
"passwordreset-emailsentusername": "Falls es eine E-Mail-Adresse gibt, die mit diesem Benutzernamen verknüpft ist, wird eine Passwort-Zurücksetzungs-E-Mail versandt.",
- "passwordreset-emailsent-capture2": "Die Passwort-Zurücksetzungs-{{PLURAL:$1|E-Mail wurde|E-Mails wurden}} versandt. {{PLURAL:$1|Der Benutzername und das Passwort|Die Liste der Benutzernamen und Passwörter}} wird unten angezeigt.",
- "passwordreset-emailerror-capture2": "Das Senden der E-Mail an {{GENDER:$2|den Benutzer|die Benutzerin}} ist fehlgeschlagen: $1 {{PLURAL:$3|Der Benutzername und das Passwort|Die Liste der Benutzernamen und Passwörter}} wird unten angezeigt.",
+ "passwordreset-emailsent-capture2": "Die Passwort-Zurücksetzungs-{{PLURAL:$1|E-Mail wurde|E-Mails wurden}} versandt. {{PLURAL:$1|Der Benutzername und das Passwort|Die Liste der Benutzernamen und Passwörter}} wird hier angezeigt.",
+ "passwordreset-emailerror-capture2": "Das Senden der E-Mail an {{GENDER:$2|den Benutzer|die Benutzerin}} ist fehlgeschlagen: $1 {{PLURAL:$3|Der Benutzername und das Passwort|Die Liste der Benutzernamen und Passwörter}} wird hier angezeigt.",
"passwordreset-nocaller": "Es muss ein Rufer angegeben werden",
"passwordreset-nosuchcaller": "Rufer ist nicht vorhanden: $1",
"passwordreset-ignored": "Die Passwortzurücksetzung konnte nicht verarbeitet werden. Vielleicht wurde kein Dienstanbieter konfiguriert?",
"about": "Heqa cı de",
"article": "Pela zerreki",
"newwindow": "(pençereyê newey de beno a)",
- "cancel": "Bıterkın",
+ "cancel": "Bıtexelne",
"moredotdotdot": "Vêşi...",
"morenotlisted": "Vêşi lista nêbi...",
"mypage": "Pele",
"newpage": "Pela newiye",
"talkpage": "Ena pele sero werêne",
"talkpagelinktext": "werênayış",
- "specialpage": "Perra bağsi",
+ "specialpage": "Pela xısusiye",
"personaltools": "Hacetê şexsiy",
"articlepage": "Pera zerreki bıvin",
- "talk": "Vaten",
+ "talk": "Werênayış",
"views": "Asayışi",
"toolbox": "Haceti",
"userpage": "Pela karberi bıvêne",
"summary": "Xulasa:",
"subject": "Mewzu:",
"minoredit": "Vurriyayışo werdiyo",
- "watchthis": "Perrer bıpaw",
+ "watchthis": "Na pele seyr ke",
"savearticle": "Qeyd ke",
"savechanges": "Vurnayışan qeyd ke",
"publishpage": "Perer bıhesırne",
"prefs-labs": "Xacetê labs",
"prefs-user-pages": "Pelê karberi",
"prefs-personal": "Pela karberi",
- "prefs-rc": "Vırnayışë newey",
+ "prefs-rc": "Vurriyayışê peyêni",
"prefs-watchlist": "Lista seyrkerdışi",
"prefs-editwatchlist": "Lista seyrkerdışi bıvurne",
"prefs-editwatchlist-label": "Listey serkerdışanê cıkewtışi timar kerê",
"nchanges": "$1 {{PLURAL:$1|vurnayış|vurnayışi}}",
"enhancedrc-since-last-visit": "$1 {{PLURAL:$1|ziyaretê peyêni ra nata}}",
"enhancedrc-history": "tarix",
- "recentchanges": "Vırnayışë newey",
+ "recentchanges": "Vurriyayışê peyêni",
"recentchanges-legend": "Tercihê vurnayışanê peyênan",
"recentchanges-summary": "Wiki sero vurriyayışê peyêni asenê.",
"recentchanges-noresult": "Goreyê kriteranê kıfşkerdeyan ra qet yew vurnayış nêvêniya.",
"passwordreset-emailelement": "Username:\n$1\n\nTemporary password:\n$2",
"passwordreset-emailsentemail": "If this email address is associated with your account, then a password reset email will be sent.",
"passwordreset-emailsentusername": "If there is an email address associated with this username, then a password reset email will be sent.",
- "passwordreset-emailsent-capture2": "The password reset {{PLURAL:$1|email has|emails have}} been sent. The {{PLURAL:$1|username and password|list of usernames and passwords}} is shown below.",
- "passwordreset-emailerror-capture2": "Emailing the {{GENDER:$2|user}} failed: $1 The {{PLURAL:$3|username and password|list of usernames and passwords}} is shown below.",
+ "passwordreset-emailsent-capture2": "The password reset {{PLURAL:$1|email has|emails have}} been sent. The {{PLURAL:$1|username and password|list of usernames and passwords}} is shown here.",
+ "passwordreset-emailerror-capture2": "Emailing the {{GENDER:$2|user}} failed: $1 The {{PLURAL:$3|username and password|list of usernames and passwords}} is shown here.",
"passwordreset-nocaller": "A caller must be provided",
"passwordreset-nosuchcaller": "Caller does not exist: $1",
"passwordreset-ignored": "The password reset was not handled. Maybe no provider was configured?",
"talk": "Conversa",
"views": "Vistas",
"toolbox": "Ferramentas",
+ "tool-link-userrights": "Modificar os grupos {{GENDER:$1|do usuario|da usuaria}}",
+ "tool-link-emailuser": "Enviar un correo electrónico {{GENDER:$1|ó usuario|á usuaria}}",
"userpage": "Ver a páxina {{GENDER:{{BASEPAGENAME}}|do usuario|da usuaria}}",
"projectpage": "Ver a páxina do proxecto",
"imagepage": "Ver a páxina do ficheiro",
"deletethispage": "מחיקת דף זה",
"undeletethispage": "שחזור דף זה",
"undelete_short": "שחזור {{PLURAL:$1|עריכה אחת|$1 עריכות}}",
- "viewdeleted_short": "×\94צ×\92ת {{PLURAL:$1|×\92רס×\94 ×\9e×\97×\95ק×\94 ×\90×\97ת|$1 ×\92רס×\90×\95ת מחוקות}}",
+ "viewdeleted_short": "×\94צ×\92ת {{PLURAL:$1|×\92רס×\94 ער×\99×\9b×\94 ×\90×\97ת|$1 ער×\99×\9b×\94 מחוקות}}",
"protect": "הגנה",
"protect_change": "שינוי",
"protectthispage": "הפעלת הגנה על דף זה",
"confirmable-no": "לא",
"thisisdeleted": "להציג או לשחזר $1?",
"viewdeleted": "להציג $1?",
- "restorelink": "{{PLURAL:$1|×\92רס×\94 ×\9e×\97×\95ק×\94 ×\90×\97ת|$1 ×\92רס×\90ות מחוקות}}",
+ "restorelink": "{{PLURAL:$1|ער×\99×\9b×\94 ×\9e×\97×\95ק×\94 ×\90×\97ת|$1 ער×\99×\9bות מחוקות}}",
"feedlinks": "הזנה:",
"feed-invalid": "סוג הזנת המנוי שגוי.",
"feed-unavailable": "הזנות אינן זמינות",
"delete-hook-aborted": "המחיקה הופסקה על־ידי מבנה Hook.\nלא ניתן הסבר.",
"no-null-revision": "לא ניתן היה ליצור גרסת־דמה בדף \"$1\"",
"badtitle": "כותרת שגויה",
- "badtitletext": "כותרת הדף המבוקש הייתה בלתי־תקינה, ריקה, או קישור שגוי לשפה אחרת או למיזם אחר.\nייתכן שהיא מכילה תו אחד או יותר שאינו יכול לשמש בכותרות.",
+ "badtitletext": "כותרת הדף המבוקש הייתה בלתי תקינה, ריקה, או קישור שגוי לשפה אחרת או למיזם אחר.\nייתכן שהיא מכילה תו אחד או יותר שאינו יכול לשמש בכותרות.",
"title-invalid-empty": "כותרת הדף המבוקש ריקה או מכילה רק שם של מרחב שם.",
- "title-invalid-utf8": "כותרת הדף המבוקש מכילה רצף UTF-8 בלתי־תקין.",
+ "title-invalid-utf8": "כותרת הדף המבוקש מכילה רצף UTF-8 בלתי תקין.",
"title-invalid-interwiki": "כותרת הדף המבוקש מכילה קישור בינוויקי, שלא ניתן להשתמש בו בכותרות.",
"title-invalid-talk-namespace": "כותרת הדף המבוקש מפנה לדף שיחה שאינו יכול להתקיים.",
- "title-invalid-characters": "כותרת הדף המבוקש מכילה תווים בלתי־תקינים: \"$1\".",
- "title-invalid-relative": "×\91×\9b×\95תרת ×\99ש × ×ª×\99×\91 ×\99×\97ס×\99. ×\9b×\95תרת ×\93פ×\99×\9d ×\99×\97ס×\99×\95ת (./, ../) ×\90×\99× ×\9f תק×\99× ×\95ת, ×\9b×\99×\95×\95×\9f ש×\9cעת×\99×\9d קר×\95×\91×\95ת ×\94×\9f ×\9c×\90 ×\99×\94×\99×\95 ×\91× ×\95ת־השגה כשתטופלנה על־ידי הדפדפן של המשתמש.",
- "title-invalid-magic-tilde": "כותרת הדף המבוקש מכילה רצף טילדות מיוחד (<nowiki>~~~</nowiki>).",
- "title-invalid-too-long": "×\9b×\95תרת ×\94×\93×£ ×\94×\9e×\91×\95קש ×\90ר×\95×\9b×\94 ×\9e×\93×\99. ×\94×\99×\90 צר×\99×\9b×\94 ×\9c×\94×\99×\95ת ×\9c×\9b×\9c ×\94×\99×\95תר ×\91×\90×\95ר×\9a {{PLURAL:$1|×\91×\99ת ×\90×\97×\93|$1 ×\91תים}} בקידוד UTF-8.",
- "title-invalid-leading-colon": "כותרת הדף המבוקש מכילה תו נקודתיים בלתי־תקין בתחילתה.",
+ "title-invalid-characters": "כותרת הדף המבוקש מכילה תווים בלתי תקינים: \"$1\".",
+ "title-invalid-relative": "×\91×\9b×\95תרת ×\99ש × ×ª×\99×\91 ×\99×\97ס×\99. ×\9b×\95תרת ×\93פ×\99×\9d ×\99×\97ס×\99×\95ת (./, ../) ×\90×\99× ×\9f תק×\99× ×\95ת, ×\9eש×\95×\9d ש×\9cעת×\99×\9d קר×\95×\91×\95ת ×\94×\9f ×\99×\94×\99×\95 ×\91×\9cת×\99Ö¾× ×\99×ª× ×\95ת ×\9cהשגה כשתטופלנה על־ידי הדפדפן של המשתמש.",
+ "title-invalid-magic-tilde": "כותרת הדף המבוקש מכילה רצף טילדות מיוחד שאינו תקין (<nowiki>~~~</nowiki>).",
+ "title-invalid-too-long": "×\9b×\95תרת ×\94×\93×£ ×\94×\9e×\91×\95קש ×\90ר×\95×\9b×\94 ×\9e×\93×\99. ×\94×\99×\90 צר×\99×\9b×\94 ×\9c×\94×\99×\95ת ×\9c×\9b×\9c ×\94×\99×\95תר ×\91×\90×\95ר×\9a {{PLURAL:$1|×\91×\99×\99×\98 ×\90×\97×\93|$1 ×\91×\99×\99×\98ים}} בקידוד UTF-8.",
+ "title-invalid-leading-colon": "כותרת הדף המבוקש מכילה תו נקודתיים בלתי תקין בתחילתה.",
"perfcached": "המידע הבא הוא עותק שמור בזיכרון המטמון של המידע, ועשוי שלא להיות מעודכן. לכל היותר {{PLURAL:$1|תוצאה אחת נשמרת|$1 תוצאות נשמרות}} בזיכרון המטמון.",
"perfcachedts": "המידע הבא הוא עותק שמור בזיכרון המטמון של המידע, שעודכן לאחרונה ב־$1. לכל היותר {{PLURAL:$4|תוצאה אחת נשמרת|$4 תוצאות נשמרות}} בזיכרון המטמון.",
"querypage-no-updates": "העדכונים לדף זה כרגע מופסקים, והמידע לא יעודכן באופן שוטף.",
"passwordreset-emailelement": "שם משתמש:\n$1\n\nסיסמה זמנית:\n$2",
"passwordreset-emailsentemail": "אם כתובת הדואר האלקטרוני הזאת משויכת לחשבון שלך, אז יישלח דואר אלקטרוני לאיפוס הסיסמה.",
"passwordreset-emailsentusername": "אם יש כתובת דואר אלקטרוני שמשויכת לשם המשתמש הזה, אז יישלח דואר אלקטרוני לאיפוס הסיסמה.",
- "passwordreset-emailsent-capture2": "{{PLURAL:$1|×\93×\95×\90\"×\9c ×\90×\99פ×\95ס ×\94ס×\99ס×\9e×\94 × ×©×\9c×\97|×\94×\95×\93×¢×\95ת ×\93×\95×\90\"×\9c ש×\9c ×\90×\99פ×\95ס ×\94ס×\99ס×\9e×\94 × ×©×\9c×\97×\95}}. {{PLURAL:$1|ש×\9d ×\94×\9eשת×\9eש×\99×\9d ×\95×\94ס×\99ס×\9e×\94 ×\9e×\95צ×\92×\99×\9d|רש×\99×\9e×\94 ש×\9c ש×\9e×\95ת ×\94×\9eשת×\9eש×\99×\9d ×\95×\94ס×\99ס×\9e×\90×\95ת ×\9e×\95צ×\92ת}} ×\9c×\94×\9cן.",
- "passwordreset-emailerror-capture2": "×\9c×\90 × ×\99ת×\9f ×\94×\99×\94 ×\9cש×\9c×\95×\97 ×\93×\95×\90\"×\9c ×\9c{{GENDER:$2|×\9eשת×\9eש|×\9eשת×\9eשת}}: $1 {{PLURAL:$3|ש×\9d ×\94×\9eשת×\9eש ×\95×\94ס×\99ס×\9e×\94 ×\9e×\95צ×\92×\99×\9d|רש×\99×\9e×\94 ש×\9c ש×\9e×\95ת ×\94×\9eשת×\9eש×\99×\9d ×\95×\94ס×\99ס×\9e×\90×\95ת ×\9e×\95צ×\92ת}} ×\9c×\94×\9cן.",
+ "passwordreset-emailsent-capture2": "{{PLURAL:$1|×\93×\95×\90\"×\9c ×\90×\99פ×\95ס ×\94ס×\99ס×\9e×\94 × ×©×\9c×\97|×\94×\95×\93×¢×\95ת ×\93×\95×\90\"×\9c ש×\9c ×\90×\99פ×\95ס ×\94ס×\99ס×\9e×\94 × ×©×\9c×\97×\95}}. {{PLURAL:$1|ש×\9d ×\94×\9eשת×\9eש×\99×\9d ×\95×\94ס×\99ס×\9e×\94 ×\9e×\95צ×\92×\99×\9d|רש×\99×\9e×\94 ש×\9c ש×\9e×\95ת ×\94×\9eשת×\9eש×\99×\9d ×\95×\94ס×\99ס×\9e×\90×\95ת ×\9e×\95צ×\92ת}} ×\9b×\90ן.",
+ "passwordreset-emailerror-capture2": "×\9c×\90 × ×\99ת×\9f ×\94×\99×\94 ×\9cש×\9c×\95×\97 ×\93×\95×\90\"×\9c ×\9c{{GENDER:$2|×\9eשת×\9eש|×\9eשת×\9eשת}}: $1 {{PLURAL:$3|ש×\9d ×\94×\9eשת×\9eש ×\95×\94ס×\99ס×\9e×\94 ×\9e×\95צ×\92×\99×\9d|רש×\99×\9e×\94 ש×\9c ש×\9e×\95ת ×\94×\9eשת×\9eש×\99×\9d ×\95×\94ס×\99ס×\9e×\90×\95ת ×\9e×\95צ×\92ת}} ×\9b×\90ן.",
"passwordreset-nocaller": "לא סופק הקורא הנדרש",
"passwordreset-nosuchcaller": "הקורא אינו קיים: $1",
"passwordreset-ignored": "איפוס הסיסמה לא בוצע. ייתכן שלא הוגדר ספק.",
"talk": "Vitalap",
"views": "Nézetek",
"toolbox": "Eszközök",
+ "tool-link-userrights": "{{GENDER:$1|Felhasználócsoportok}} módosítása",
+ "tool-link-emailuser": "E-mail küldése ennek a {{GENDER:$1|felhasználónak}}",
"userpage": "Felhasználó lapjának megtekintése",
"projectpage": "Projektlap megtekintése",
"imagepage": "A fájl leírólapjának megtekintése",
"missingarticle-rev": "(változat azonosítója: $1)",
"missingarticle-diff": "(eltérés: $1, $2)",
"readonly_lag": "Az adatbázis automatikusan le lett zárva, amíg a mellékkiszolgálók utolérik a főkiszolgálót.",
+ "nonwrite-api-promise-error": "A „Promise-Non-Write-API-Action” (ígéret nem író API-műveletre) HTTP-fejléc szerepelt a kérésben, de a kérés egy író API-modulra irányult.",
"internalerror": "Belső hiba",
"internalerror_info": "Belső hiba: $1",
"internalerror-fatal-exception": "Végzetes kivétel: „$1”",
"createacct-email-ph": "Add meg e-mail címed",
"createacct-another-email-ph": "Add meg az emailcímet",
"createaccountmail": "Átmeneti, véletlenszerű jelszó beállítása és kiküldése a megadott e-mail címre",
+ "createaccountmail-help": "A jelszó megismerése nélkül készíthető valaki másnak fiók.",
"createacct-realname": "Igazi neved (nem kötelező)",
"createaccountreason": "Indoklás:",
"createacct-reason": "Indoklás",
"createacct-reason-ph": "Miért hozol létre egy másik fiókot",
+ "createacct-reason-help": "A fióklétrehozási naplóban megjelenő üzenet",
"createacct-submit": "Felhasználói fiók létrehozása",
"createacct-another-submit": "Fiók létrehozása",
"createacct-continue-submit": "Fiók létrehozásának folytatása",
"botpasswords-label-grants-column": "Megadva",
"botpasswords-bad-appid": "A(z) „$1” botnév érvénytelen.",
"botpasswords-insert-failed": "A(z) „$1” botnév hozzáadása sikertelen. Nem lehet, hogy már hozzá lett adva?",
+ "botpasswords-update-failed": "A(z) „$1” nevű botfiók frissítése sikertelen. Lehet, hogy törölted?",
"botpasswords-created-title": "Botjelszó létrehozva",
"botpasswords-created-body": "\"$2\" felhasználó \"$1\" bot jelszava létrehozva.",
"botpasswords-updated-title": "Botjelszó frissítve",
"botpasswords-updated-body": "\"$2\" felhasználó \"$1\" bot jelszava módosítva.",
"botpasswords-deleted-title": "Botjelszó törölve",
"botpasswords-deleted-body": "\"$2\" felhasználó \"$1\" bot jelszava törölve.",
+ "botpasswords-newpassword": "A bejelentkezéshez használható új felhasználóneved <strong>$1</strong>, jelszavad <strong>$2</strong>. <em>Ezeket jegyezd fel a későbbiekre.</em> <br> (Régebbi botoknál, amik megkövetelhetik, hogy a bejelentkezési név megegyezzen magával a felhasználónévvel, használhatod a(z) <strong>$3</strong> felhasználónevet is <strong>$4</strong> jelszóval.)",
"botpasswords-no-provider": "A BotPasswordsSessionProvider nem áll rendelkezésre.",
+ "botpasswords-restriction-failed": "A botjelszó-korlátozások megakadályozzák ezt a bejelentkezést.",
+ "botpasswords-invalid-name": "A megadott felhasználónév nem tartalmazza a botjelszó-elválasztót („$1”).",
+ "botpasswords-not-exist": "A(z) „$1” felhasználó nem rendelkezik „$2” nevű botjelszóval.",
"resetpass_forbidden": "A jelszavak nem változtathatók meg",
"resetpass_forbidden-reason": "A jelszavakat nem változtathatóak meg: $1",
"resetpass-no-info": "Be kell jelentkezned, hogy közvetlenül elérd ezt a lapot.",
"passwordreset-emailelement": "Felhasználónév: \n$1\n\nIdeiglenes jelszó: \n$2",
"passwordreset-emailsentemail": "Ha ez az e-mail-cím van a fiókodhoz társítva, egy jelszó-visszaállító e-mailt küldünk.",
"passwordreset-emailsentusername": "Ha ehhez a felhasználónévhez tartozik e-mail cím, akkor egy jelszó-visszaállító levelet küld a rendszer.",
- "passwordreset-emailsent-capture2": "A jelszóvisszaállító {{PLURAL:$1|e-mailt|e-maileket}} elküldtük. A felhasználói {{PLURAL:$1|név és a jelszó|nevek és jelszavak listája}} lentebb látható.",
+ "passwordreset-emailsent-capture2": "A jelszóvisszaállító {{PLURAL:$1|e-mailt|e-maileket}} elküldtük. A {{PLURAL:$1|felhasználónév és a jelszó|felhasználónevek és jelszavak listája}} itt látható.",
+ "passwordreset-emailerror-capture2": "Az e-mail-küldés {{GENDER:$2|sikertelen}}: $1. A {{PLURAL:$3|felhasználónév és a jelszó|felhasználónevek és jelszavak listája}} itt látható.",
+ "passwordreset-nocaller": "A hívó megadása kötelező",
+ "passwordreset-nosuchcaller": "A hívó nem létezik: $1",
+ "passwordreset-ignored": "A jelszó-visszaállítás nem lett kezelve. Talán nincs konfigurálva szolgáltató?",
"passwordreset-invalideamil": "Érvénytelen e-mail cím",
+ "passwordreset-nodata": "Se felhasználónevet, sem e-mail-címet nem adtál meg",
"changeemail": "E-mail cím megváltoztatása vagy eltávolítása",
"changeemail-header": "Töltsd ki ezt az űrlapot az e-mail-címed megváltoztatásához. Ha nem szeretnél semmilyen e-mail-címet kapcsolni a fiókodhoz, hagyd üresen az új e-mail-cím mezőjét az űrlap elküldésekor.",
"changeemail-no-info": "A lap közvetlen eléréséhez be kell jelentkezned.",
"accmailtext": "A(z) [[User talk:$1|$1]] fiókhoz egy véletlenszerűen generált jelszót küldünk a(z) $2 címre.\n\nAz új fiók jelszava a ''[[Special:ChangePassword|jelszó megváltoztatása]]'' lapon módosítható a bejelentkezés után.",
"newarticle": "(Új)",
"newarticletext": "Egy olyan lapra mutató hivatkozást követtél, ami még nem létezik.\nA lap létrehozásához csak gépeld be a szövegét a lenti szövegdobozba. Ha kész vagy, az „Előnézet megtekintése” gombbal ellenőrizheted, hogy úgy fog-e kinézni, ahogy szeretnéd, és a „Lap mentése” gombbal tudod elmenteni. (További információkat a [$1 súgólapon] találsz).\nHa tévedésből jutottál ide, kattints a böngésződ '''vissza''' vagy '''back''' gombjára.",
- "anontalkpagetext": "----''Ez egy olyan anonim szerkesztő vitalapja, aki még nem regisztrált, vagy csak nem jelentkezett be.\nEzért az IP-címét használjuk az azonosítására.\nUgyanazon az IP-címen számos szerkesztő osztozhat az idők folyamán.\nHa úgy látod, hogy az üzenetek, amiket ide kapsz, nem neked szólnak, [[Special:CreateAccount|regisztrálj]] vagy ha már regisztráltál, [[Special:UserLogin|jelentkezz be]], hogy ne keverjenek össze másokkal.''",
+ "anontalkpagetext": "----\n<em>Ez egy olyan anonim felhasználó vitalapja, aki még nem regisztrált, vagy csak nem jelentkezett be.</em>\nEzért az IP-címét kell használnunk az azonosítására.\nUgyanazon az IP-címen számos szerkesztő osztozhat az idők folyamán.\nHa anonim felhasználó vagy, és úgy látod, hogy az üzenetek, amiket kapsz, nem neked szólnak, [[Special:CreateAccount|regisztrálj]] vagy [[Special:UserLogin|jelentkezz be]], hogy ne keverjenek össze másokkal.",
"noarticletext": "Ez a lap jelenleg nem tartalmaz szöveget.\n[[Special:Search/{{PAGENAME}}|Rákereshetsz erre a címszóra]],\n<span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} megtekintheted a kapcsolódó naplókat],\nvagy [{{fullurl:{{FULLPAGENAME}}|action=edit}} létrehozhatod a lapot].</span>",
"noarticletext-nopermission": "Ez a lap jelenleg nem tartalmaz szöveget.\n[[Special:Search/{{PAGENAME}}|Rákereshetsz a lap címére]] más lapok tartalmában, vagy <span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} megtekintheted a kapcsolódó naplófájlokat]</span>.",
"missing-revision": "A(z) \"{{FULLPAGENAME}}\" nevű oldal #$1 változata nem létezik.\n\nEzt általában egy elavult, törölt oldalra mutató laptörténeti hivatkozás használata okozza. Részletek a [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} törlési naplóban] találhatóak.",
"invalid-content-data": "Érvénytelen tartalom adat",
"content-not-allowed-here": "\"$1\" tartalom nem engedélyezett a [[$2]] oldalon",
"editwarning-warning": "A lap elhagyásával az összes itt végzett változtatás elveszhet.\nHa be vagy jelentkezve letilthatod ezt a figyelmeztetést a beállításaid „{{int:prefs-editing}}” szakaszában.",
+ "editpage-invalidcontentmodel-title": "A tartalommodell nem támogatott",
+ "editpage-invalidcontentmodel-text": "A(z) „$1” tartalommodell nem támogatott.",
"editpage-notsupportedcontentformat-title": "Nem támogatott tartalom formátum",
"editpage-notsupportedcontentformat-text": "$2 tartalommodell nem támogatja $1 tartalomformátumot.",
"content-model-wikitext": "wikiszöveg",
"content-json-empty-object": "Üres objektum",
"content-json-empty-array": "Üres tömb",
"deprecated-self-close-category": "Érvénytelen önzáró HTML-címkéket használó lapok",
+ "deprecated-self-close-category-desc": "A lap érvénytelen önzáró HTML-címkéket használ (pl. <code><b/></code> vagy <code><span/></code>). Ezeknek a működése hamarosan meg fog változni a HTML5 szabvánnyal összhangban lévőre, ezért a wikiszövegben való használatuk elavult.",
"duplicate-args-warning": "<strong>Figyelmeztetés:</strong> A(z) [[:$1]] lap dupla értékkel hívja meg a(z) [[:$2]] sablont („$3” paraméter). Csak az utolsó érték lesz felhasználva.",
"duplicate-args-category": "Dupla paramétermegadást tartalmazó lapok",
"duplicate-args-category-desc": "Az oldal olyan sablon hívásokat tartalmaz, amely ugyanazt a paramétert használja, például <code><nowiki>{{foo|bar=1|bar=2}}</nowiki></code> or <code><nowiki>{{foo|bar|1=baz}}</nowiki></code>.",
"undo-summary": "Visszavontam [[Special:Contributions/$2|$2]] ([[User talk:$2|vita]]) szerkesztését (oldid: $1)",
"undo-summary-username-hidden": "A rejtett felhasználó által végzett $1 változat visszavonása",
"cantcreateaccount-text": "Erről az IP-címről ('''$1''') nem lehet regisztrálni, mert [[User:$3|$3]] blokkolta az alábbi indokkal:\n\n:''$2''",
- "cantcreateaccount-range-text": "A regisztrációt a(z) <strong>$1</strong> IP-címtartományban, amelybe a te IP-címed (<strong>$4</strong>) is tartozik, [[User:$3|$3]] blokkolta.",
+ "cantcreateaccount-range-text": "A regisztrációt a(z) <strong>$1</strong> IP-címtartományban, amelybe a te IP-címed (<strong>$4</strong>) is tartozik, [[User:$3|$3]] blokkolta.\n\n$3 a következő indoklást adta: <em>$2</em>",
"viewpagelogs": "A lap a rendszernaplókban",
"nohistory": "A lap nem rendelkezik laptörténettel.",
"currentrev": "Aktuális változat",
"revdelete-submit": "Alkalmazás a kiválasztott {{PLURAL:$1|változatra|változatokra}}",
"revdelete-success": "A változat láthatósága sikeresen frissítve.",
"revdelete-failure": "'''Nem sikerült frissíteni a változat láthatóságát:'''\n$1",
- "logdelete-success": "'''Az esemény láthatóságának beállítása sikeresen elvégezve.'''",
+ "logdelete-success": "A naplóbejegyzés láthatósága beállítva.",
"logdelete-failure": "'''Nem sikerült módosítani a naplóbejegyzés láthatóságát:'''\n$1",
"revdel-restore": "Láthatóság megváltoztatása",
"pagehist": "Laptörténet",
"mergehistory-fail-bad-timestamp": "Érvénytelen időbélyeg.",
"mergehistory-fail-invalid-source": "Érvénytelen forráslap.",
"mergehistory-fail-invalid-dest": "Érvénytelen céllap.",
+ "mergehistory-fail-no-change": "A laptörténet-összefésülő nem fésült össze egy változatot sem. Ellenőrizd a lap és idő paramétereket.",
"mergehistory-fail-permission": "Nincsen jogod a laptörténetek egyesítéséhez.",
"mergehistory-fail-self-merge": "A forrás- és céllap megegyezik.",
+ "mergehistory-fail-timestamps-overlap": "A forrásváltozatok átfedésben vannak vagy későbbiek a célváltozatoknál.",
"mergehistory-fail-toobig": "Nem lehetséges a laptörténetek egyesítése, mivel több mint $1 {{PLURAL:$1|változást}} kellene áthelyezni.",
"mergehistory-no-source": "Nem létezik forráslap $1 néven.",
"mergehistory-no-destination": "Nem létezik céllap $1 néven.",
"grant-group-high-volume": "Nagy mennyiségű szerkesztés végrehajtása",
"grant-group-customization": "Személyre szabás és beállítások",
"grant-group-administration": "Adminisztratív műveletek végrehajtása",
+ "grant-group-private-information": "Privát adataid elérése",
"grant-group-other": "egyéb műveletek",
"grant-blockusers": "felhasználók blokkolása és blokk feloldása",
"grant-createaccount": "fiókok létrehozása",
"recentchanges-page-added-to-category-bundled": "[[:$1]] hozzáadva a kategóriához, [[Special:WhatLinksHere/$1|ez a lap be van illesztve más lapokra]]",
"recentchanges-page-removed-from-category": "[[:$1]] eltávolítva a kategóriából",
"recentchanges-page-removed-from-category-bundled": "[[:$1]] eltávolítva a kategóriából, [[Special:WhatLinksHere/$1|ez a lap be van illesztve más lapokra]]",
+ "autochange-username": "MediaWiki automatikus módosítása",
"upload": "Fájl feltöltése",
"uploadbtn": "Fájl feltöltése",
"reuploaddesc": "Visszatérés a feltöltési űrlaphoz.",
"file-thumbnail-no": "A fájlnév a(z) <strong>$1</strong> karakterlánccal kezdődik.\nÚgy tűnik, hogy ez egy kisméretű kép ''(bélyegkép)''.\nHa rendelkezel a teljesméretű képpel, akkor töltsd fel azt, egyébként kérjük, hogy változtasd meg a fájlnevet.",
"fileexists-forbidden": "Már létezik egy ugyanilyen nevű fájl, és nem lehet felülírni.\nHa még mindig fel szeretnéd tölteni a fájlt, menj vissza, és adj meg egy új nevet. [[File:$1|thumb|center|$1]]",
"fileexists-shared-forbidden": "Egy ugyanilyen nevű fájl már létezik a közös fájlmegosztóban; kérlek menj vissza és válassz egy másik nevet a fájlnak, ha még mindig fel akarod tölteni! [[File:$1|thumb|center|$1]]",
+ "fileexists-no-change": "A feltöltendő fájl pontos másolata a(z) <strong>[[:$1]]</strong> jelenlegi változatának.",
+ "fileexists-duplicate-version": "A feltöltendő fájl pontos másolata a(z) <strong>[[:$1]]</strong> {{PLURAL:$2|egy régebbi változatának|régebbi változatainak}}.",
"file-exists-duplicate": "Ez a következő {{PLURAL:$1|fájl|fájlok}} duplikátuma:",
"file-deleted-duplicate": "Egy ehhez hasonló fájlt ([[:$1]]) korábban már töröltek. Ellenőrizd a fájl törlési naplóját, mielőtt újra feltöltenéd.",
"file-deleted-duplicate-notitle": "Egy ugyanilyen fájlt korábban már töröltek, és címét eltávolították. Kérj meg valakit, aki meg tudja nézni a törölt fájlokat, hogy tekintse át a helyzetet, mielőtt újra feltöltenéd a fájlt.",
"uploaded-script-svg": "A feltöltött SVG fájlodban szkriptelemet találtunk: \"$1\".",
"uploaded-hostile-svg": "Nem biztonságos CSS kódot találtunk a feltöltött SVG fájlod stíluselemei között.",
"uploaded-event-handler-on-svg": "Az alábbi eseménykezelő-attribútum beállítása nem megengedett az SVG fájlokban: <code>$1=$2</code>.",
+ "uploaded-href-attribute-svg": "href attribútumok SVG fájlokban csak http:// vagy https:// protokollal engedélyezettek, <code><$1 $2=\"$3\"></code> található.",
"uploaded-href-unsafe-target-svg": "Nem biztonságos adatra mutató href-et találtunk a feltöltött SVG-fájlban: URI-cél <code><$1 $2=\"$3\"></code>.",
"uploaded-animate-svg": "A feltöltött SVG fájlban \"animate\" taget találtam, ami az alábbi \"from\" attribútumával megváltoztathat egy href-et: <code><$1 $2=\"$3\"></code>.",
+ "uploaded-setting-event-handler-svg": "Eseménykezelő attribútumok beállítása blokkolva van, <code><$1 $2=\"$3\"></code> található a feltöltendő SVG fájlban.",
"uploaded-setting-handler-svg": "Az SVG kódok, amelyek a \"handler\" attribútumot távolra/adatra/szkriptre állítják, le vannak tiltva. A feltöltött SVG fájlban a következőt találtam: <code>$1=\"$2\"</code>.",
"uploaded-remote-url-svg": "Az SVG kódok, amelyek bármely stílus-attribútumot távoli URL-ra állítják, le vannak tiltva. A feltöltött SVG fájlban a következőt találtam: <code>$1=\"$2\"</code>.",
"uploaded-image-filter-svg": "A feltöltött SVG fájl URL-t tartalmazó képfiltert tartalmaz: <code><$1 $2=\"$3\"></code>.",
"upload-too-many-redirects": "Az URL túl sokszor volt átirányítva",
"upload-http-error": "HTTP-hiba történt: $1",
"upload-copy-upload-invalid-domain": "Másolás nem engedélyezett ebből a tartományból.",
+ "upload-foreign-cant-upload": "A wiki nincs konfigurálva fájlok feltöltésére a kért külső fájltárolóba.",
+ "upload-foreign-cant-load-config": "A külső fájltárolóba való fájlfeltöltés konfigurációjának beolvasása sikertelen.",
"upload-dialog-disabled": "Fájl feltöltés ezzel a párbeszéddel tiltott ezen a wikin.",
"upload-dialog-title": "Fájl feltöltése",
"upload-dialog-button-cancel": "Mégse",
"backend-fail-read": "Nem sikerült olvasni ebből a fájlból: $1.",
"backend-fail-create": "Nem sikerült írni ebbe a fájlba: $1.",
"backend-fail-maxsize": "Nem lehet írni ezt a fájlt: $1, mert a mérete nagyobb, mint $2 bájt.",
- "backend-fail-readonly": "A(z) „$1” tárolórendszer jelenleg csak olvasható. Ennek oka a következő: „$2”",
+ "backend-fail-readonly": "A(z) „$1” tárolórendszer jelenleg csak olvasható. Ennek oka a következő: <em>$2</em>",
"backend-fail-synced": "A(z) „$1” fájl inkonzisztens állapotban van a tárolórendszerek között",
"backend-fail-connect": "Nem sikerült csatlakozni a(z) „$1” tárolórendszerhez.",
"backend-fail-internal": "Ismeretlen hiba keletkezett a(z) „$1” tárolórendszerben.",
"filerevert-submit": "Visszaállítás",
"filerevert-success": "<span class=\"plainlinks\">A(z) '''[[Media:$1|$1]]''' fájl visszaállítása a(z) [$4 verzióra, $3, $2] sikerült.</span>",
"filerevert-badversion": "A megadott időbélyegzésű fájlnak nincs helyi változata.",
+ "filerevert-identical": "A fájl jelenlegi verziója már azonos a kiválasztottal.",
"filedelete": "$1 törlése",
"filedelete-legend": "Fájl törlése",
"filedelete-intro": "Törölni készülsz a(z) '''[[Media:$1|$1]]''' médiafájlt, a teljes fájltörténetével együtt.",
"apisandbox-api-disabled": "API le van tiltva ezen az oldalon.",
"apisandbox-intro": "Ezen az oldalon kísérletezhetsz a <strong>MediaWiki web service API</strong>-val.\nA használattal kapcsolatos további részletek az [[mw:API:Main page|API-dokumentációnál]] találhatók. Példa: [https://www.mediawiki.org/wiki/API#A_simple_example olvasd el a főoldal tartalomjegyzékét]. További példákért válassz egy tevékenységet!\n\nFigyelj rá, hogy bár ez csak egy „homokozó”, ettől még az általad végzett műveletek módosíthatják a wikit!",
"apisandbox-fullscreen": "Panel kinyitása",
+ "apisandbox-fullscreen-tooltip": "A homokozópanel kinyitása a böngészőablak kitöltéséhez.",
"apisandbox-unfullscreen": "Lap mutatása",
+ "apisandbox-unfullscreen-tooltip": "A homokozópanel méretének csökkentése a MediaWiki navigációs hivatkozásainak megjelenítéséhez.",
"apisandbox-submit": "Kérés végrehajtása",
"apisandbox-reset": "Törlés",
"apisandbox-retry": "Újra",
"apisandbox-dynamic-parameters-add-placeholder": "Paraméter neve",
"apisandbox-dynamic-error-exists": "A(z) „$1” nevű paraméter már létezik.",
"apisandbox-deprecated-parameters": "Elavult paraméterek",
+ "apisandbox-fetch-token": "A token automatikus kitöltése",
"apisandbox-submit-invalid-fields-title": "Egyes mezők érvénytelenek",
"apisandbox-submit-invalid-fields-message": "Javítsd ki a jelzett mezőket, és próbáld újra.",
"apisandbox-results": "Eredmények",
"apisandbox-sending-request": "API-kérés küldése…",
"apisandbox-loading-results": "API-válaszok fogadása…",
+ "apisandbox-results-error": "Hiba történt az API-lekérdezés válaszának betöltése közben: $1.",
"apisandbox-request-url-label": "Kérő URL:",
"apisandbox-request-time": "Kérés hossza: $1 ms",
+ "apisandbox-results-fixtoken": "Token javítása és újrapróbálkozás",
+ "apisandbox-results-fixtoken-fail": "A(z) „$1” token lekérése sikertelen.",
+ "apisandbox-alert-page": "Hibás mezők vannak ezen a lapon.",
"apisandbox-alert-field": "Ennek a mezőnek az értéke érvénytelen.",
"booksources": "Könyvforrások",
"booksources-search-legend": "Könyvforrások keresése",
"trackingcategories-msg": "Nyomkövető kategória",
"trackingcategories-name": "Üzenetnév",
"trackingcategories-desc": "Kategóriába kerülés feltétele",
+ "restricted-displaytitle-ignored": "Lapok figyelmen kívül hagyott megjelenítendő lapcímmel",
+ "restricted-displaytitle-ignored-desc": "A lapon figyelmen kívül hagyott <code><nowiki>{{DISPLAYTITLE}}</nowiki></code> van, mivel a megadott cím nem egyezik a lap tényleges címével.",
"noindex-category-desc": "A lapot nem indexelik a keresőrobotok, mert tartalmazza a <code><nowiki>__NOINDEX__</nowiki></code> varázsszót, és egy olyan névtérben található, ahol ez engedélyezett.",
"index-category-desc": "A lapot akkor is indexelik a keresőrobotok, ha egyébként nem tennék, mert tartalmazza az <code><nowiki>__INDEX__</nowiki></code> varázsszót, és egy olyan névtérben található, ahol ez engedélyezett.",
"post-expand-template-inclusion-category-desc": "A lap mérete nagyobb a <code>$wgMaxArticleSize</code> változóban tárolt értéknél a sablonok kibontása után, így néhány sablon nem került kibontásra.",
"watchnologin": "Nem vagy bejelentkezve",
"addwatch": "Hozzáadás a figyelőlistához",
"addedwatchtext": "A(z) „[[:$1]]” lapot és vitalapját hozzáadtam a [[Special:Watchlist|figyelőlistádhoz]].",
+ "addedwatchtext-talk": "A(z) „[[:$1]]” lapot és a hozzá tartozó tartalmi lapot hozzáadtam a [[Special:Watchlist|figyelőlistádhoz]].",
"addedwatchtext-short": "Az oldal: \"$1\" hozzá lett adva a figyelőlistádhoz.",
"removewatch": "Eltávolítás a figyelőlistáról",
"removedwatchtext": "A(z) „[[:$1]]” lapot és vitalapját eltávolítottam a [[Special:Watchlist|figyelőlistáról]].",
+ "removedwatchtext-talk": "A(z) „[[:$1]]” lapot és a hozzá tartozó tartalmi lapot eltávolítottam a [[Special:Watchlist|figyelőlistáról]].",
"removedwatchtext-short": "Az oldal: \"$1\" el lett távolítva a figyelőlistádról.",
"watch": "Lap figyelése",
"watchthispage": "Lap figyelése",
"delete-toobig": "Ennek a lapnak a laptörténete több mint {{PLURAL:$1|egy|$1}} változatot őriz. A szervert kímélendő az ilyen lapok törlése nem engedélyezett.",
"delete-warning-toobig": "Ennek a lapnak a laptörténete több mint {{PLURAL:$1|egy|$1}} változatot őriz. Törlése fennakadásokat okozhat a wiki adatbázis-műveleteiben; óvatosan járj el.",
"deleteprotected": "Nem tudod törölni a lapot, mivel le van védve.",
- "deleting-backlinks-warning": "'''Figyelem:''' [[Special:WhatLinksHere/{{FULLPAGENAME}}|Más lapok]] hivatkoznak a törlendő oldalra.",
+ "deleting-backlinks-warning": "<strong>Figyelem:</strong> [[Special:WhatLinksHere/{{FULLPAGENAME}}|Más lapok]] hivatkoznak a törlendő oldalra (vagy beillesztik azt).",
"rollback": "Szerkesztések visszaállítása",
"rollbacklink": "visszaállítás",
"rollbacklinkcount": "$1 szerkesztés visszaállítása",
"rollbacklinkcount-morethan": "több mint $1 szerkesztés visszaállítása",
"rollbackfailed": "A visszaállítás nem sikerült",
+ "rollback-missingparam": "Kötelező paraméterek hiányoznak a kérésből.",
+ "rollback-missingrevision": "A lapváltozat adatainak betöltése sikertelen.",
"cantrollback": "Nem lehet visszaállítani: az utolsó szerkesztést végző felhasználó az egyetlen, aki a lapot szerkesztette.",
"alreadyrolled": "[[:$1]] utolsó, [[User:$2|$2]] ([[User talk:$2|vita]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]) általi szerkesztését nem lehet visszavonni:\nidőközben valaki már visszavonta vagy szerkesztette a lapot.\n\nAz utolsó szerkesztést [[User:$3|$3]] ([[User talk:$3|vita]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]) végezte.",
"editcomment": "A szerkesztési összefoglaló <em>$1</em> volt.",
"revertpage": "Visszaállítottam a lap korábbi változatát: [[Special:Contributions/$2|$2]] ([[User talk:$2|vita]]) szerkesztéséről [[User:$1|$1]] szerkesztésére",
"revertpage-nouser": "Visszaállítottam a lap korábbi változatát (szerkesztőnév eltávolítva) szerkesztéséről [[User:$1|$1]] szerkesztésére",
"rollback-success": "$1 szerkesztéseit visszaállítottam $2 utolsó változatára.",
+ "rollback-success-notify": "$1 szerkesztései visszaállítva;\nhelyreállítva $2 utolsó változata. [$3 Változtatások megtekintése]",
"sessionfailure-title": "Munkamenethiba",
"sessionfailure": "Úgy látszik, hogy probléma van a bejelentkezési munkameneteddel;\nez a művelet a munkamenet eltérítése miatti óvatosságból megszakadt.\nKérjük, hogy nyomd meg a „vissza” gombot, és töltsd le újra az oldalt, ahonnan jöttél, majd próbáld újra.",
"changecontentmodel": "A lap tartalommodelljének megváltoztatása",
"changecontentmodel-success-text": "A(z) [[:$1]] lap tartalommodellje sikeresen megváltoztatva.",
"changecontentmodel-cannot-convert": "A(z) [[:$1]] lap nem alakítható át $2 típusúvá.",
"changecontentmodel-nodirectediting": "A(z) $1 tartalommodell nem támogatja a közvetlen szerkesztést",
+ "changecontentmodel-emptymodels-title": "Nincs elérhető tartalommodell",
+ "changecontentmodel-emptymodels-text": "A(z) [[:$1]] lapon lévő tartalom nem alakítható át semmilyen típusúvá.",
"log-name-contentmodel": "Tartalommodell-változások naplója",
"log-description-contentmodel": "Egy lap tartalommodelljéhez kapcsolódó események",
+ "logentry-contentmodel-new": "$1 {{GENDER:$2|létrehozta}} a(z) $3 lapot nem alapértelmezett „$5” tartalommodellel.",
"logentry-contentmodel-change": "$1 {{GENDER:$2|megváltoztatta}} a(z) $3 lap tartalommodeljét erről: „$4” erre: „$5”",
"logentry-contentmodel-change-revertlink": "visszaállítás",
"logentry-contentmodel-change-revert": "visszaállítás",
"undeletehistorynoadmin": "Ezt a szócikket törölték. A törlés okát alább az összegzésben\nláthatod, az oldalt a törlés előtt szerkesztő felhasználók részleteivel együtt. Ezeknek\na törölt változatoknak a tényleges szövege csak az adminisztrátorok számára hozzáférhető.",
"undelete-revision": "$1 $4, $5-kori törölt változata (szerző: $3).",
"undeleterevision-missing": "Érvénytelen vagy hiányzó változat. Lehet, hogy rossz hivatkozásod van, ill. a\nváltozatot visszaállították vagy eltávolították az archívumból.",
+ "undeleterevision-duplicate-revid": "{{PLURAL:$1|Egy|$1}} változat nem állítható vissza, mert a <code>rev_id</code>-{{PLURAL:$1|je|jük}} már használatban van.",
"undelete-nodiff": "Nem található korábbi változat.",
"undeletebtn": "Helyreállítás",
"undeletelink": "megtekintés/helyreállítás",
"undeletedrevisions": "$1 változat helyreállítva",
"undeletedrevisions-files": "{{PLURAL:$1|egy|$1}} változat és {{PLURAL:$2|egy|$2}} fájl visszaállítva",
"undeletedfiles": "{{PLURAL:$1|egy|$1}} fájl visszaállítva",
- "cannotundelete": "Lap visszaállítása sikertelen: $1",
+ "cannotundelete": "Egy vagy több visszaállítás sikertelen:\n$1",
"undeletedpage": "'''$1 helyreállítva'''\n\nLásd a [[Special:Log/delete|törlési naplót]] a legutóbbi törlések és helyreállítások listájához.",
"undelete-header": "A legutoljára törölt lapokat lásd a [[Special:Log/delete|törlési naplóban]].",
"undelete-search-title": "Törölt lapok keresése",
"sp-contributions-newbies-sub": "Új szerkesztők lapjai",
"sp-contributions-newbies-title": "Új szerkesztők közreműködései",
"sp-contributions-blocklog": "Blokkolási napló",
- "sp-contributions-suppresslog": "elrejtett szerkesztők közreműködései",
- "sp-contributions-deleted": "törölt szerkesztések",
+ "sp-contributions-suppresslog": "elrejtett {{GENDER:$1|felhasználók}} közreműködései",
+ "sp-contributions-deleted": "törölt {{GENDER:$1|szerkesztések}}",
"sp-contributions-uploads": "feltöltések",
"sp-contributions-logs": "naplók",
"sp-contributions-talk": "vitalap",
"tooltip-feed-rss": "A lap tartalma RSS hírcsatorna formájában",
"tooltip-feed-atom": "A lap tartalma Atom hírcsatorna formájában",
"tooltip-t-contributions": "A {{GENDER:$1|felhasználó}} közreműködéseinek listája",
- "tooltip-t-emailuser": "Írj levelet ennek a felhasználónak!",
+ "tooltip-t-emailuser": "Írj e-mailt ennek a {{GENDER:$1|felhasználónak}}",
"tooltip-t-info": "További információk erről a lapról",
"tooltip-t-upload": "Képek vagy egyéb fájlok feltöltése",
"tooltip-t-specialpages": "Az összes speciális lap listája",
"confirmemail_body_set": "Valaki, valószínűleg te, ezt az email címet adta meg\n„$2” nevű {{SITENAME}}-fiókjához a következő IP-címről: $1.\n\nHa meg szeretnéd erősíteni, hogy a fiók valóban hozzád tartozik, így aktiválva a(z) {{SITENAME}} e-mailes funkcióit, nyisd meg az alábbi linket a böngésződben:\n\n$3\n\nHa a fiók *nem* hozzád tartozik, kövesd az alábbi linket a\nmegerősítés visszavonásához:\n\n$5\n\nEz a megerősítő e-mail $4-ig érvényes.",
"confirmemail_invalidated": "E-mail-cím megerősíthetősége visszavonva",
"invalidateemail": "E-mail-cím megerősíthetőségének visszavonása",
+ "notificationemail_subject_changed": "Megváltozott az e-mail-címed a(z) {{SITENAME}} wikin",
"scarytranscludedisabled": "[Wikiközi beillesztés le van tiltva]",
"scarytranscludefailed": "[$1 sablon letöltése sikertelen]",
"scarytranscludefailed-httpstatus": " [Nem sikerült betölteni a(z) $1 sablont: HTTP $2]",
"scarytranscludetoolong": "[Az URL túl hosszú]",
"deletedwhileediting": "'''Figyelmeztetés:''' A lapot a szerkesztés megkezdése után törölték!",
- "confirmrecreate": "Miután elkezdted szerkeszteni, [[User:$1|$1]] ([[User talk:$1|vita]]) törölte ezt a lapot a következő indokkal:\n: ''$2''\nKérlek erősítsd meg, hogy tényleg újra akarod-e írni a lapot.",
- "confirmrecreate-noreason": "[[User:$1|$1]] ([[User talk:$1|vita]]) törölte ezt a lapot, miután elkezdtél szerkeszteni. Erősítsd meg, hogy tényleg ismét létre szeretnéd hozni a lapot.",
+ "confirmrecreate": "Miután elkezdted szerkeszteni, [[User:$1|$1]] ([[User talk:$1|vita]]) törölte ezt a lapot a következő indokkal:\n: <em>$2</em>\nKérlek erősítsd meg, hogy tényleg újra létre akarod-e hozni a lapot.",
+ "confirmrecreate-noreason": "[[User:$1|$1]] ([[User talk:$1|vita]]) törölte ezt a lapot, miután elkezdted szerkeszteni. Erősítsd meg, hogy tényleg ismét létre szeretnéd hozni a lapot.",
"recreate": "Újraírás",
"confirm_purge_button": "OK",
"confirm-purge-top": "Törlöd az oldal gyorsítótárban (cache) található változatát?",
"version-libraries-license": "Licenc",
"version-libraries-description": "Leírás",
"version-libraries-authors": "Szerzők",
- "redirect": "Átirányítás fájl, szerkesztő, oldal vagy oldalváltozat alapján",
+ "redirect": "Átirányítás fájl, szerkesztő, olda, oldalváltozat vagy naplóazonosító alapján",
"redirect-summary": "Ez a speciális lap átirányít egy fájlra (megadott fájlnévvel), lapra (megadott lapváltozat- vagy lapazonosító számmal) vagy felhasználóra (felhasználó azonosítószáma alapján). Használat: [[{{#Special:Redirect}}/file/Example.jpg]], [[{{#Special:Redirect}}/page/64308]], [[{{#Special:Redirect}}/revision/328429]] vagy [[{{#Special:Redirect}}/user/101]].",
"redirect-submit": "Mehet",
"redirect-lookup": "Keresés:",
"right-suppressrevision": "Menampilkan, menyembunyikan dan membatalkan penyembunyian revisi tertentu atas suatu halaman dari pengguna",
"right-viewsuppressed": "Lihat revisi yang disembunyikan dari semua pengguna",
"right-suppressionlog": "Melihat log privat",
- "right-block": "Memblokir penyuntingan oleh pengguna lain",
+ "right-block": "Blokir pengguna lain dari penyuntingan",
"right-blockemail": "Memblokir pengiriman surel oleh pengguna",
"right-hideuser": "Memblokir nama pengguna dan menyembunyikannya dari publik",
"right-ipblock-exempt": "Mengabaikan pemblokiran IP, pemblokiran otomatis, dan rentang pemblokiran",
"action-undelete": "membatalkan penghapusan halaman ini",
"action-suppressrevision": "meninjau dan mengembalikan revisi yang disembunyikan ini",
"action-suppressionlog": "melihat log privat ini",
- "action-block": "memblokir pengguna ini dari penyuntingan",
+ "action-block": "Blokir pengguna ini dari penyuntingan",
"action-protect": "mengganti tingkat pelindungan halaman ini",
"action-rollback": "mengembalikan dengan cepat suntingan-suntingan pengguna terakhir yang menyunting halaman tertentu",
"action-import": "mengimpor halaman ini dari wiki lain",
"htmlform-title-not-exists": "$1 tidak ada.",
"htmlform-user-not-exists": "<strong>$1</strong> tidak ada.",
"htmlform-user-not-valid": "<strong>$1</strong> bukan merupakan nama pengguna sah.",
- "sqlite-has-fts": "$1 dengan dukungan pencarian teks lengkap",
- "sqlite-no-fts": "$1 tanpa dukungan pencarian teks lengkap",
"logentry-delete-delete": "$1 {{GENDER:$2|menghapus}} halaman $3",
"logentry-delete-restore": "$1 {{GENDER:$2|mengembalikan}} halaman $3",
"logentry-delete-event": "$1 {{GENDER:$2|mengubah}} tampilan {{PLURAL:$5|$5 log peristiwa}} di $3: $4",
"talk": "議論",
"views": "表示",
"toolbox": "ツール",
+ "tool-link-emailuser": "この{{GENDER:$1|利用者}}にメールを送信",
"userpage": "利用者ページを表示",
"projectpage": "プロジェクトのページを表示",
"imagepage": "ファイルのページを表示",
"htmlform-title-not-exists": "$1 は存在しません。",
"htmlform-user-not-exists": "<strong>$1</strong>は存在しません。",
"htmlform-user-not-valid": "<strong>$1</strong>は有効な利用者名ではありません。",
- "sqlite-has-fts": "$1 (全文検索あり)",
- "sqlite-no-fts": "$1 (全文検索なし)",
"logentry-delete-delete": "$1 がページ「$3」を{{GENDER:$2|削除しました}}",
"logentry-delete-restore": "$1 がページ「$3」を{{GENDER:$2|復元しました}}",
"logentry-delete-event": "$1 が $3 の{{PLURAL:$5|記録項目|記録項目$5件}}の閲覧レベルを{{GENDER:$2|変更しました}}: $4",
"talk": "토론",
"views": "보기",
"toolbox": "도구",
+ "tool-link-emailuser": "이 {{GENDER:$1|사용자}}에게 이메일 보내기",
"userpage": "사용자 문서 보기",
"projectpage": "프로젝트 문서 보기",
"imagepage": "파일 문서 보기",
"talk": "Aptarimas",
"views": "Peržiūros",
"toolbox": "Įrankiai",
+ "tool-link-userrights": "Keisti {{GENDER:$1|vartotojo|vartotojos}} grupes",
+ "tool-link-emailuser": "Siusti el. laišką {{GENDER:$1|šiam vartotojui|šiai vartotojai}}",
"userpage": "Rodyti naudotojo puslapį",
"projectpage": "Rodyti projekto puslapį",
"imagepage": "Žiūrėti failo puslapį",
"passwordreset-emailelement": "Naudotojo vardas: \n$1\n\nLaikinas slaptažodis: \n$2",
"passwordreset-emailsentemail": "Jeigu šis el. pašto adresas yra susietas su jūsų paskyra, tada slaptažodžio atkūrimo laiškas bus išsiųstas.",
"passwordreset-emailsentusername": "Jeigu buvo el. paštas susietas su šiuo naudotojo vardu, tai slaptažodžio atkūrimo el. laiškas bus išsiųstas.",
- "passwordreset-emailsent-capture2": "Slaptažodžio keitimo {{PLURAL:$1|el. laiškas buvo išsiųstas|el. laiškai buvo išsiųsti}}. {{PLURAL:$1|vartotojo vardas ir slaptažodis rodomi|vartotojų vardų ir slaptažodžių sąrašas rodomas}} žemiau.",
- "passwordreset-emailerror-capture2": "El. laiško siuntimas {{GENDER:$2|vartotojui}} nepavyko: $1 {{PLURAL:$3|vartotojo vardas ir slaptažodis rodomi|vartotojų vardų ir slaptažodžių sąrašas rodomas}} žemiau.",
+ "passwordreset-emailsent-capture2": "Slaptažodžio keitimo {{PLURAL:$1|el. laiškas buvo išsiųstas|el. laiškai buvo išsiųsti}}. {{PLURAL:$1|vartotojo vardas ir slaptažodis rodomi|vartotojų vardų ir slaptažodžių sąrašas rodomas}} čia.",
+ "passwordreset-emailerror-capture2": "El. laiško siuntimas {{GENDER:$2|vartotojui}} nepavyko: $1 {{PLURAL:$3|vartotojo vardas ir slaptažodis rodomi|vartotojų vardų ir slaptažodžių sąrašas rodomas}} čia.",
"passwordreset-nocaller": "Skambinantysis turi būti nurodytas",
"passwordreset-nosuchcaller": "Skambinantysis neegzistuoja: $1",
"passwordreset-invalideamil": "Neteisingas el. pašto adresas",
"blanknamespace": "(Pagrindinis)",
"contributions": "{{GENDER:$1|Naudotojo}} indėlis",
"contributions-title": "{{GENDER:$1|Naudotojo|Naudotojos}} $1 indėlis",
- "mycontris": "Įnašai",
- "anoncontribs": "Įnašai",
+ "mycontris": "Indėlis",
+ "anoncontribs": "Indėlis",
"contribsub2": "Dėl {{GENDER:$3|$1}} ($2)",
"contributions-userdoesnotexist": "Naudotojo paskyra „$1“ neužregistruota.",
"nocontribs": "Jokie keitimai neatitiko šių kriterijų.",
"blocklink": "blokuoti",
"unblocklink": "atblokuoti",
"change-blocklink": "keisti blokavimo nustatymus",
- "contribslink": "įnašai",
+ "contribslink": "indėlis",
"emaillink": "siųsti el. laišką",
"autoblocker": "Jūs buvote automatiškai užblokuotas, nes jūsų IP adresą neseniai naudojo „[[User:$1|$1]]“. Nurodyta naudotojo $1 blokavimo priežastis: „$2“.",
"blocklogpage": "Blokavimų sąrašas",
"version-libraries-description": "Aprašymas",
"version-libraries-authors": "Autoriai",
"redirect": "Nukreiptas iš failo, naudotojo, versijos arba žurnalo įrašo ID",
- "redirect-summary": "Šis specialus puslapis peradresuoją į failą (nurodant failo pavadinimą), puslapį (nurodant versijos ID ar puslapio ID), naudotojo puslapį (nurodant skaitinį naudotojo ID), arba žurnalo įrašą (nurodant žurnalo įrašo ID).\nNaudojimas: [[{{#Special:Redirect}}/file/Example.jpg]], [[{{#Special:Redirect}}/page/64308]], [[{{#Special:Redirect}}/revision/328429]], [[{{#Special:Redirect}}/user/101]], arba[[{{#Special:Redirect}}/logid/186]].",
+ "redirect-summary": "Šis specialus puslapis peradresuoja į failą (nurodant failo pavadinimą), puslapį (nurodant versijos ID ar puslapio ID), naudotojo puslapį (nurodant skaitinį naudotojo ID), arba žurnalo įrašą (nurodant žurnalo įrašo ID).\nNaudojimas: [[{{#Special:Redirect}}/file/Example.jpg]], [[{{#Special:Redirect}}/page/64308]], [[{{#Special:Redirect}}/revision/328429]], [[{{#Special:Redirect}}/user/101]], arba[[{{#Special:Redirect}}/logid/186]].",
"redirect-submit": "Eiti",
"redirect-lookup": "Peržvalgos:",
"redirect-value": "Vertė:",
"addedwatchtext": "\"[[:$1]]\" en de bijhorende overlegpagina zijn toegevoegd aan uw [[Special:Watchlist|volglijst]].",
"addedwatchtext-short": "De pagina \"$1\" is aan uw volglijst toegevoegd.",
"removewatch": "Verwijderen uit volglijst",
- "removedwatchtext": "\"[[:$1]]\" en de overlegpagina zijn verwijderd van [[Special:Watchlist|uw volglijst]].",
+ "removedwatchtext": "\"[[:$1]]\" en de bijhorende overlegpagina zijn verwijderd van uw [[Special:Watchlist|volglijst]].",
+ "removedwatchtext-talk": "\"[[:$1]]\" en de bijhorende pagina zijn verwijderd van uw [[Special:Watchlist|volglijst]].",
"removedwatchtext-short": "De pagina \"$1\" is van uw volglijst verwijderd.",
"watch": "Volgen",
"watchthispage": "Pagina volgen",
"exif-xresolution": "ଭୂସମାନ୍ତର ରେଜଲୁସନ",
"exif-yresolution": "ଭୁଲମ୍ବ ରେଜଲୁସନ",
"exif-stripoffsets": "ଛବି ଡାଟା ଅବସ୍ଥାନ",
- "exif-rowsperstrip": "ପà¬\9fି ପିà¬\9bା ସà\8dତମà\8dଠସà¬\99à\8dଖ୍ୟା",
+ "exif-rowsperstrip": "ପà¬\9fି ପିà¬\9bା ସà\8dତମà\8dଠସà¬\82ଖ୍ୟା",
"exif-stripbytecounts": "ସଙ୍କୁଚିତ ପଟି ପିଛା ବାଇଟ",
"exif-jpeginterchangeformat": "Offset ରୁ JPEG SOI",
"exif-jpeginterchangeformatlength": "JPEG ଡାଟାର ବାଇଟ",
"exif-subsectimedigitized": "DateTimeDigitized ସାନ ସେକେଣ୍ଡ",
"exif-exposuretime": "ଏକ୍ସପୋଜର କାଳ",
"exif-exposuretime-format": "$1 ସେକେଣ୍ଡ ($2)",
- "exif-fnumber": "F ସà¬\99à\8dà¬\96à\8dà\9fା",
+ "exif-fnumber": "F ନମà\8dବର",
"exif-exposureprogram": "ଏକ୍ସପୋଜର ପ୍ରୋଗ୍ରାମ",
"exif-spectralsensitivity": "ବର୍ଣ୍ଣାଳି ସମ୍ବେଦନଶୀଳତା",
"exif-isospeedratings": "ISO ବେଗ ସୂଚାଙ୍କ",
"htmlform-cloner-create": "ଅଧିକ ଯୋଡ଼ନ୍ତୁ",
"htmlform-cloner-delete": "ବାହାର କରନ୍ତୁ",
"htmlform-cloner-required": "ଅତି କମରେ ଗୋଟିଏ ମୂଲ୍ୟ ଲୋଡ଼ା",
- "sqlite-has-fts": "ପୁରା ଟେକ୍ସ୍ଟ ଖୋଜା ସହଯୋଗ ସହିତ $1",
- "sqlite-no-fts": "ପୂରା ଟେକ୍ସଟ ଖୋଜା ସହଯୋଗ ବିନା $1",
"logentry-delete-delete": "$1, $3 ପୃଷ୍ଠାଟି {{GENDER:$2|ଲିଭାଇଦେଲେ}}",
"logentry-delete-restore": "$1, $3 ପୃଷ୍ଠାଟି {{GENDER:$2|ପୁନସ୍ଥାପନ କଲେ}}",
"logentry-delete-event": "$1 {{PLURAL:$5|ଲଗ ଘଟଣାଟିଏ|$5 ଗୋଟି ଲଗ ଘଟଣା}}ର ଦେଖଣା $3 ପୃଷ୍ଠାରେ {{GENDER:$2|ବଦଳାଇଲେ}}: $4",
"talk": "Used as display name for the tab to all {{msg-mw|Talk}} pages. These pages accompany all content pages and can be used for discussing the content page. Example: [[Talk:Example]].\n\nSee also:\n* {{msg-mw|Talk}}\n* {{msg-mw|Accesskey-ca-talk}}\n* {{msg-mw|Tooltip-ca-talk}}\n{{Identical|Discussion}}",
"views": "Subtitle for the list of available views, for the current page. In \"monobook\" skin the list of views are shown as tabs, so this sub-title is not shown. For an example, see [{{canonicalurl:Main_Page|useskin=simple}} Main Page using simple skin].\n\n'''Note:''' This is \"views\" as in \"appearances\"/\"representations\", '''not''' as in \"visits\"/\"accesses\".\n{{Identical|View}}",
"toolbox": "The title of the toolbox below the search menu.\n{{Identical|Tool}}",
- "tool-link-userrights": "Link to [[Special:UserRights]] (user rights management) in the sidebar toolbox.\n\nParameters:\n* $1 - Name of user who would have their rights changed",
+ "tool-link-userrights": "Link to [[Special:UserRights]] (user rights management) in the sidebar toolbox.\n\nParameters:\n* $1 - Name of user for the user group management (usable for GENDER)",
"tool-link-emailuser": "Link to [[Special:EmailUser]] (email user tool) in the sidebar toolbox.\n\nParameters:\n* $1 - Name of user who would receive the email\n\nSee also:\n* {{msg-mw|Emailuser-title-target}}",
"userpage": "Used in user talk pages as the text of the link to the user page, with the Cologne Blue skin.",
"projectpage": "Used as link text in Talk page of project page with the Cologne Blue skin.",
"tog-enotifminoredits": "Trimite-mi, de asemenea, un e-mail în caz de modificări minore asupra paginilor și fișierelor",
"tog-enotifrevealaddr": "Afișează-mi adresa de e-mail în mesajele de notificare",
"tog-shownumberswatching": "Arată numărul utilizatorilor care urmăresc",
- "tog-oldsig": "Semnătură actuală:",
+ "tog-oldsig": "Semnătura actuală:",
"tog-fancysig": "Tratează semnătura ca wikitext (fără o legătură automată)",
"tog-uselivepreview": "Folosește previzualizarea în timp real",
"tog-forceeditsummary": "Avertizează-mă când uit să descriu modificările",
"newwindow": "(se deschide într-o fereastră nouă)",
"cancel": "Revocare",
"moredotdotdot": "Mai mult…",
- "morenotlisted": "Această listă nu este completă.",
+ "morenotlisted": "Această listă ar putea fi incompletă.",
"mypage": "Pagină",
"mytalk": "Discuții",
"anontalk": "Discuții",
"talk": "Discuție",
"views": "Vizualizări",
"toolbox": "Unelte",
+ "tool-link-userrights": "Schimbă grupurile {{GENDER:$1|utilizatorului|utilizatoarei}}",
+ "tool-link-emailuser": "Trimiteți un mesaj {{GENDER:$1|acestui utilizator|acestei utilizatoare}}",
"userpage": "Vizualizați pagina utilizatorului",
"projectpage": "Vizualizați pagina proiectului",
"imagepage": "Vizualizați pagina fișierului",
"botpasswords-disabled": "Parolele de roboți sunt dezactivate.",
"botpasswords-no-central-id": "Pentru a folosi parole pentru roboți, trebuie să fiți logat într-un cont centralizat.",
"botpasswords-existing": "Parole de robot existente",
+ "botpasswords-createnew": "Creați o nouă parolă de bot",
+ "botpasswords-editexisting": "Editați o parolă de bot",
"botpasswords-label-appid": "Numele robotului:",
"botpasswords-label-create": "Creare",
"botpasswords-label-update": "Actualizează",
"grant-generic": "set de permisiuni „$1”",
"grant-group-page-interaction": "Interacționează cu paginile",
"grant-group-file-interaction": "Interacționează cu conținut media",
+ "grant-highvolume": "Volum mare de editare",
+ "grant-oversight": "Ascunde utilizatori și suprimă versiuni",
+ "grant-patrol": "Patrulează schimbările paginilor",
"grant-basic": "Drepturi de bază",
"newuserlogpage": "Jurnal utilizatori noi",
"newuserlogpagetext": "Acesta este jurnalul creărilor conturilor de utilizator.",
"uploadstash-badtoken": "Execuția acestei acțiuni nu a reușit, probabil deoarece informațiile dumneavoastră de identificare au expirat. Încercați din nou.",
"uploadstash-errclear": "Golirea fișierelor nu a reușit.",
"uploadstash-refresh": "Reîmprospătează lista de fișiere",
+ "uploadstash-thumbnail": "arată miniatura",
+ "uploadstash-exception": "Nu pot stoca încărcare în spațiul temporar ($1): \"$2\"",
"invalid-chunk-offset": "Decalaj de segment nevalid",
"img-auth-accessdenied": "Acces interzis",
"img-auth-nopathinfo": "PATH_INFO lipsește.\nServerul dumneavoastră nu a fost setat pentru a trece aceste informații.\nS-ar putea să fie bazat pe CGI și să nu suporte img_auth.\nVedeți https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Image_Authorization.",
"delete-toobig": "Această pagină are un istoric al modificărilor important, cu mai mult de $1 {{PLURAL:$1|versiune|versiuni|de versiuni}}.\nȘtergerea unei astfel de pagini a fost restricționată pentru a preveni apariția unor erori în {{SITENAME}}.",
"delete-warning-toobig": "Această pagină are un istoric al modificărilor mult prea mare, cu mai mult de $1 {{PLURAL:$1|versiune|versiuni|de versiuni}}.\nȘtergerea sa poate afecta baza de date a sitului {{SITENAME}};\nacționați cu precauție.",
"deleteprotected": "Nu puteți șterge această pagină, deoarece este protejată.",
- "deleting-backlinks-warning": "'''Atenție:''' [[Special:WhatLinksHere/{{FULLPAGENAME}}|Alte pagini]] se leagă sau transclud pagina pe care doriți să o ștergeți.",
+ "deleting-backlinks-warning": "<strong>Atenție:</strong> [[Special:WhatLinksHere/{{FULLPAGENAME}}|Alte pagini]] se leagă sau transclud pagina pe care doriți să o ștergeți.",
"rollback": "Editări de revenire",
"rollbacklink": "revenire",
"rollbacklinkcount": "revenire asupra {{PLURAL:$1|unei modificări|a $1 modificări|a $1 de modificări}}",
"log-action-filter-rights-rights": "Modificare manuală",
"log-action-filter-rights-autopromote": "Schimbare automată",
"log-action-filter-upload-upload": "Încărcare nouă",
- "log-action-filter-upload-overwrite": "Reîncărcare"
+ "log-action-filter-upload-overwrite": "Reîncărcare",
+ "linkaccounts-submit": "Leagă conturile",
+ "unlinkaccounts": "Dezleagă conturile",
+ "unlinkaccounts-success": "Contul a fost dezlegat"
}
"Macofe",
"Matma Rex",
"Мария Олесова",
- "Ай-Куо"
+ "Ай-Куо",
+ "Туллук"
]
},
"tog-underline": "Сигэлэри аннынан тардыы:",
"tog-enotifminoredits": "Кыра да уларытыы киирдэҕинэ эл. почтанан биллэрээр",
"tog-enotifrevealaddr": "Мин почтам аадырыһын биллэриилэргэ көрдөр",
"tog-shownumberswatching": "Сирэйи кэтээн көрөр дьон ахсаанын көрдөр",
- "tog-oldsig": "Билиҥҥи илии баттааһын:",
+ "tog-oldsig": "Билигин туттар илии баттааһынын",
"tog-fancysig": "Бэйэ илии баттааһына (сигэтэ суох)",
"tog-uselivepreview": "Хайдах буолуохтааҕын тутатына эрдэ көрүүнү туттуу",
"tog-forceeditsummary": "Тугу уларыппытым туһунан суруйбатахпына сэрэт",
"yourpasswordagain": "Киирии тылгын хатылаа:",
"createacct-yourpasswordagain": "Киирии тылгын бигэргэт",
"createacct-yourpasswordagain-ph": "Киирии тылгын хатылаа",
- "remembermypassword": "Миигин бу көмпүүтэргэ сигээ ($1 {{PLURAL:$1|күн|күнтэн ордуга суох}})",
"userlogin-remembermypassword": "Тиһиликтэн тахсыма",
"userlogin-signwithsecure": "Бигэ холбонуу",
"cannotloginnow-title": "Сип-билигин киирэр кыах суох",
"tag-filter": "[[Special:Tags|Бэлиэлэр]] фильтрдара:",
"tag-filter-submit": "Фильтр",
"tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|Тиэк|Тиэктэр}}]]: $2)",
+ "tag-mw-contentmodelchange": "Иһинээҕи киэбин уларытыы сурунаала",
"tags-title": "Бэлиэлэр (тиэктэр)",
"tags-intro": "Бу сирэйгэ бырагыраамма уларытыылары бэлиэтиир анал бэлиэлэрин (тиэктэрин) тиһиктэрэ уонна ол бэлиэлэр суолталара көстөр.",
"tags-tag": "Бэлиэ (тиэк) аата",
"htmlform-title-not-exists": "$1 суох.",
"htmlform-user-not-exists": "<strong>$1</strong> суох.",
"htmlform-user-not-valid": "<strong>$1</strong> — маннык аат сатаммат.",
- "sqlite-has-fts": "$1 толору тиэкистээх көрдөөһүнү өйүүр",
- "sqlite-no-fts": "$1 толору тиэкистээх көрдөөһүнү өйөөбөт",
"logentry-delete-delete": "$3 сирэйи $1 соппут",
"logentry-delete-restore": "$3 сирэйи $1 сөргүппүт",
"logentry-delete-event": "Сурунаал $5 суругун көстүүтүн манна $3 $1 уларыппыт: $4",
"passwordreset-emailelement": "Uporabniško ime: \n$1\n\nZačasno geslo: \n$2",
"passwordreset-emailsentemail": "Če je e-poštni naslov povezan z vašim računom, vam bomo poslali e-pošto za postavitev gesla.",
"passwordreset-emailsentusername": "Če obstaja e-poštni naslov, povezan s tem uporabniškim imenom, vam bomo poslali e-pošto za postavitev gesla.",
- "passwordreset-emailsent-capture2": "Poslali smo {{PLURAL:$1|e-pošto|e-pošti|e-pošte}} za ponastavitev gesla. {{PLURAL:$1|Uporabniško ime in geslo sta navedena spodaj.|Seznam uporabniških imen in gesel je naveden spodaj.}}",
- "passwordreset-emailerror-capture2": "Pošiljanje e-pošte {{GENDER:$2|uporabniku|uporabnici}} je spodletelo: $1 {{PLURAL:$3|Uporabniško ime in geslo sta navedena spodaj.|Seznam uporabniških imen in gesel je naveden spodaj.}}",
+ "passwordreset-emailsent-capture2": "Poslali smo {{PLURAL:$1|e-pošto|e-pošti|e-pošte}} za ponastavitev gesla. {{PLURAL:$1|Uporabniško ime in geslo sta navedena tukaj.|Seznam uporabniških imen in gesel je naveden tukaj.}}",
+ "passwordreset-emailerror-capture2": "Pošiljanje e-pošte {{GENDER:$2|uporabniku|uporabnici}} je spodletelo: $1 {{PLURAL:$3|Uporabniško ime in geslo sta navedena tukaj.|Seznam uporabniških imen in gesel je naveden tukaj.}}",
"passwordreset-nocaller": "Podati morate klicatelja",
"passwordreset-nosuchcaller": "Klicatelj ne obstaja: $1",
"passwordreset-ignored": "Ponastavitve gesla nismo izvedli. Morda ni nastavljen noben ponudnik?",
"talk": "Diskussion",
"views": "Visningar",
"toolbox": "Verktyg",
+ "tool-link-userrights": "Ändra {{GENDER:$1|användargrupper}}",
+ "tool-link-emailuser": "Skicka e-post till denna {{GENDER:$1|användare}}",
"userpage": "Visa användarsida",
"projectpage": "Visa projektsida",
"imagepage": "Visa filsida",
"passwordreset-emailelement": "Användarnamn: \n$1\n\nTillfälligt lösenord: \n$2",
"passwordreset-emailsentemail": "Om denna e-postadress är associerad med ditt konto kommer en lösenordsåterställning skickas via e-post.",
"passwordreset-emailsentusername": "Om det finns en e-postadress som associeras med detta användarnamn kommer en lösenordsåterställning skickas via e-post.",
- "passwordreset-emailsent-capture2": "{{PLURAL:$1|E-postmeddelande|E-postmeddelanden}} för återställning av lösenord har skickats. {{PLURAL:$1|Användarnamnet och lösenordet|Listan över användarnamn och lösenord}} visas nedan.",
- "passwordreset-emailerror-capture2": "Kunde inte skicka e-post till {{GENDER:$2|användaren}}: $1 {{PLURAL:$3|Användarnamnet och lösenordet|Listan över användarnamn och lösenord}} listas nedan.",
+ "passwordreset-emailsent-capture2": "{{PLURAL:$1|E-postmeddelande|E-postmeddelanden}} för återställning av lösenord har skickats. {{PLURAL:$1|Användarnamnet och lösenordet|Listan över användarnamn och lösenord}} visas här.",
+ "passwordreset-emailerror-capture2": "Kunde inte skicka e-post till {{GENDER:$2|användaren}}: $1 {{PLURAL:$3|Användarnamnet och lösenordet|Listan över användarnamn och lösenord}} listas här.",
"passwordreset-nocaller": "En användare måste anges",
"passwordreset-nosuchcaller": "Användare finns inte: $1",
"passwordreset-ignored": "Lösenordsåterställningen hanterades inte. Kanske ingen leverantör har konfigurerats?",
"recentchangeslinked-summary": "ಒಂಜಿ ನಿರ್ದಿಸ್ಟೊ ಪುಟೊರ್ದು (ಅತ್ತ್’ನ್ಡ ನಿರ್ದಿಸ್ಟೊ ವರ್ಗೊಗು ಸೇರ್ದಿನ ಪುಟೊಲೆರ್ದ್) ಸಂಪರ್ಕೊ ಉಪ್ಪುನ ಪುಟೊಲೆಡ್ ಇಂಚಿಪ ಮಲ್ತಿನಂಚಿನ ಬದಲಾವಣೆಲೆನ್ ತಿರ್ತ್ ಪಟ್ಟಿ ಮಲ್ಪೆರಾತ್ಂಡ್.\n[[Special:Watchlist|ಇರೆನ ವೀಕ್ಷಣೆ ಪಟ್ಟಿಡ್]] ಉಪ್ಪುನ ಪುಟೊಲು '''ದಪ್ಪ ಅಕ್ಷರೊಡು''' ಉಂಡು.",
"recentchangeslinked-page": "ಪುಟೊತ ಪುದರ್:",
"recentchangeslinked-to": "ಇಂದೆತ ಬದಲ್ಗ್ ಕೊರ್ತ್ನ ಪುಟೊಗು ಕೊಂಡಿ ಉಪ್ಪುನಂಚಿನ ಪುಟೊಲೆದ ಬದಲಾವಣೆಲೆನ್ ತೋಜಾವು",
- "upload": "ಫೈಲ್ ಅಪ್ಲೋಡ್",
+ "upload": "ಫೈಲ್’ನ್ ಅಪ್ಲೋಡ್ ಮಲ್ಪುಲೆ",
"uploadbtn": "ಫೈಲ್’ನ್ ಅಪ್ಲೋಡ್ ಮಲ್ಪುಲೆ",
"uploadnologin": "ಲಾಗಿನ್ ಆತ್‘ಜ್ಜರ್",
"uploadlogpage": "ಅಪ್ಲೋಡ್ ದಾಖಲೆ",
"listingcontinuesabbrev": "جاری۔",
"index-category": "فہرست شدہ صفحات",
"noindex-category": "غیر فہرست شدہ صفحات",
- "broken-file-category": "صفحات مع شکستہ فائل روابط",
+ "broken-file-category": "فائل کے شکستہ روابط کے حامل صفحات",
"categoryviewer-pagedlinks": "($1) ($2)",
"about": "تعارف",
"article": "صفحہ مواد",
"versionrequiredtext": "اِس صفحہ کو استعمال کرنے کیلئے میڈیاویکی کا $1 نسخہ چاہئیے.\n\n\nدیکھئے [[خاص:نسخہ|صفحۂ نسخہ]]",
"ok": "ٹھیک ہے",
"pagetitle-view-mainpage": "{{SITENAME}}",
+ "backlinksubtitle": "→ $1",
"retrievedfrom": "اخذ کردہ از «$1»",
"youhavenewmessages": "آپکے لیۓ ایک $1 ہے۔ ($2)",
"youhavenewmessagesfromusers": "{{PLURAL:$4|آپ کے لیے}} {{PLURAL:$3|کسی دوسرے صارف|$3 صارفین}} کی جانب سے $1 ($2)۔",
"userlogin-yourpassword-ph": "اپنا کلمہ شناخت دیں",
"createacct-yourpassword-ph": "ایک پاس ورڈ داخل کریں",
"yourpasswordagain": "کلمۂ شناخت دوبارہ لکھیں",
- "createacct-yourpasswordagain": "کلمۂ اجازت تصدیق کریں",
+ "createacct-yourpasswordagain": "پاس ورڈ کی تصدیق کریں",
"createacct-yourpasswordagain-ph": "پاس ورڈ پھر داخل کریں",
"userlogin-remembermypassword": "مجھے داخل رکھے",
"userlogin-signwithsecure": "محفوظ رابطہ (کنکشن) استعمال کریں",
"searchall": "تمام",
"showingresults": "ذیل میں #<strong>$2</strong> سے {{PLURAL:$1|<strong>1</strong> تک نتیجہ دکھایا گیا ہے|<strong>$1</strong> تک نتائج دکھائے گئے ہیں}}۔",
"showingresultsinrange": "ذیل میں #<strong>$2</strong> سے #<strong>$3</strong> تک {{PLURAL:$1|<strong>1</strong> نتیجہ|<strong>$1</strong> نتائج}} ایک قطار میں درج {{PLURAL:$1|ہے|ہیں}}۔",
- "search-showingresults": "{{PLURAL:$4|نتائج <strong>$1</strong> از <strong>$3</strong>|نتائج <strong>$1 - $2</strong> از <strong>$3</strong>}}",
+ "search-showingresults": "{{PLURAL:$4|<strong>$3</strong> میں سے <strong>$1</strong> نتیجہ|<strong>$3</strong> میں سے <strong>$1 تا $2</strong> نتائج}}",
"search-nonefound": "استفسار کے مطابق کوئی نتیجہ برآمد نہیں ہوا۔",
"search-nonefound-thiswiki": "اس سائٹ پر استفسار کے مطابق کوئی نتیجہ برآمد نہیں ہوا۔",
"powersearch-legend": "پیشرفتہ تلاش",
"listduplicatedfiles": "مکررات کے ساتھ فائلوں کی فہرست",
"unusedtemplates": "غیر استعمال شدہ سانچے",
"unusedtemplateswlh": "دیگر روابط",
- "randompage": "بےترتیب صفحہ",
+ "randompage": "جستہ جستہ",
+ "randompage-nopages": "{{PLURAL:$2|اس نام فضا|ان نام فضا}} میں کوئی صفحہ موجود نہیں ہے: $1",
"randomincategory": "زمرہ میں بے ترتیب صفحہ",
"randomincategory-invalidcategory": "عنوان «$1» زمرے کا درست نام نہیں ہے۔",
"randomincategory-nopages": "[[:Category:$1|$1]] زمرہ میں کوئی صفحہ نہیں ہے۔",
"trackingcategories-name": "پیغام کا عنوان",
"trackingcategories-desc": "زمرہ کی شمولیت کا معیار",
"restricted-displaytitle-ignored": "صفحات مع نظرانداز کردہ عناوین",
+ "broken-file-category-desc": "اس صفحہ میں کسی فائل کا شکستہ ربط موجود ہے (یعنی ایسی فائل کا ربط دیا گیا ہے جو موجود نہیں)۔",
+ "hidden-category-category-desc": "اس زمرہ میں ابتدائی طور پر <code><nowiki>__HIDDENCAT__</nowiki></code> کا کوڈ شامل ہے جو اس زمرہ کو صفحات میں ظاہر ہونے سے روکتا ہے۔",
"trackingcategories-nodesc": "کوئی وضاحت دستیاب نہیں۔",
"trackingcategories-disabled": "زمرہ غیر فعال ہے",
"mailnologin": "بھیجنے کے لیے کوئی پتہ نہیں",
"whatlinkshere-hideimages": "تصویر کے روابط $1",
"whatlinkshere-filters": "فلٹرذ",
"whatlinkshere-submit": "ٹھیک",
+ "autoblockid": "خودکار پابندی #$1",
"block": "صارف مسدود کریں",
"unblock": "صارف سے پابندی ہٹائیں",
"blockip": "داخلہ ممنوع برائے صارف",
"contribslink": "شراکتیں",
"emaillink": "ای میل بھیجیں",
"blocklogpage": "نوشتۂ پابندی",
+ "unblocklogentry": "$1 سے پابندی ہٹائی گئی",
"block-log-flags-anononly": "محض نامعلوم صارفین",
"block-log-flags-nocreate": "کھاتے کی تخلیق غیرفعال",
"block-log-flags-noautoblock": "خودکار پابندی غیر فعال",
"block-log-flags-nousertalk": "اپنے ذاتی تبادلۂ خیال میں ترمیم نہیں کر سکتا",
"block-log-flags-angry-autoblock": "پیشرفتہ خودکار پابندی فعال",
"block-log-flags-hiddenname": "صارف نام پوشیدہ ہے",
+ "range_block_disabled": "منتظمین سے رینج پر پابندی لگانے کا اختیار واپس لے لیا گیا ہے۔",
"ipb_expiry_invalid": "وقت اختتام نادرست ہے۔",
"ipb_expiry_old": "وقت اختتام گزر چکا ہے۔",
+ "ipb_expiry_temp": "پوشیدہ صارف نام پر عائد کی جانے والی پابندیاں مستقل ہونا لازمی ہے۔",
+ "ipb_hide_invalid": "اس کھاتے کو دبایا نہیں جا سکا؛ اس کھاتے سے {{PLURAL:$1|ایک ترمیم کی گئی ہے|$1 ترامیم کی گئی ہیں}}۔",
"ipb_already_blocked": "«$1» پر پہلے ہی پابندی لگا دی گئی ہے۔",
"ipb-needreblock": "«$1» پر پہلے ہی پابندی لگا دی گئی ہے۔ کیا آپ ان ترتیبات کو تبدیل کرنا چاہتے ہیں؟",
"ipb-otherblocks-header": "دیگر {{PLURAL:$1|پابندی|پابندیاں}}",
"unblock-hideuser": "چونکہ اس صارف کا نام پوشیدہ ہے لہذا آپ اس صارف سے پابندی نہیں ہٹا سکتے۔",
+ "ip_range_invalid": "آئی پی پتے کی رینج نادرست ہے۔",
+ "ip_range_toolarge": "/$1 سے زیادہ بڑی رینج پابندیوں کی اجازت نہیں ہے۔",
+ "proxyblocker": "پراکسی مسدود کنندہ",
+ "proxyblockreason": "آپ کے آئی پی پتے پر پابندی لگا دی گئی ہے کیونکہ یہ اوپن پراکسی ہے۔\nبراہ کرم انٹرنیٹ خدمات فراہم کرنے والے یا اپنی تنظیم کے تکنیکی معاون سے رابطہ کریں اور انہیں اس سنجیدہ مسئلہ سے آگاہ کریں۔",
+ "sorbsreason": "{{SITENAME}} کے زیر استعمال DNSBL میں آپ کا آئی پی پتا اوپن پراکسی کے طور پر درج فہرست ہے۔",
+ "sorbs_create_account_reason": "{{SITENAME}} کے زیر استعمال DNSBL میں آپ کا آئی پی پتا اوپن پراکسی کے طور پر درج فہرست ہے۔\nآپ کھاتہ نہیں بنا سکتے۔",
"ipbblocked": "آپ دیگر صارفین پر پابندی لگا یا ہٹا نہیں سکتے کیونکہ خود آپ پر پابندی عائد کی گئی ہے۔",
"ipbnounblockself": "آپ کو اپنی ذات سے پابندی ہٹانے کی اجازت نہیں ہے۔",
"lockdb": "ڈیٹابیس مقفل کریں",
"tooltip-n-portal": "منصوبہ کے متعلق، آپ کیا کرسکتے ہیں، چیزیں کہاں ڈھونڈنی ہیں",
"tooltip-n-currentevents": "حالیہ واقعات پر پس منظری معلومات دیکھیئے",
"tooltip-n-recentchanges": "ویکی میں حالیہ تبدیلیوں کی فہرست",
- "tooltip-n-randompage": "اÛ\8cÚ© تصادÙ\81Û\8c صÙ\81ØÛ\81 Ù\84ائÛ\8cÛ\92",
+ "tooltip-n-randompage": "صÙ\81Øات کا جستÛ\81 جستÛ\81 Ù\85طاÙ\84عÛ\81 کرÛ\8cÚº",
"tooltip-n-help": "ڈھونڈ نکالنے کی جگہ",
"tooltip-t-whatlinkshere": "اُن تمام ویکی صفحات کی فہرست جن کا یہاں ربط ہے",
"tooltip-t-recentchangeslinked": "اِس صفحہ سے مربوط صفحات میں حالیہ تبدیلیاں",
"exif-contrast": "امتیاز",
"exif-saturation": "پُری",
"exif-sharpness": "تیزی",
+ "exif-gpslatituderef": "شمالی یا جنوبی عرض البلد",
"exif-gpslatitude": "عرض البلد",
+ "exif-gpslongituderef": "مشرقی یا مغربی طول البلد",
"exif-gpslongitude": "طول البلد",
"exif-gpsaltituderef": "اتفاع کا حوالہ",
"exif-gpsaltitude": "ارتفاع",
"exif-giffilecomment": "جی آئی ایف فائل کا تبصرہ",
"exif-intellectualgenre": "شئی کی قسم",
"exif-subjectnewscode": "موضوع کا کوڈ",
+ "exif-compression-1": "غیر کمپریس شدہ",
"exif-copyrighted-true": "کاپی رائٹ شدہ",
"exif-copyrighted-false": "کاپی رائٹ کی صورت حال متعین نہیں کی گئی",
"exif-photometricinterpretation-1": "سیاہ اور سفید (سیاہ 0 ہے)",
"exif-sensingmethod-1": "غیر وضاحتی",
"exif-customrendered-0": "عام عمل",
"exif-customrendered-1": "اپنی مرضی کے مطابق عمل",
+ "exif-scenecapturetype-0": "معیاری",
"exif-contrast-0": "عام",
"exif-contrast-1": "نرم",
"exif-contrast-2": "سخت",
"namespacesall": "تمام",
"monthsall": "تمام",
"confirmemail": "اپنے برقی پتہ کی تصدیق کریں",
+ "confirmemail_noemail": "آپ نے [[Special:Preferences|اپنی ترجیحات]] میں درست برقی ڈاک پتا نہیں دیا ہے۔",
"confirmemail_send": "تصدیقی کوڈ بھیجیں",
"confirmemail_sent": "تصدیقی برقی خط بھیجا گیا ہے۔",
"confirmemail_oncreate": "آپ کے برقی ڈاک پتے پر تصدیقی کوڈ بھیجا گیا ہے۔\nیہ کوڈ داخل ہونے کے لیے ضروری نہیں، تاہم اس ویکی میں برقی ڈاک پر مبنی کسی سہولت کو فعال کرنے سے قبل آپ کو اس کوڈ کی ضرورت پڑے گی۔",
"imgmultigoto": "$1 صفحہ پر جائیں",
"img-lang-default": "(طے شدہ زبان)",
"img-lang-go": "ٹھیک",
+ "ascending_abbrev": "صعودی",
+ "descending_abbrev": "نزولی",
"table_pager_next": "اگلا صفحہ",
"table_pager_prev": "پچھلا صفحہ",
"table_pager_first": "پہلا صفحہ",
"table_pager_last": "آخری صفحہ",
+ "table_pager_limit": "فی صفحہ $1 آئٹم دکھائیں",
+ "table_pager_limit_label": "آئٹم فی صفحہ:",
+ "table_pager_limit_submit": "چلیں",
+ "table_pager_empty": "کوئی نتیجہ برآمد نہیں ہوا",
"autosumm-blank": "تمام مندرجات حذف",
+ "autosumm-replace": "\"$1\" سے مواد کی تبدیلی",
"autoredircomment": "[[$1]] سے رجوع مکرر",
"autosumm-new": "«$1» پر مشتمل نیا صفحہ بنایا",
"autosumm-newblank": "خالی صفحہ بنایا",
"watchlistedit-clear-title": "اپنی زیر نظر فہرست صاف کریں",
"watchlistedit-clear-legend": "اپنی زیر نظر فہرست صاف کریں",
"watchlistedit-clear-titles": "عناوین:",
+ "watchlisttools-clear": "زیرنظر فہرست کی صفائی",
"watchlisttools-view": "متعلقہ تبدیلیاں دیکھیں",
"watchlisttools-edit": "زیرِنظرفہرست دیکھیں اور تدوین کریں",
"watchlisttools-raw": "خام زیرِنظرفہرست تدوین کریں",
"signature": "[[{{ns:user}}:$1|$2]] ([[{{ns:user_talk}}:$1|تبادلۂ خیال]])",
"timezone-local": "مقامی",
"restricted-displaytitle": "<strong>انتباہ!:</strong> عنوان \"$1\" کو نظر انداز کر دیا گیا ہے کیونکہ یہ متعلقہ صفحہ کے عنوان کا حقیقی متبادل نہیں ہے۔",
- "version": "ورژن",
+ "version": "نسخہ",
+ "version-extensions": "نصب شدہ توسیعات",
+ "version-skins": "نصب شدہ پوشاکیں",
"version-specialpages": "خاص صفحات",
+ "version-parserhooks": "تجزیہ کار ہک",
+ "version-variables": "متغیرات",
+ "version-antispam": "فاضل کاری کی روک تھام",
"version-other": "دیگر",
+ "version-mediahandlers": "میڈیا ناظمین",
+ "version-hooks": "ہک",
+ "version-parser-extensiontags": "پارسر توسیع کے ٹیگ",
+ "version-parser-function-hooks": "پارسر فنکشن کے ہک",
+ "version-hook-name": "ہک کا نام",
+ "version-hook-subscribedby": "مستعمل بذریعہ",
+ "version-no-ext-name": "[کوئی نام نہیں]",
"version-license": "میڈیاویکی کا اجازت نامہ",
"version-ext-license": "اجازت نامہ",
"version-ext-colheader-name": "توسیع",
"version-license-not-found": "اس توسیع کے اجازت نامے سے متعلق تفصیلی معلومات دستیاب نہین ہوئی۔",
"version-credits-title": "$1 کے انتسابات",
"version-credits-not-found": "اس توسیع کے انتسابات سے متعلق تفصیلی معلومات دستیاب نہین ہوئی۔",
- "version-poweredby-credits": "یہ ویکی <strong>[https://www.mediawiki.org/ میڈیاویکی]</strong> کی تقویت یافتہ ہے، جملہ حقوق محفوظ © 2001-$1 $2",
+ "version-poweredby-credits": "پیش نظر ویکی <strong>[https://www.mediawiki.org/ میڈیاویکی]</strong> کی تقویت یافتہ ہے، جملہ حقوق محفوظ © 2001-$1 $2 بنام",
"version-poweredby-others": "دیگر",
"version-poweredby-translators": "translatewiki.net کے مترجمین",
+ "version-credits-summary": "ہم درج ذیل اشخاص کی [[Special:Version|میڈیاویکی]] کی تعمیر میں شرکت کرنے کا اعتراف کرتے ہیں۔",
+ "version-license-info": "میڈیاویکی ایک آزاد سافٹ ویئر ہے؛ آپ اسے آزاد سافٹ ویئر فاؤنڈیش کی جانب سے شائع کردہ گنو عام عوامی اجازت نامہ کی شرائط کے تحت دوبارہ شائع/یا اس میں تبدیلی کر سکتے ہیں؛ خواہ مذکورہ اجازت نامہ کے نسخہ دوم کے تحت شائع کریں یا (حسب منشا) کسی جدید نسخے کے تحت۔\n\nیقیناً میڈیاویکی کو اس امید کے ساتھ شائع کیا گیا ہے کہ یہ مفید ثابت ہوگا، لیکن کوئی ضمانت نہیں ہے؛ نہ قابل تجارت ہونے کی اطلاقی ضمانت ہے اور نہ کسی مخصوص مقصد کے لیے موزوں ہونے کی۔ مزید تفصیلات کے لئے گنو کا عام عوامی اجازت نامہ ملاحظہ فرمائیں۔\n\nآپ کو اس پروگرام کے ساتھ [{{SERVER}}{{SCRIPTPATH}}/COPYING گنو عام عوامی اجازت نامہ کا ایک نسخہ] بھی موصول ہوگا؛ اگر یہ نسخہ نہ ملے تو Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA پتے پر خط و کتابت کریں یا [//www.gnu.org/licenses/old-licenses/gpl-2.0.html اسے آن لائن پڑھیں]۔",
"version-software": "نصب شدہ سافٹ ویئر",
"version-software-product": "مصنوعات",
"version-software-version": "نسخہ",
"version-libraries-license": "اجازت نامہ",
"version-libraries-description": "وضاحت",
"version-libraries-authors": "مصنف",
+ "redirect": "فائل، صارف، صفحہ، نسخہ، یا نوشتہ کی شناخت سے رجوع مکرر",
+ "redirect-summary": "اس خصوصی صفحہ کے ذریعہ فائل (درج کردہ فائل نام)، صفحہ (صفحہ یا نسخہ کا درج کردہ شناختی نمبر)، صفحہ صارف (صارف کا درج کردہ شناختی نمبر) یا اندراج نوشتہ (نوشتہ کا درج کردہ شناختی نمبر) کا رجوع مکرر حاصل کیا جا سکتا ہے۔ طریقہ استعمال: [[{{#Special:Redirect}}/file/Example.jpg]]، \n[[{{#Special:Redirect}}/page/64308]]، [[{{#Special:Redirect}}/revision/328429]] یا [[{{#Special:Redirect}}/user/101]] یا \n[[{{#Special:Redirect}}/logid/186]]۔",
"redirect-submit": "چلیں",
"redirect-lookup": "تلاش:",
"redirect-value": "قدر:",
"redirect-logid": "نوشتہ کی شناخت",
"redirect-not-exists": "یہ قدر نہیں ملی",
"fileduplicatesearch": "مکرر فائلوں کی تلاش",
+ "fileduplicatesearch-summary": "ہیش قدروں کے مطابق مکرر فائلوں کو تلاش کریں۔",
"fileduplicatesearch-filename": "فائل کا نام:",
"fileduplicatesearch-submit": "تلاش",
"fileduplicatesearch-info": "$1 × $2 پکسل <br />فائل کا حجم: $3<br />MIME قسم: $4",
+ "fileduplicatesearch-result-1": "فائل «$1» کی کوئی نقل نہیں ہے۔",
+ "fileduplicatesearch-result-n": "فائل «$1» کی {{PLURAL:$2|1 نقل ہے|$2 نقلیں ہیں}}۔",
+ "fileduplicatesearch-noresults": "«$1» کے نام سے کوئی فائل نہیں مل سکی۔",
"specialpages": "خصوصی صفحات",
+ "specialpages-note-top": "وضاحت",
+ "specialpages-note": "* عام خصوصی صفحات۔\n* <span class=\"mw-specialpagerestricted\">ممنوع خصوصی صفحات</span>",
+ "specialpages-group-maintenance": "نگہداشت کی رپورٹیں",
+ "specialpages-group-other": "دیگر خصوصی صفحات",
+ "specialpages-group-login": "کھاتہ کھولیں یا اندراج کریں",
+ "specialpages-group-changes": "حالیہ تبدیلیاں اور نوشتہ جات",
+ "specialpages-group-media": "میڈیا رپورٹیں اور اپلوڈ کردہ",
+ "specialpages-group-users": "صارفین اور اختیارات",
+ "specialpages-group-highuse": "کثیر مستعمل صفحات",
"specialpages-group-pages": "فہارست صفحات",
+ "specialpages-group-pagetools": "آلات صفحہ",
+ "specialpages-group-wiki": "ڈیٹا اور آلات",
+ "specialpages-group-redirects": "رجوع مکرر کے حامل خصوصی صفحات",
+ "specialpages-group-spam": "آلات فاضل کاری",
+ "specialpages-group-developer": "آلات ترقی دہندہ",
+ "blankpage": "خالی صفحہ",
+ "intentionallyblankpage": "اس صفحہ کو دانستہ خالی چھوڑا گیا ہے۔",
+ "external_image_whitelist": "#اس سطر کو ہو بہو ایسا ہی رہنے دیں<pre>\n#ذیل میں ریجیکس کی عبارتیں درج کریں (محض // کے درمیان)\n#ان عبارتوں کی بیرونی تصویروں کے روابط سے مطابقت کی جائے گی\n#جو مطابق ہو جائیں وہ تصویر کے طور پر نظر آئیں گے ورنہ محض تصویر کا ربط ظاہر ہوگا\n# علامت # سے شرع ہونے والی سطروں کو تبصرہ سمجھا جائے گا\n#چھوٹے بڑے حروف کو نظر انداز کیا جائے گا\n\nریجیکس کی تمام عبارتوں کو اس سطر کے اوپر رکھیں۔ اس سطر کو ہو بہو ایسا ہی رہنے دیں</pre>",
+ "tags": "تبدیلی کے درست ٹیگ",
"tag-filter": "[[Special:Tags|لوحہ]] فلٹر:",
- "tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|ٹیگ|ٹیگ}}]]: $2)",
+ "tag-filter-submit": "مقطار",
+ "tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|ٹیگ}}]]: $2)",
+ "tag-mw-contentmodelchange": "مواد کے ماڈل میں تبدیلی",
+ "tag-mw-contentmodelchange-description": "ترامیم جو صفحہ کے [https://www.mediawiki.org/wiki/Special:MyLanguage/Help:ChangeContentModel مواد کے ماڈل کو تبدیل کرتی ہیں]",
+ "tags-title": "ٹیگ",
+ "tags-intro": "اس صفحہ میں ان تمام ٹیگوں کی فہرست درج ہے، جنہیں سافٹ ویئر کسی ترمیم پر مفہوم کے ساتھ نشان زد کرتا ہے۔",
+ "tags-tag": "ٹیگ کا نام",
+ "tags-display-header": "تبدیلی کی فہرستوں میں نمائش",
+ "tags-description-header": "مکمل وضاحت",
"tags-source-header": "ماخذ",
"tags-active-header": "فعال؟",
+ "tags-hitcount-header": "ٹیگ شدہ تبدیلیاں",
+ "tags-actions-header": "اقدامات",
"tags-active-yes": "ہاں",
"tags-active-no": "نہیں",
+ "tags-source-extension": "سافٹ ویئر کے وضاحت کردہ",
+ "tags-source-manual": "صارفین اور روبہ جات کی جانب سے دستی طور پر لگائے گئے",
+ "tags-source-none": "اب مستعمل نہیں",
"tags-edit": "ترمیم",
"tags-delete": "حذف",
"tags-activate": "فعال کریں",
"tags-deactivate": "غیر فعال کریں",
"tags-hitcount": "$1 {{PLURAL:$1|تبدیلی|تبدیلیاں}}",
+ "tags-manage-no-permission": "آپ کو تبدیلی کے ٹیگوں کے انتظام کی اجازت نہیں ہے۔",
+ "tags-manage-blocked": "آپ بحالت پابندی تبدیلی کے ٹیگوں کا انتظام نہیں کر سکتے۔",
+ "tags-create-heading": "نیا ٹیگ بنائیں",
+ "tags-create-explanation": "ابتدائی طور پر نو تخلیق شدہ ٹیگ صارفین اور روبہ جات کے استعمال کے لیے دستیاب ہونگے۔",
"tags-create-tag-name": "ٹیگ کا نام:",
"tags-create-reason": "وجہ:",
- "tags-create-submit": "تخÙ\84Û\8cÙ\82",
+ "tags-create-submit": "بÙ\86ائÛ\8cÚº",
"tags-create-no-name": "آپ نے ایک ٹیگ کا نام دینا ہو گا۔",
+ "tags-create-invalid-chars": "ٹیگوں کے نام میں فاصلے (<code>,</code>) یا فارورڈ سلیش (<code>/</code>) نہیں ہونے چاہئیں۔",
+ "tags-create-invalid-title-chars": "ٹیگوں کے نام میں ایسے حروف کے استعمال کی اجازت نہیں جنہیں صفحات کے عناوین میں استعمال نہیں کیا جا سکتا۔",
+ "tags-create-already-exists": "ٹیگ \"$1\" پہلے سے موجود ہے۔",
+ "tags-create-warnings-above": " \"$1\" نامی ٹیگ بنانے کے دوران میں درج ذیل {{PLURAL:$2|انتباہ دیا گیا|انتباہات دیے گئے}}:",
+ "tags-create-warnings-below": "کیا آپ واقعی ٹیگ سازی جاری رکھنا چاہتے ہیں؟",
"tags-delete-title": "حذف ٹیگ",
+ "tags-delete-explanation-initial": "آپ «$1» ٹیگ کو ڈیٹابیس سے حذف کرنے جا رہے ہیں۔",
"tags-delete-reason": "وجہ:",
+ "tags-delete-not-found": "«$1» ٹیگ موجود نہیں ہے۔",
+ "tags-delete-no-permission": "آپ کو تبدیلی کے ٹیگ حذف کرنے کی اجازت نہیں۔",
"tags-activate-title": "ٹیگ فعال",
+ "tags-activate-question": "آپ «$1» ٹیگ کو فعال کرنے جا رہے ہیں۔",
"tags-activate-reason": "وجہ:",
+ "tags-activate-not-allowed": "«$1» ٹیگ کو فعال کرنا ممکن نہیں۔",
+ "tags-activate-not-found": "«$1» ٹیگ موجود نہیں ہے۔",
"tags-activate-submit": "فعال",
"tags-deactivate-title": "ٹیگ غیر فعال",
+ "tags-deactivate-question": "آپ «$1» ٹیگ کو غیر فعال کرنے جا رہے ہیں۔",
"tags-deactivate-reason": "وجہ:",
+ "tags-deactivate-not-allowed": "«$1» ٹیگ کو غیر فعال کرنا ممکن نہیں۔",
"tags-deactivate-submit": "غیر فعال",
+ "tags-apply-no-permission": "آپ کو اپنی تبدیلیوں پر تبدیلی کے ٹیگوں کو نافذ کرنے کی اجازت نہیں ہے۔",
+ "tags-apply-blocked": "بحالت پابندی آپ اپنی تبدیلیوں پر تبدیلی کے ٹیگ نافذ نہیں کر سکتے۔",
+ "tags-apply-not-allowed-one": "«$1» ٹیگ کو دستی طور پر نافذ کرنے کی اجازت نہیں ہے۔",
+ "tags-apply-not-allowed-multi": "درج ذیل {{PLURAL:$2|ٹیگ|ٹیگوں}} کو دستی طور پر نافذ کرنے کی اجازت نہیں ہے: $1",
+ "tags-update-no-permission": "آپ کو انفرادی نسخوں یا نوشتہ کے اندراجات سے تبدیلی کے ٹیگوں کو ہٹانے یا ان میں لگانے کی اجازت نہیں ہے۔",
+ "tags-update-blocked": "بحالت پابندی آپ تبدیلی کے ٹیگوں کو لگا یا ہٹا نہیں سکتے۔",
+ "tags-update-add-not-allowed-one": "«$1» ٹیگ کو دستی طور پر لگانے کی اجازت نہیں ہے۔",
+ "tags-update-add-not-allowed-multi": "درج ذیل {{PLURAL:$2|ٹیگ|ٹیگوں}} کو دستی طور پر لگانے کی اجازت نہیں ہے: $1",
+ "tags-update-remove-not-allowed-one": "«$1» کو ہٹانے کی اجازت نہیں ہے۔",
+ "tags-update-remove-not-allowed-multi": "درج ذیل {{PLURAL:$2|ٹیگ|ٹیگوں}} کو دستی طور پر ہٹانے کی اجازت نہیں ہے: $1",
"tags-edit-title": "ٹیگ میں ترمیم",
"tags-edit-manage-link": "ٹیگ کا انتظام",
+ "tags-edit-revision-selected": "[[:$2]] {{PLURAL:$1|کا منتخب نسخہ|کے منتخب نسخے}}:",
+ "tags-edit-logentry-selected": "{{PLURAL:$1|منتخب واقعۂ نوشتہ|منتخب واقعاتِ نوشتہ}}:",
+ "tags-edit-revision-legend": "{{PLURAL:$1|اس نسخے|ان تمام $1 نسخوں}} میں ٹیگ لگائیں یا ان سے ہٹائیں",
+ "tags-edit-logentry-legend": "{{PLURAL:$1|اس اندراج نوشتہ|ان تمام $1 اندراجات نوشتہ}} میں ٹیگ لگائیں یا ان سے ہٹائیں",
"tags-edit-existing-tags": "موجودہ ٹیگ:",
"tags-edit-existing-tags-none": "<em>کوئی نہیں</em>",
"tags-edit-new-tags": "نئے ٹیگ:",
"tags-edit-chosen-placeholder": "کچھ ٹیگ منتخب کریں",
"tags-edit-chosen-no-results": "اس کے مشابہ کوئی ٹیگ نہیں ملا",
"tags-edit-reason": "وجہ:",
+ "tags-edit-revision-submit": "{{PLURAL:$1|اس نسخے|$1 نسخوں}} میں تبدیلیاں نافذ کریں",
+ "tags-edit-logentry-submit": "{{PLURAL:$1|اس اندراج نوشتہ|$1 اندراجات نوشتہ}} میں تبدیلیاں نافذ کریں",
+ "tags-edit-success": "تبدیلیاں نافذ کر دی گئیں۔",
+ "tags-edit-failure": "تبدیلیاں نافذ نہیں کی جا سکیں:\n$1",
+ "tags-edit-nooldid-title": "نادرست ہدف نسخہ",
"comparepages": "صفحات کا موازنہ کریں",
"compare-page1": "صفحہ 1",
"compare-page2": "صفحہ 2",
"compare-revision-not-exists": "آپ کی اختصاصی نظرثانی موجود نہیں۔",
"dberr-problems": "افسوس! اس ویب سائٹ کو تکنیکی مشکلات کا سامنا ہے۔",
"dberr-again": "چند منٹ انتظار کے بعد دوبارہ کوشش کریں۔",
+ "htmlform-invalid-input": "آپ کے اندراج میں کچھ مسائل ہیں۔",
+ "htmlform-select-badoption": "آپ کی درج کردہ قدر درست اختیار نہیں ہے۔",
+ "htmlform-int-invalid": "آپ کی درج کردہ قدر عدد صحیح نہیں ہے۔",
+ "htmlform-float-invalid": "آپ کی درج کردہ قدر عدد نہیں ہے۔",
+ "htmlform-int-toolow": "آپ کی درج کردہ قدر کمترین حد یعنی $1 سے کم ہے۔",
+ "htmlform-int-toohigh": "آپ کی درج کردہ قدر $1 سے زیادہ ہے۔",
+ "htmlform-required": "یہ قدر درکار ہے۔",
"htmlform-submit": "ٹھیک ہے",
"htmlform-reset": "رد ترامیم",
"htmlform-selectorother-other": "دیگر",
"htmlform-cloner-create": "مزید اضافہ کریں",
"htmlform-cloner-delete": "حذف",
"htmlform-cloner-required": "کم ازکم ایک قدر درکار ہے۔",
+ "htmlform-title-badnamespace": "[[:$1]] صفحہ \"{{ns:$2}}\" نام فضا میں موجود نہیں۔",
+ "htmlform-title-not-creatable": "«$1» عنوان قابل تخلیق نہیں",
+ "htmlform-title-not-exists": "$1 موجود نہیں ہے۔",
+ "htmlform-user-not-exists": "<strong>$1</strong> موجود نہیں ہے۔",
+ "htmlform-user-not-valid": "<strong>$1</strong> درست صارف نام نہیں ہے۔",
"logentry-delete-delete": "$1 {{GENDER:$2|حذف کیا گیا}} صفحہ $3",
+ "logentry-delete-restore": "$1 نے صفحہ $3 کو {{GENDER:$2|بحال کیا}}",
+ "logentry-delete-event": "$1 نے $3 میں موجود {{PLURAL:$5|ایک واقعۂ نوشتہ|$5 واقعات نوشتہ}} کی مرئیت کو {{GENDER:$2|تبدیل کیا}}: $4",
+ "logentry-delete-revision": "$1 نے $3 میں موجود {{PLURAL:$5|ایک نسخے|$5 نسخوں}} کی مرئیت کو {{GENDER:$2|تبدیل کیا}}: $4",
+ "logentry-delete-event-legacy": "$1 نے $3 میں موجود واقعات نوشتہ کی مرئیت کو {{GENDER:$2|تبدیل کیا}}",
+ "logentry-delete-revision-legacy": "$1 نے $3 میں موجود نسخوں کی مرئیت کو {{GENDER:$2|تبدیل کیا}}",
+ "logentry-suppress-delete": "$1 نے صفحہ $3 کو {{GENDER:$2|پوشیدہ کیا}}",
+ "logentry-suppress-event": "$1 نے $3 میں موجود {{PLURAL:$5|ایک واقعۂ نوشتہ|$5 واقعات نوشتہ}} کی مرئیت کو خفیہ طور پر {{GENDER:$2|تبدیل کیا}}: $4",
+ "logentry-suppress-revision": "$1 نے $3 میں موجود {{PLURAL:$5|ایک نسخے|$5 نسخوں}} کی مرئیت کو خفیہ طور پر {{GENDER:$2|تبدیل کیا}}: $4",
+ "logentry-suppress-event-legacy": "$1 نے $3 میں موجود واقعات نوشتہ کی مرئیت کو خفیہ طور پر {{GENDER:$2|تبدیل کیا}}",
+ "logentry-suppress-revision-legacy": "$1 نے $3 میں موجود نسخوں کی مرئیت کو خفیہ طور پر {{GENDER:$2|تبدیل کیا}}",
+ "revdelete-content-hid": "مواد کو پوشیدہ کرد یا گیا",
+ "revdelete-summary-hid": "خلاصہ ترمیم کو پوشیدہ کر دیا گیا",
+ "revdelete-uname-hid": "صارف نام کو پوشیدہ کر دیا گیا",
+ "revdelete-content-unhid": "مواد کی پوشیدگی ختم کی گئی",
+ "revdelete-summary-unhid": "خلاصہ ترمیم کی پوشیدگی ختم کی گئی",
+ "revdelete-uname-unhid": "صارف نام کی پوشیدگی ختم کی گئی",
+ "revdelete-restricted": "منتظمین کو محدود کر دیا گیا",
+ "revdelete-unrestricted": "منتظمین کے لیے کھول دیا گیا",
+ "logentry-block-block": "$1 نے {{GENDER:$4|$3}} پر $5 کے وقت اختتام تک {{GENDER:$2|پابندی لگائی}} $6",
+ "logentry-block-unblock": "$1 نے {{GENDER:$4|$3}} سے {{GENDER:$2|پابندی اٹھائی}}",
"logentry-move-move": "$1 نے صفحہ $3 کو $4 کی جانب منتقل کیا",
"logentry-move-move_redir-noredirect": "$1 نے صفحہ $3 کو رجوع مکرر چھوڑے بغیر $4 کی جانب جو رجوع مکر تھا {{GENDER:$2|منتقل کیا}}",
"logentry-newusers-create": "صارف کھاتہ $1 {{GENDER:$2|بنایا گیا}}",
"logentry-protect-modify": "$1 نے $3 کا درجۂ حفاظت {{GENDER:$2|تبدیل کیا}} $4",
"logentry-rights-rights": "$1 نے {{GENDER:$6|$3}} کی گروہی رکنیت از $4 تا $5 {{GENDER:$2|تبدیل کی}}",
"logentry-upload-upload": "$1 {{GENDER:$2|اپلوڈ}} $3",
+ "log-name-tag": "نوشتہ ٹیگ",
"rightsnone": "(کچھ نہیں)",
"revdelete-summary": "خلاصۂ تدوین",
"feedback-back": "واپس",
"feedback-cancel": "منسوخ",
"feedback-close": "مکمل",
+ "feedback-dialog-title": "تبصرہ روانہ کریں",
+ "feedback-error-title": "نقص",
+ "feedback-error1": "نقص: اے پی آئی کی جانب سے غیر معروف نتیجہ",
+ "feedback-error2": "نقص: ترمیم ناکام ہو گئی",
+ "feedback-error3": "نقص: اے پی آئی سے کوئی جواب نہیں",
+ "feedback-message": "پیغام:",
+ "feedback-subject": "موضوع:",
+ "feedback-submit": "روانہ کریں",
"feedback-thanks-title": "شکریہ!",
"searchsuggest-search": "تلاش",
"searchsuggest-containing": "نتائج...",
+ "api-error-file-too-large": "آپ کی ارسال کردہ فائل بہت بڑی تھی۔",
+ "api-error-filename-tooshort": "فائل کا نام انتہائی مختصر ہے۔",
+ "api-error-filetype-banned": "فائل کی اس قسم پر پابندی عائد ہے۔",
+ "api-error-filetype-missing": "فائل کی توسیع موجود نہیں",
+ "api-error-illegal-filename": "اس نام کی فائل ممنوع ہے۔",
+ "api-error-unclassified": "نامعلوم نقص واقع ہوا۔",
+ "api-error-unknown-code": "نامعلوم نقص: \"$1\" ۔",
+ "api-error-uploaddisabled": "اس ویکی پر اپلوڈ کی سہولت غیر فعال ہے۔",
+ "api-error-verification-error": "شاید فائل خراب ہے یا غلط توسیع کی حامل ہے۔",
"duration-seconds": "$1 {{PLURAL:$1|سیکنڈ}}",
"duration-minutes": "$1 {{PLURAL:$1|منٹ}}",
"duration-hours": "$1 {{PLURAL:$1|گھنٹہ|گھنٹے}}",
"duration-decades": "$1 {{PLURAL:$1|دہائی|دہائیاں}}",
"duration-centuries": "$1 {{PLURAL:$1|صدی|صدیاں}}",
"duration-millennia": "$1 {{PLURAL:$1|ہزاریے|ہزاریہ}}",
+ "limitreport-cputime-value": "$1 {{PLURAL:$1|سیکنڈ}}",
"limitreport-walltime-value": "$1 {{PLURAL:$1|سیکنڈ}}",
"limitreport-postexpandincludesize-value": "$1/$2 {{PLURAL:$2|بائٹ}}",
+ "limitreport-templateargumentsize-value": "$1/$2 {{PLURAL:$2|بائٹ}}",
"expandtemplates": "سانچے کو وسیع کریں",
"expand_templates_input": "ان پٹ متن:",
"expand_templates_output": "نتیجہ",
"expand_templates_ok": "ٹھیک ہے",
"expand_templates_remove_comments": "تبصرے حذف کریں",
+ "expand_templates_generate_rawhtml": "خام اہچ ٹی ایم ایل دکھائیں",
"expand_templates_preview": "پیش نظارہ",
"pagelanguage": "صفحے کی زبان تبدیل کریں",
"pagelang-name": "صفحہ",
"log-description-pagelang": "ذیل میں زبانوں کے صفحہ میں ہونے والی تبدیلیوں کا نوشتہ ہے۔",
"default-skin-not-found-row-enabled": "* <code>$1</code> / $2 (فعال)",
"mediastatistics": "میڈیا کے اعداد و شمار",
+ "mediastatistics-table-mimetype": "MIME قسم",
+ "mediastatistics-table-extensions": "ممکنہ توسیعات",
+ "mediastatistics-table-count": "فائلوں کی تعداد",
+ "mediastatistics-table-totalbytes": "مشترکہ حجم",
"mediastatistics-header-unknown": "نامعلوم",
+ "mediastatistics-header-bitmap": "بٹ میپ تصویریں",
+ "mediastatistics-header-drawing": "خاکے (ویکٹر تصویریں)",
+ "mediastatistics-header-audio": "آڈیو",
+ "mediastatistics-header-video": "ویڈیو",
"mediastatistics-header-office": "دفتر",
+ "mediastatistics-header-text": "متنی",
+ "mediastatistics-header-executable": "قابل تنفیذ",
+ "mediastatistics-header-archive": "کمپریس شدہ فارمیٹ",
+ "mediastatistics-header-total": "تمام فائلیں",
+ "json-error-unknown": "جے سن میں کوئی مسئلہ تھا۔ نقص: $1",
+ "json-error-syntax": "نحوی غلطی",
+ "headline-anchor-title": "اس قطعہ کا ربط",
"special-characters-group-latin": "لاطینی محارف",
"special-characters-group-latinextended": "وسیع لاطینی",
+ "special-characters-group-ipa": "آئی پی اے",
"special-characters-group-symbols": "علامات",
"special-characters-group-greek": "یونانی",
+ "special-characters-group-greekextended": "وسیع یونانی",
+ "special-characters-group-cyrillic": "سیریلیائی",
"special-characters-group-arabic": "عربی",
"special-characters-group-arabicextended": "عربی توسیع شدہ",
"special-characters-group-persian": "فارسی",
"special-characters-group-telugu": "تلگو",
"special-characters-group-sinhala": "سنگھالی",
"special-characters-group-gujarati": "گجراتی",
+ "special-characters-group-devanagari": "دیوناگری",
"special-characters-group-thai": "سیامی",
"special-characters-group-lao": "لاوسی",
- "special-characters-group-khmer": "کھمیری"
+ "special-characters-group-khmer": "کھمیری",
+ "special-characters-title-endash": "خط فاصلہ",
+ "special-characters-title-emdash": "خط فاصل کشیدہ",
+ "special-characters-title-minus": "علامت وضع",
+ "mw-widgets-dateinput-no-date": "کسی تاریخ کو منتخب نہیں کیا گیا",
+ "mw-widgets-titleinput-description-new-page": "صفحہ ابھی تک موجود نہیں",
+ "mw-widgets-titleinput-description-redirect": "$1 کا رجوع مکرر",
+ "sessionprovider-generic": "$1 کی نشستیں",
+ "sessionprovider-mediawiki-session-cookiesessionprovider": "کوکی پر مبنی نشستیں",
+ "sessionprovider-nocookies": "شاید کوکی غیر فعال ہے۔ براہ کرم کوکی فعال کرنے کے بعد دوبارہ کوشش کریں۔",
+ "log-action-filter-block": "پابندی کی نوعیت:",
+ "log-action-filter-contentmodel": "مواد کے ماڈل کی تبدیلی کی نوعیت:",
+ "log-action-filter-delete": "حذف کی نوعیت:",
+ "log-action-filter-import": "درآمد کی نوعیت:",
+ "log-action-filter-managetags": "انتظام ٹیگ کے اقدام کی نوعیت:",
+ "log-action-filter-move": "منتقلی کی نوعیت:",
+ "log-action-filter-newusers": "کھاتہ سازی کی نوعیت:",
+ "log-action-filter-patrol": "مراجعت کی نوعیت:",
+ "log-action-filter-protect": "حفاظت کی نوعیت:",
+ "log-action-filter-rights": "تبدیلیٔ اختیار کی نوعیت:",
+ "log-action-filter-suppress": "پوشیدگی کی نوعیت:",
+ "log-action-filter-upload": "اپلوڈ کی نوعیت:",
+ "log-action-filter-all": "تمام",
+ "log-action-filter-block-block": "پابندی",
+ "log-action-filter-block-reblock": "تبدیلیٔ پابندی",
+ "log-action-filter-block-unblock": "پابندی ختم",
+ "log-action-filter-contentmodel-change": "مواد کے ماڈل کی تبدیلی",
+ "log-action-filter-contentmodel-new": "غیر معیاری contentmodel پر مشتمل صفحہ سازی",
+ "log-action-filter-delete-delete": "صفحہ کی حذف شدگی",
+ "log-action-filter-delete-restore": "صفحہ کی بحالی",
+ "log-action-filter-delete-event": "نوشتہ کی حذف شدگی",
+ "log-action-filter-delete-revision": "ترمیم کی حذف شدگی",
+ "log-action-filter-import-interwiki": "ماورائے ویکی درآمد",
+ "log-action-filter-import-upload": "ایکس ایم ایل اپلوڈ کی مدد سے درآمد",
+ "log-action-filter-managetags-create": "ٹیگ سازی",
+ "log-action-filter-managetags-delete": "ٹیگ کی حذف شدگی",
+ "log-action-filter-managetags-activate": "ٹیگ کی فعالی",
+ "log-action-filter-managetags-deactivate": "ٹیگ کی غیر فعالی",
+ "log-action-filter-move-move": "رجوع مکررات کو برتحریر کیے بغیر منتقلی",
+ "log-action-filter-move-move_redir": "رجوع مکررات کی برتحریری کے ساتھ منتقلی",
+ "log-action-filter-newusers-create": "گمنام صارف کی تخلیق",
+ "log-action-filter-newusers-create2": "مندرج صارف کی تخلیق",
+ "log-action-filter-newusers-autocreate": "خودکار تخلیق",
+ "log-action-filter-newusers-byemail": "برقی خط کے ذریعہ بھیجے گئے پاس ورڈ کی مدد سے تخلیق",
+ "log-action-filter-patrol-patrol": "دستی مراجعت",
+ "log-action-filter-patrol-autopatrol": "خودکار مراجعت",
+ "log-action-filter-protect-protect": "حفاظت",
+ "log-action-filter-protect-modify": "تبدیلیٔ حفاظت",
+ "log-action-filter-protect-unprotect": "اختتام حفاظت",
+ "log-action-filter-protect-move_prot": "منتقلیٔ حفاظت",
+ "log-action-filter-rights-rights": "دستی تبدیلی",
+ "log-action-filter-rights-autopromote": "خود کار تبدیلی",
+ "log-action-filter-suppress-event": "نوشتہ کی پوشیدگی",
+ "log-action-filter-suppress-revision": "نسخے کی پوشیدگی",
+ "log-action-filter-suppress-delete": "صفحہ کی پوشیدگی",
+ "log-action-filter-suppress-block": "بذریعہ پابندی صارف کی پوشیدگی",
+ "log-action-filter-suppress-reblock": "بذریعہ باز پابندی صارف کی پوشیدگی",
+ "log-action-filter-upload-upload": "نیا اپلوڈ",
+ "log-action-filter-upload-overwrite": "دوبارہ لوڈ",
+ "authmanager-authn-autocreate-failed": "خودکار مقامی کھاتہ سازی ناکام: $1",
+ "authmanager-create-disabled": "کھاتہ سازی غیر فعال ہے۔",
+ "authmanager-authplugin-setpass-failed-title": "پاس ورڈ کی تبدیلی ناکام رہی",
+ "authmanager-authplugin-setpass-bad-domain": "نادرست ڈومین۔",
+ "authmanager-autocreate-noperm": "خودکار کھاتہ سازی کی اجازت نہیں ہے۔",
+ "authmanager-autocreate-exception": "سابقہ نقص کی وجہ سے عارضی طور پر خودکار کھاتہ سازی غیر فعال ہے۔",
+ "authmanager-userdoesnotexist": "«$1» کے نام سے صارف کھاتہ مندرج نہیں ہے۔",
+ "authmanager-username-help": "صارف نام برائے تصدیق",
+ "authmanager-password-help": "پاس ورڈ برائے تصدیق",
+ "authmanager-domain-help": "ڈومین برائے خارجی تصدیق",
+ "authmanager-retype-help": "تصدیق کے لیے دوبارہ پاس ورڈ درج کریں",
+ "authmanager-email-label": "برقی خط",
+ "authmanager-email-help": "برقی ڈاک پتا",
+ "authmanager-realname-label": "حقیقی نام",
+ "authmanager-realname-help": "صارف کا حقیقی نام",
+ "authmanager-provider-password": "پاس ورڈ پر مبنی تصدیق",
+ "authmanager-provider-password-domain": "پاس ورڈ اور ڈومین پر مبنی تصدیق",
+ "authmanager-provider-temporarypassword": "عارضی پاس ورڈ",
+ "authprovider-confirmlink-request-label": "جن کھاتوں کو مربوط کرنا ہو",
+ "authprovider-confirmlink-success-line": "$1: کامیابی سے مربوط کر دیے گئے۔",
+ "authprovider-resetpass-skip-label": "آگے بڑھیں",
+ "authprovider-resetpass-skip-help": "پاس ورڈ کی ترتیب نو کو رہنے دیں",
+ "authform-notoken": "ٹوکن مفقود",
+ "authform-wrongtoken": "غلط ٹوکن",
+ "specialpage-securitylevel-not-allowed-title": "اجازت نہیں",
+ "cannotauth-not-allowed-title": "اجازت رد کر دی گئی",
+ "cannotauth-not-allowed": "آپ کو اس صفحہ کے استعمال کی اجازت نہیں",
+ "changecredentials": "وثیقوں کو تبدیل کریں",
+ "changecredentials-submit": "وثیقوں کو تبدیل کریں",
+ "changecredentials-success": "آپ کے وثیقے تبدیل کر دیے گئے۔",
+ "removecredentials": "وثیقے حذف کریں",
+ "removecredentials-submit": "وثیقے حذف کریں",
+ "removecredentials-success": "آپ کے وثیقے حذف کر دیے گئے۔",
+ "credentialsform-provider": "وثیقوں کی نوعیت:",
+ "credentialsform-account": "کھاتے کا نام:",
+ "cannotlink-no-provider-title": "قابل ربط کھاتے موجود نہیں ہیں",
+ "cannotlink-no-provider": "قابل ربط کھاتے موجود نہیں ہیں۔",
+ "linkaccounts": "کھاتوں کو مربوط کریں",
+ "linkaccounts-success-text": "کھاتے کو مربوط کر دیا گیا۔",
+ "linkaccounts-submit": "کھاتوں کو مربوط کریں",
+ "unlinkaccounts": "مربوط کھاتوں کو علاحدہ کریں",
+ "unlinkaccounts-success": "مربوط کھاتہ علاحدہ کر دیا گیا۔",
+ "userjsispublic": "براہ کرم اس بات کا خیال رکھیں کہ جاوا اسکرپٹ کے ذیلی صفحات میں خفیہ معلومات نہیں رکھی جانی چاہئیں کیونکہ ان صفحات کو دیگر صارفین بھی دیکھ سکتے ہیں۔",
+ "usercssispublic": "براہ کرم اس بات کا خیال رکھیں کہ سی ایس ایس کے ذیلی صفحات میں خفیہ معلومات نہیں رکھی جانی چاہئیں کیونکہ ان صفحات کو دیگر صارفین بھی دیکھ سکتے ہیں۔"
}
"passwordreset-emailelement": "用户名：\n$1\n\n临时密码：\n$2",
"passwordreset-emailsentemail": "如果此邮件地址与您的账户相关联的话，将发送一封密码重置邮件。",
"passwordreset-emailsentusername": "如果有邮件地址与此用户名相关联的话，将发送一封密码重置邮件。",
- "passwordreset-emailsent-capture2": "密码重置{{PLURAL:$1|邮件}}已发送。{{PLURAL:$1|用户名和密码|用户名和密码列表}}在下方显示。",
- "passwordreset-emailerror-capture2": "向{{GENDER:$2|用户}}发送电子邮件失败：$1 {{PLURAL:$3|用户名和密码|用户名和密码列表}}在下方显示。",
+ "passwordreset-emailsent-capture2": "密码重置{{PLURAL:$1|邮件}}已发送。{{PLURAL:$1|用户名和密码|用户名和密码列表}}在此显示。",
+ "passwordreset-emailerror-capture2": "向{{GENDER:$2|用户}}发送电子邮件失败：$1 {{PLURAL:$3|用户名和密码|用户名和密码列表}}在此显示。",
"passwordreset-nocaller": "必须提供一个调用方",
"passwordreset-nosuchcaller": "调用方不存在：$1",
"passwordreset-ignored": "密码重置没有处理。也许没有配置提供者？",
"shown-title": "每页显示$1项结果",
"viewprevnext": "查看（$1{{int:pipe-separator}}$2）（$3）",
"searchmenu-exists": "<strong>本wiki上有名为“[[:$1]]”的页面。</strong>{{PLURAL:$2|0=|另请查看找到的其他搜索结果。}}",
- "searchmenu-new": "<strong>在本Wiki上新建名为“[[:$1]]”的页面！</strong>{{PLURAL:$2|0=|另请查看您的搜索找的结果。|另请查看搜索结果。}}",
+ "searchmenu-new": "<strong>在本Wiki上新建名为“[[:$1]]”的页面！</strong>{{PLURAL:$2|0=|另请查看您的搜索找到的结果。|另请查看搜索结果。}}",
"searchprofile-articles": "内容页面",
"searchprofile-images": "多媒体",
"searchprofile-everything": "全部",
* @param integer $db DB index (DB_REPLICA/DB_MASTER)
* @param array $groups; default: empty array
* @param string|bool $wiki; default: current wiki
- * @return IDatabase
+ * @return Database
*/
protected function getDB( $db, $groups = [], $wiki = false ) {
if ( is_null( $this->mDb ) ) {
if ( isset( $options['dry'] ) ) {
echo " publishing {$file} by '" . $wgUser->getName() . "', comment '$commentText'... ";
} else {
- $props = FSFile::getPropsFromPath( $file );
+ $mwProps = new MWFileProps( MimeMagic::singleton() );
+ $props = $mwProps->getPropsFromPath( $file, true );
$flags = 0;
$publishOptions = [];
$handler = MediaHandler::getHandler( $props['mime'] );
$status = $be->prepare( [
'dir' => dirname( $dpath ), 'bypassReadOnly' => 1 ] );
if ( !$status->isOK() ) {
- $this->error( print_r( $status->getErrorsArray(), true ) );
+ $this->error( print_r( $status->getErrors(), true ) );
}
$batch[] = [ 'op' => 'copy', 'overwrite' => true,
$status = $be->prepare( [
'dir' => dirname( $dpath ), 'bypassReadOnly' => 1 ] );
if ( !$status->isOK() ) {
- $this->error( print_r( $status->getErrorsArray(), true ) );
+ $this->error( print_r( $status->getErrors(), true ) );
}
$batch[] = [ 'op' => 'copy', 'overwrite' => true,
'src' => $spath, 'dst' => $dpath, 'img' => $ofile->getArchiveName() ];
$status = $be->prepare( [
'dir' => dirname( $dpath ), 'bypassReadOnly' => 1 ] );
if ( !$status->isOK() ) {
- $this->error( print_r( $status->getErrorsArray(), true ) );
+ $this->error( print_r( $status->getErrors(), true ) );
}
$batch[] = [ 'op' => 'copy', 'src' => $spath, 'dst' => $dpath,
$status = $be->doOperations( $ops, [ 'bypassReadOnly' => 1 ] );
if ( !$status->isOK() ) {
- $this->output( print_r( $status->getErrorsArray(), true ) );
+ $this->output( print_r( $status->getErrors(), true ) );
}
$this->output( "Batch done\n\n" );
public function execute() {
$dbw = $this->getDB( DB_MASTER );
+ $updater = DatabaseUpdater::newForDB( $dbw, true, $this );
+
foreach ( $this->mArgs as $arg ) {
$files = [
$arg,
- $dbw->patchPath( $arg ),
- $dbw->patchPath( "patch-$arg.sql" ),
+ $updater->patchPath( $dbw, $arg ),
+ $updater->patchPath( $dbw, "patch-$arg.sql" ),
];
foreach ( $files as $file ) {
if ( file_exists( $file ) ) {
$end = null, $redirectsOnly = false, $oldRedirectsOnly = false
) {
$reportingInterval = 100;
- $dbr = $this->getDB( DB_REPLICA );
+ $dbr = $this->getDB( DB_REPLICA, [ 'vslow' ] );
if ( $start === null ) {
$start = 1;
) {
wfWaitForSlaves();
$this->output( "Deleting illegal entries from the links tables...\n" );
- $dbr = $this->getDB( DB_REPLICA );
+ $dbr = $this->getDB( DB_REPLICA, [ 'vslow' ] );
do {
// Find the start of the next chunk. This is based only
// on existent page_ids.
*/
private function dfnCheckInterval( $start = null, $end = null, $batchSize = 100 ) {
$dbw = $this->getDB( DB_MASTER );
- $dbr = $this->getDB( DB_REPLICA );
+ $dbr = $this->getDB( DB_REPLICA, [ 'vslow' ] );
$linksTables = [ // table name => page_id field
'pagelinks' => 'pl_from',
$this->error( "The server selected ({$db->getServer()}) is not a replica DB.", 1 );
}
+ if ( $index === DB_MASTER ) {
+ $updater = DatabaseUpdater::newForDB( $db, true, $this );
+ $db->setSchemaVars( $updater->getSchemaVars() );
+ }
+
if ( $this->hasArg( 0 ) ) {
$file = fopen( $this->getArg( 0 ), 'r' );
if ( !$file ) {
.button-colors-quiet( @textColor, @highlightColor, @activeColor ) {
// Quiet buttons all start gray, and reveal
// constructive/progressive/destructive color on hover and active.
- color: @textColor;
+ color: @colorButtonText;
&:hover {
background-color: transparent;
registry[ module ].state = 'executing';
runScript = function () {
- var script, markModuleReady, nestedAddScript, legacyWait,
+ var script, markModuleReady, nestedAddScript, legacyWait, implicitDependencies,
// Expand to include dependencies since we have to exclude both legacy modules
// and their dependencies from the legacyWait (to prevent a circular dependency).
legacyModules = resolve( mw.config.get( 'wgResourceLoaderLegacyModules', [] ) );
- try {
- script = registry[ module ].script;
- markModuleReady = function () {
- registry[ module ].state = 'ready';
- handlePending( module );
- };
- nestedAddScript = function ( arr, callback, i ) {
- // Recursively call queueModuleScript() in its own callback
- // for each element of arr.
- if ( i >= arr.length ) {
- // We're at the end of the array
- callback();
- return;
- }
- queueModuleScript( arr[ i ], module ).always( function () {
- nestedAddScript( arr, callback, i + 1 );
- } );
- };
+ script = registry[ module ].script;
+ markModuleReady = function () {
+ registry[ module ].state = 'ready';
+ handlePending( module );
+ };
+ nestedAddScript = function ( arr, callback, i ) {
+ // Recursively call queueModuleScript() in its own callback
+ // for each element of arr.
+ if ( i >= arr.length ) {
+ // We're at the end of the array
+ callback();
+ return;
+ }
- legacyWait = ( $.inArray( module, legacyModules ) !== -1 )
- ? $.Deferred().resolve()
- : mw.loader.using( legacyModules );
+ queueModuleScript( arr[ i ], module ).always( function () {
+ nestedAddScript( arr, callback, i + 1 );
+ } );
+ };
+
+ implicitDependencies = ( $.inArray( module, legacyModules ) !== -1 )
+ ? []
+ : legacyModules;
- legacyWait.always( function () {
+ if ( module === 'user' ) {
+ // Implicit dependency on the site module. Not real dependency because
+ // it should run after 'site' regardless of whether it succeeds or fails.
+ implicitDependencies.push( 'site' );
+ }
+
+ legacyWait = implicitDependencies.length
+ ? mw.loader.using( implicitDependencies )
+ : $.Deferred().resolve();
+
+ legacyWait.always( function () {
+ try {
if ( $.isArray( script ) ) {
nestedAddScript( script, markModuleReady, 0 );
} else if ( typeof script === 'function' ) {
// Site and user modules are legacy scripts that run in the global scope.
// This is transported as a string instead of a function to avoid needing
// to use string manipulation to undo the function wrapper.
- if ( module === 'user' ) {
- // Implicit dependency on the site module. Not real dependency because
- // it should run after 'site' regardless of whether it succeeds or fails.
- mw.loader.using( 'site' ).always( function () {
- $.globalEval( script );
- markModuleReady();
- } );
- } else {
- $.globalEval( script );
- markModuleReady();
- }
+ $.globalEval( script );
+ markModuleReady();
+
} else {
// Module without script
markModuleReady();
}
- } );
- } catch ( e ) {
- // This needs to NOT use mw.log because these errors are common in production mode
- // and not in debug mode, such as when a symbol that should be global isn't exported
- registry[ module ].state = 'error';
- mw.track( 'resourceloader.exception', { exception: e, module: module, source: 'module-execute' } );
- handlePending( module );
- }
+ } catch ( e ) {
+ // This needs to NOT use mw.log because these errors are common in production mode
+ // and not in debug mode, such as when a symbol that should be global isn't exported
+ registry[ module ].state = 'error';
+ mw.track( 'resourceloader.exception', { exception: e, module: module, source: 'module-execute' } );
+ handlePending( module );
+ }
+ } );
};
// Add localizations to message system
# tests/phpunit/mocks
'MockFSFile' => "$testDir/phpunit/mocks/filebackend/MockFSFile.php",
'MockFileBackend' => "$testDir/phpunit/mocks/filebackend/MockFileBackend.php",
+ 'MockLocalRepo' => "$testDir/phpunit/mocks/filerepo/MockLocalRepo.php",
'MockBitmapHandler' => "$testDir/phpunit/mocks/media/MockBitmapHandler.php",
'MockImageHandler' => "$testDir/phpunit/mocks/media/MockImageHandler.php",
'MockSvgHandler' => "$testDir/phpunit/mocks/media/MockSvgHandler.php",
$backend = new FSFileBackend( [
'name' => 'local-backend',
'wikiId' => wfWikiID(),
- 'basePath' => $this->uploadDir
+ 'basePath' => $this->uploadDir,
+ 'tmpDirectory' => wfTempDir()
] );
} elseif ( $this->fileBackendName ) {
global $wgFileBackends;
return new RepoGroup(
[
- 'class' => 'LocalRepo',
+ 'class' => 'MockLocalRepo',
'name' => 'local',
'url' => 'http://example.com/images',
'hashLevels' => 2,
private static $useTemporaryTables = true;
private static $reuseDB = false;
private static $dbSetup = false;
- private static $oldTablePrefix = false;
+ private static $oldTablePrefix = '';
/**
* Original value of PHP's error_reporting setting.
'_MediaWikiTitleCodec' => [ '_MediaWikiTitleCodec', MediaWikiTitleCodec::class ],
'TitleFormatter' => [ 'TitleFormatter', TitleFormatter::class ],
'TitleParser' => [ 'TitleParser', TitleParser::class ],
- 'VirtualRESTServiceClient' => [ 'VirtualRESTServiceClient', VirtualRESTServiceClient::class ]
+ 'VirtualRESTServiceClient' => [ 'VirtualRESTServiceClient', VirtualRESTServiceClient::class ],
+ 'ProxyLookup' => [ 'ProxyLookup', ProxyLookup::class ]
];
}
}
/**
+ * Test 'ok' and 'errors' getters.
*
+ * @covers Status::__get
*/
- public function testOkAndErrors() {
+ public function testOkAndErrorsGetters() {
$status = Status::newGood( 'foo' );
$this->assertTrue( $status->ok );
$status = Status::newFatal( 'foo', 1, 2 );
);
}
+ /**
+ * Test 'ok' setter.
+ *
+ * @covers Status::__set
+ */
+ public function testOkSetter() {
+ $status = new Status();
+ $status->ok = false;
+ $this->assertFalse( $status->isOK() );
+ $status->ok = true;
+ $this->assertTrue( $status->isOK() );
+ }
+
/**
* @dataProvider provideSetResult
* @covers Status::setResult
/**
* @dataProvider provideIsOk
- * @covers Status::isOk
+ * @covers Status::setOK
+ * @covers Status::isOK
*/
public function testIsOk( $ok ) {
$status = new Status();
- $status->ok = $ok;
+ $status->setOK( $ok );
$this->assertEquals( $ok, $status->isOK() );
}
*/
public function testIsGood( $ok, $errors, $expected ) {
$status = new Status();
- $status->ok = $ok;
+ $status->setOK( $ok );
foreach ( $errors as $error ) {
$status->warning( $error );
}
* @covers Status::error
* @covers Status::getErrorsArray
* @covers Status::getStatusArray
+ * @covers Status::getErrors
*/
public function testErrorWithMessage( $mockDetails ) {
$status = new Status();
];
$status = new Status();
- $status->ok = false;
+ $status->setOK( false );
$testCases['GoodButNoError'] = [
$status,
"Internal error: Status::getWikiText: Invalid result object: no error text but not OK\n",
];
$status = new Status();
- $status->ok = false;
+ $status->setOK( false );
$testCases['GoodButNoError'] = [
$status,
[ "Status::getMessage: Invalid result object: no error text but not OK\n" ],
/**
* @dataProvider provideErrorsWarningsOnly
- * @covers Status::getErrorsOnlyStatus
- * @covers Status::getWarningsOnlyStatus
+ * @covers Status::splitByErrorType
+ * @covers StatusValue::splitByErrorType
*/
public function testGetErrorsWarningsOnlyStatus( $errorText, $warningText, $type, $errorResult,
$warningResult
parent::setUp();
$this->oldServer = $_SERVER;
- IP::clearCaches();
}
protected function tearDown() {
$_SERVER = $this->oldServer;
- IP::clearCaches();
parent::tearDown();
}
public function testGetIP( $expected, $input, $squid, $xffList, $private, $description ) {
$_SERVER = $input;
$this->setMwGlobals( [
- 'wgSquidServersNoPurge' => $squid,
'wgUsePrivateIPs' => $private,
'wgHooks' => [
'IsTrustedProxy' => [
]
] );
+ $this->setService( 'ProxyLookup', new ProxyLookup( [], $squid ) );
+
$request = new WebRequest();
$result = $request->getIP();
$this->assertEquals( $expected, $result, $description );
'wgUsePrivateIPs' => false,
'wgHooks' => [],
] );
+ $this->setService( 'ProxyLookup', new ProxyLookup( [], [] ) );
$request = new WebRequest();
# Next call throw an exception about lacking an IP
--- /dev/null
+<?php
+/**
+ * Tests for IP validity functions.
+ *
+ * Ported from /t/inc/IP.t by avar.
+ *
+ * @group IP
+ * @todo Test methods in this call should be split into a method and a
+ * dataprovider.
+ */
+
+class IPTest extends PHPUnit_Framework_TestCase {
+ /**
+ * @covers IP::isIPAddress
+ * @dataProvider provideInvalidIPs
+ */
+ public function isNotIPAddress( $val, $desc ) {
+ $this->assertFalse( IP::isIPAddress( $val ), $desc );
+ }
+
+ /**
+ * Provide a list of things that aren't IP addresses
+ */
+ public function provideInvalidIPs() {
+ return [
+ [ false, 'Boolean false is not an IP' ],
+ [ true, 'Boolean true is not an IP' ],
+ [ '', 'Empty string is not an IP' ],
+ [ 'abc', 'Garbage IP string' ],
+ [ ':', 'Single ":" is not an IP' ],
+ [ '2001:0DB8::A:1::1', 'IPv6 with a double :: occurrence' ],
+ [ '2001:0DB8::A:1::', 'IPv6 with a double :: occurrence, last at end' ],
+ [ '::2001:0DB8::5:1', 'IPv6 with a double :: occurrence, firt at beginning' ],
+ [ '124.24.52', 'IPv4 not enough quads' ],
+ [ '24.324.52.13', 'IPv4 out of range' ],
+ [ '.24.52.13', 'IPv4 starts with period' ],
+ [ 'fc:100:300', 'IPv6 with only 3 words' ],
+ ];
+ }
+
+ /**
+ * @covers IP::isIPAddress
+ */
+ public function testisIPAddress() {
+ $this->assertTrue( IP::isIPAddress( '::' ), 'RFC 4291 IPv6 Unspecified Address' );
+ $this->assertTrue( IP::isIPAddress( '::1' ), 'RFC 4291 IPv6 Loopback Address' );
+ $this->assertTrue( IP::isIPAddress( '74.24.52.13/20' ), 'IPv4 range' );
+ $this->assertTrue( IP::isIPAddress( 'fc:100:a:d:1:e:ac:0/24' ), 'IPv6 range' );
+ $this->assertTrue( IP::isIPAddress( 'fc::100:a:d:1:e:ac/96' ), 'IPv6 range with "::"' );
+
+ $validIPs = [ 'fc:100::', 'fc:100:a:d:1:e:ac::', 'fc::100', '::fc:100:a:d:1:e:ac',
+ '::fc', 'fc::100:a:d:1:e:ac', 'fc:100:a:d:1:e:ac:0', '124.24.52.13', '1.24.52.13' ];
+ foreach ( $validIPs as $ip ) {
+ $this->assertTrue( IP::isIPAddress( $ip ), "$ip is a valid IP address" );
+ }
+ }
+
+ /**
+ * @covers IP::isIPv6
+ */
+ public function testisIPv6() {
+ $this->assertFalse( IP::isIPv6( ':fc:100::' ), 'IPv6 starting with lone ":"' );
+ $this->assertFalse( IP::isIPv6( 'fc:100:::' ), 'IPv6 ending with a ":::"' );
+ $this->assertFalse( IP::isIPv6( 'fc:300' ), 'IPv6 with only 2 words' );
+ $this->assertFalse( IP::isIPv6( 'fc:100:300' ), 'IPv6 with only 3 words' );
+
+ $this->assertTrue( IP::isIPv6( 'fc:100::' ) );
+ $this->assertTrue( IP::isIPv6( 'fc:100:a::' ) );
+ $this->assertTrue( IP::isIPv6( 'fc:100:a:d::' ) );
+ $this->assertTrue( IP::isIPv6( 'fc:100:a:d:1::' ) );
+ $this->assertTrue( IP::isIPv6( 'fc:100:a:d:1:e::' ) );
+ $this->assertTrue( IP::isIPv6( 'fc:100:a:d:1:e:ac::' ) );
+
+ $this->assertFalse( IP::isIPv6( 'fc:100:a:d:1:e:ac:0::' ), 'IPv6 with 8 words ending with "::"' );
+ $this->assertFalse(
+ IP::isIPv6( 'fc:100:a:d:1:e:ac:0:1::' ),
+ 'IPv6 with 9 words ending with "::"'
+ );
+
+ $this->assertFalse( IP::isIPv6( ':::' ) );
+ $this->assertFalse( IP::isIPv6( '::0:' ), 'IPv6 ending in a lone ":"' );
+
+ $this->assertTrue( IP::isIPv6( '::' ), 'IPv6 zero address' );
+ $this->assertTrue( IP::isIPv6( '::0' ) );
+ $this->assertTrue( IP::isIPv6( '::fc' ) );
+ $this->assertTrue( IP::isIPv6( '::fc:100' ) );
+ $this->assertTrue( IP::isIPv6( '::fc:100:a' ) );
+ $this->assertTrue( IP::isIPv6( '::fc:100:a:d' ) );
+ $this->assertTrue( IP::isIPv6( '::fc:100:a:d:1' ) );
+ $this->assertTrue( IP::isIPv6( '::fc:100:a:d:1:e' ) );
+ $this->assertTrue( IP::isIPv6( '::fc:100:a:d:1:e:ac' ) );
+
+ $this->assertFalse( IP::isIPv6( '::fc:100:a:d:1:e:ac:0' ), 'IPv6 with "::" and 8 words' );
+ $this->assertFalse( IP::isIPv6( '::fc:100:a:d:1:e:ac:0:1' ), 'IPv6 with 9 words' );
+
+ $this->assertFalse( IP::isIPv6( ':fc::100' ), 'IPv6 starting with lone ":"' );
+ $this->assertFalse( IP::isIPv6( 'fc::100:' ), 'IPv6 ending with lone ":"' );
+ $this->assertFalse( IP::isIPv6( 'fc:::100' ), 'IPv6 with ":::" in the middle' );
+
+ $this->assertTrue( IP::isIPv6( 'fc::100' ), 'IPv6 with "::" and 2 words' );
+ $this->assertTrue( IP::isIPv6( 'fc::100:a' ), 'IPv6 with "::" and 3 words' );
+ $this->assertTrue( IP::isIPv6( 'fc::100:a:d' ), 'IPv6 with "::" and 4 words' );
+ $this->assertTrue( IP::isIPv6( 'fc::100:a:d:1' ), 'IPv6 with "::" and 5 words' );
+ $this->assertTrue( IP::isIPv6( 'fc::100:a:d:1:e' ), 'IPv6 with "::" and 6 words' );
+ $this->assertTrue( IP::isIPv6( 'fc::100:a:d:1:e:ac' ), 'IPv6 with "::" and 7 words' );
+ $this->assertTrue( IP::isIPv6( '2001::df' ), 'IPv6 with "::" and 2 words' );
+ $this->assertTrue( IP::isIPv6( '2001:5c0:1400:a::df' ), 'IPv6 with "::" and 5 words' );
+ $this->assertTrue( IP::isIPv6( '2001:5c0:1400:a::df:2' ), 'IPv6 with "::" and 6 words' );
+
+ $this->assertFalse( IP::isIPv6( 'fc::100:a:d:1:e:ac:0' ), 'IPv6 with "::" and 8 words' );
+ $this->assertFalse( IP::isIPv6( 'fc::100:a:d:1:e:ac:0:1' ), 'IPv6 with 9 words' );
+
+ $this->assertTrue( IP::isIPv6( 'fc:100:a:d:1:e:ac:0' ) );
+ }
+
+ /**
+ * @covers IP::isIPv4
+ * @dataProvider provideInvalidIPv4Addresses
+ */
+ public function testisNotIPv4( $bogusIP, $desc ) {
+ $this->assertFalse( IP::isIPv4( $bogusIP ), $desc );
+ }
+
+ public function provideInvalidIPv4Addresses() {
+ return [
+ [ false, 'Boolean false is not an IP' ],
+ [ true, 'Boolean true is not an IP' ],
+ [ '', 'Empty string is not an IP' ],
+ [ 'abc', 'Letters are not an IP' ],
+ [ ':', 'A colon is not an IP' ],
+ [ '124.24.52', 'IPv4 not enough quads' ],
+ [ '24.324.52.13', 'IPv4 out of range' ],
+ [ '.24.52.13', 'IPv4 starts with period' ],
+ ];
+ }
+
+ /**
+ * @covers IP::isIPv4
+ * @dataProvider provideValidIPv4Address
+ */
+ public function testIsIPv4( $ip, $desc ) {
+ $this->assertTrue( IP::isIPv4( $ip ), $desc );
+ }
+
+ /**
+ * Provide some IPv4 addresses and ranges
+ */
+ public function provideValidIPv4Address() {
+ return [
+ [ '124.24.52.13', 'Valid IPv4 address' ],
+ [ '1.24.52.13', 'Another valid IPv4 address' ],
+ [ '74.24.52.13/20', 'An IPv4 range' ],
+ ];
+ }
+
+ /**
+ * @covers IP::isValid
+ */
+ public function testValidIPs() {
+ foreach ( range( 0, 255 ) as $i ) {
+ $a = sprintf( "%03d", $i );
+ $b = sprintf( "%02d", $i );
+ $c = sprintf( "%01d", $i );
+ foreach ( array_unique( [ $a, $b, $c ] ) as $f ) {
+ $ip = "$f.$f.$f.$f";
+ $this->assertTrue( IP::isValid( $ip ), "$ip is a valid IPv4 address" );
+ }
+ }
+ foreach ( range( 0x0, 0xFFFF, 0xF ) as $i ) {
+ $a = sprintf( "%04x", $i );
+ $b = sprintf( "%03x", $i );
+ $c = sprintf( "%02x", $i );
+ foreach ( array_unique( [ $a, $b, $c ] ) as $f ) {
+ $ip = "$f:$f:$f:$f:$f:$f:$f:$f";
+ $this->assertTrue( IP::isValid( $ip ), "$ip is a valid IPv6 address" );
+ }
+ }
+ // test with some abbreviations
+ $this->assertFalse( IP::isValid( ':fc:100::' ), 'IPv6 starting with lone ":"' );
+ $this->assertFalse( IP::isValid( 'fc:100:::' ), 'IPv6 ending with a ":::"' );
+ $this->assertFalse( IP::isValid( 'fc:300' ), 'IPv6 with only 2 words' );
+ $this->assertFalse( IP::isValid( 'fc:100:300' ), 'IPv6 with only 3 words' );
+
+ $this->assertTrue( IP::isValid( 'fc:100::' ) );
+ $this->assertTrue( IP::isValid( 'fc:100:a:d:1:e::' ) );
+ $this->assertTrue( IP::isValid( 'fc:100:a:d:1:e:ac::' ) );
+
+ $this->assertTrue( IP::isValid( 'fc::100' ), 'IPv6 with "::" and 2 words' );
+ $this->assertTrue( IP::isValid( 'fc::100:a' ), 'IPv6 with "::" and 3 words' );
+ $this->assertTrue( IP::isValid( '2001::df' ), 'IPv6 with "::" and 2 words' );
+ $this->assertTrue( IP::isValid( '2001:5c0:1400:a::df' ), 'IPv6 with "::" and 5 words' );
+ $this->assertTrue( IP::isValid( '2001:5c0:1400:a::df:2' ), 'IPv6 with "::" and 6 words' );
+ $this->assertTrue( IP::isValid( 'fc::100:a:d:1' ), 'IPv6 with "::" and 5 words' );
+ $this->assertTrue( IP::isValid( 'fc::100:a:d:1:e:ac' ), 'IPv6 with "::" and 7 words' );
+
+ $this->assertFalse(
+ IP::isValid( 'fc:100:a:d:1:e:ac:0::' ),
+ 'IPv6 with 8 words ending with "::"'
+ );
+ $this->assertFalse(
+ IP::isValid( 'fc:100:a:d:1:e:ac:0:1::' ),
+ 'IPv6 with 9 words ending with "::"'
+ );
+ }
+
+ /**
+ * @covers IP::isValid
+ */
+ public function testInvalidIPs() {
+ // Out of range...
+ foreach ( range( 256, 999 ) as $i ) {
+ $a = sprintf( "%03d", $i );
+ $b = sprintf( "%02d", $i );
+ $c = sprintf( "%01d", $i );
+ foreach ( array_unique( [ $a, $b, $c ] ) as $f ) {
+ $ip = "$f.$f.$f.$f";
+ $this->assertFalse( IP::isValid( $ip ), "$ip is not a valid IPv4 address" );
+ }
+ }
+ foreach ( range( 'g', 'z' ) as $i ) {
+ $a = sprintf( "%04s", $i );
+ $b = sprintf( "%03s", $i );
+ $c = sprintf( "%02s", $i );
+ foreach ( array_unique( [ $a, $b, $c ] ) as $f ) {
+ $ip = "$f:$f:$f:$f:$f:$f:$f:$f";
+ $this->assertFalse( IP::isValid( $ip ), "$ip is not a valid IPv6 address" );
+ }
+ }
+ // Have CIDR
+ $ipCIDRs = [
+ '212.35.31.121/32',
+ '212.35.31.121/18',
+ '212.35.31.121/24',
+ '::ff:d:321:5/96',
+ 'ff::d3:321:5/116',
+ 'c:ff:12:1:ea:d:321:5/120',
+ ];
+ foreach ( $ipCIDRs as $i ) {
+ $this->assertFalse( IP::isValid( $i ),
+ "$i is an invalid IP address because it is a block" );
+ }
+ // Incomplete/garbage
+ $invalid = [
+ 'www.xn--var-xla.net',
+ '216.17.184.G',
+ '216.17.184.1.',
+ '216.17.184',
+ '216.17.184.',
+ '256.17.184.1'
+ ];
+ foreach ( $invalid as $i ) {
+ $this->assertFalse( IP::isValid( $i ), "$i is an invalid IP address" );
+ }
+ }
+
+ /**
+ * Provide some valid IP blocks
+ */
+ public function provideValidBlocks() {
+ return [
+ [ '116.17.184.5/32' ],
+ [ '0.17.184.5/30' ],
+ [ '16.17.184.1/24' ],
+ [ '30.242.52.14/1' ],
+ [ '10.232.52.13/8' ],
+ [ '30.242.52.14/0' ],
+ [ '::e:f:2001/96' ],
+ [ '::c:f:2001/128' ],
+ [ '::10:f:2001/70' ],
+ [ '::fe:f:2001/1' ],
+ [ '::6d:f:2001/8' ],
+ [ '::fe:f:2001/0' ],
+ ];
+ }
+
+ /**
+ * @covers IP::isValidBlock
+ * @dataProvider provideValidBlocks
+ */
+ public function testValidBlocks( $block ) {
+ $this->assertTrue( IP::isValidBlock( $block ), "$block is a valid IP block" );
+ }
+
+ /**
+ * @covers IP::isValidBlock
+ * @dataProvider provideInvalidBlocks
+ */
+ public function testInvalidBlocks( $invalid ) {
+ $this->assertFalse( IP::isValidBlock( $invalid ), "$invalid is not a valid IP block" );
+ }
+
+ public function provideInvalidBlocks() {
+ return [
+ [ '116.17.184.5/33' ],
+ [ '0.17.184.5/130' ],
+ [ '16.17.184.1/-1' ],
+ [ '10.232.52.13/*' ],
+ [ '7.232.52.13/ab' ],
+ [ '11.232.52.13/' ],
+ [ '::e:f:2001/129' ],
+ [ '::c:f:2001/228' ],
+ [ '::10:f:2001/-1' ],
+ [ '::6d:f:2001/*' ],
+ [ '::86:f:2001/ab' ],
+ [ '::23:f:2001/' ],
+ ];
+ }
+
+ /**
+ * @covers IP::sanitizeIP
+ * @dataProvider provideSanitizeIP
+ */
+ public function testSanitizeIP( $expected, $input ) {
+ $result = IP::sanitizeIP( $input );
+ $this->assertEquals( $expected, $result );
+ }
+
+ /**
+ * Provider for IP::testSanitizeIP()
+ */
+ public static function provideSanitizeIP() {
+ return [
+ [ '0.0.0.0', '0.0.0.0' ],
+ [ '0.0.0.0', '00.00.00.00' ],
+ [ '0.0.0.0', '000.000.000.000' ],
+ [ '141.0.11.253', '141.000.011.253' ],
+ [ '1.2.4.5', '1.2.4.5' ],
+ [ '1.2.4.5', '01.02.04.05' ],
+ [ '1.2.4.5', '001.002.004.005' ],
+ [ '10.0.0.1', '010.0.000.1' ],
+ [ '80.72.250.4', '080.072.250.04' ],
+ [ 'Foo.1000.00', 'Foo.1000.00' ],
+ [ 'Bar.01', 'Bar.01' ],
+ [ 'Bar.010', 'Bar.010' ],
+ [ null, '' ],
+ [ null, ' ' ]
+ ];
+ }
+
+ /**
+ * @covers IP::toHex
+ * @dataProvider provideToHex
+ */
+ public function testToHex( $expected, $input ) {
+ $result = IP::toHex( $input );
+ $this->assertTrue( $result === false || is_string( $result ) );
+ $this->assertEquals( $expected, $result );
+ }
+
+ /**
+ * Provider for IP::testToHex()
+ */
+ public static function provideToHex() {
+ return [
+ [ '00000001', '0.0.0.1' ],
+ [ '01020304', '1.2.3.4' ],
+ [ '7F000001', '127.0.0.1' ],
+ [ '80000000', '128.0.0.0' ],
+ [ 'DEADCAFE', '222.173.202.254' ],
+ [ 'FFFFFFFF', '255.255.255.255' ],
+ [ '8D000BFD', '141.000.11.253' ],
+ [ false, 'IN.VA.LI.D' ],
+ [ 'v6-00000000000000000000000000000001', '::1' ],
+ [ 'v6-20010DB885A3000000008A2E03707334', '2001:0db8:85a3:0000:0000:8a2e:0370:7334' ],
+ [ 'v6-20010DB885A3000000008A2E03707334', '2001:db8:85a3::8a2e:0370:7334' ],
+ [ false, 'IN:VA::LI:D' ],
+ [ false, ':::1' ]
+ ];
+ }
+
+ /**
+ * @covers IP::isPublic
+ * @dataProvider provideIsPublic
+ */
+ public function testIsPublic( $expected, $input ) {
+ $result = IP::isPublic( $input );
+ $this->assertEquals( $expected, $result );
+ }
+
+ /**
+ * Provider for IP::testIsPublic()
+ */
+ public static function provideIsPublic() {
+ return [
+ [ false, 'fc00::3' ], # RFC 4193 (local)
+ [ false, 'fc00::ff' ], # RFC 4193 (local)
+ [ false, '127.1.2.3' ], # loopback
+ [ false, '::1' ], # loopback
+ [ false, 'fe80::1' ], # link-local
+ [ false, '169.254.1.1' ], # link-local
+ [ false, '10.0.0.1' ], # RFC 1918 (private)
+ [ false, '172.16.0.1' ], # RFC 1918 (private)
+ [ false, '192.168.0.1' ], # RFC 1918 (private)
+ [ true, '2001:5c0:1000:a::133' ], # public
+ [ true, 'fc::3' ], # public
+ [ true, '00FC::' ] # public
+ ];
+ }
+
+ // Private wrapper used to test CIDR Parsing.
+ private function assertFalseCIDR( $CIDR, $msg = '' ) {
+ $ff = [ false, false ];
+ $this->assertEquals( $ff, IP::parseCIDR( $CIDR ), $msg );
+ }
+
+ // Private wrapper to test network shifting using only dot notation
+ private function assertNet( $expected, $CIDR ) {
+ $parse = IP::parseCIDR( $CIDR );
+ $this->assertEquals( $expected, long2ip( $parse[0] ), "network shifting $CIDR" );
+ }
+
+ /**
+ * @covers IP::hexToQuad
+ * @dataProvider provideIPsAndHexes
+ */
+ public function testHexToQuad( $ip, $hex ) {
+ $this->assertEquals( $ip, IP::hexToQuad( $hex ) );
+ }
+
+ /**
+ * Provide some IP addresses and their equivalent hex representations
+ */
+ public function provideIPsandHexes() {
+ return [
+ [ '0.0.0.1', '00000001' ],
+ [ '255.0.0.0', 'FF000000' ],
+ [ '255.255.255.255', 'FFFFFFFF' ],
+ [ '10.188.222.255', '0ABCDEFF' ],
+ // hex not left-padded...
+ [ '0.0.0.0', '0' ],
+ [ '0.0.0.1', '1' ],
+ [ '0.0.0.255', 'FF' ],
+ [ '0.0.255.0', 'FF00' ],
+ ];
+ }
+
+ /**
+ * @covers IP::hexToOctet
+ * @dataProvider provideOctetsAndHexes
+ */
+ public function testHexToOctet( $octet, $hex ) {
+ $this->assertEquals( $octet, IP::hexToOctet( $hex ) );
+ }
+
+ /**
+ * Provide some hex and octet representations of the same IPs
+ */
+ public function provideOctetsAndHexes() {
+ return [
+ [ '0:0:0:0:0:0:0:1', '00000000000000000000000000000001' ],
+ [ '0:0:0:0:0:0:FF:3', '00000000000000000000000000FF0003' ],
+ [ '0:0:0:0:0:0:FF00:6', '000000000000000000000000FF000006' ],
+ [ '0:0:0:0:0:0:FCCF:FAFF', '000000000000000000000000FCCFFAFF' ],
+ [ 'FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF', 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF' ],
+ // hex not left-padded...
+ [ '0:0:0:0:0:0:0:0', '0' ],
+ [ '0:0:0:0:0:0:0:1', '1' ],
+ [ '0:0:0:0:0:0:0:FF', 'FF' ],
+ [ '0:0:0:0:0:0:0:FFD0', 'FFD0' ],
+ [ '0:0:0:0:0:0:FA00:0', 'FA000000' ],
+ [ '0:0:0:0:0:0:FCCF:FAFF', 'FCCFFAFF' ],
+ ];
+ }
+
+ /**
+ * IP::parseCIDR() returns an array containing a signed IP address
+ * representing the network mask and the bit mask.
+ * @covers IP::parseCIDR
+ */
+ public function testCIDRParsing() {
+ $this->assertFalseCIDR( '192.0.2.0', "missing mask" );
+ $this->assertFalseCIDR( '192.0.2.0/', "missing bitmask" );
+
+ // Verify if statement
+ $this->assertFalseCIDR( '256.0.0.0/32', "invalid net" );
+ $this->assertFalseCIDR( '192.0.2.0/AA', "mask not numeric" );
+ $this->assertFalseCIDR( '192.0.2.0/-1', "mask < 0" );
+ $this->assertFalseCIDR( '192.0.2.0/33', "mask > 32" );
+
+ // Check internal logic
+ # 0 mask always result in array(0,0)
+ $this->assertEquals( [ 0, 0 ], IP::parseCIDR( '192.0.0.2/0' ) );
+ $this->assertEquals( [ 0, 0 ], IP::parseCIDR( '0.0.0.0/0' ) );
+ $this->assertEquals( [ 0, 0 ], IP::parseCIDR( '255.255.255.255/0' ) );
+
+ // @todo FIXME: Add more tests.
+
+ # This part test network shifting
+ $this->assertNet( '192.0.0.0', '192.0.0.2/24' );
+ $this->assertNet( '192.168.5.0', '192.168.5.13/24' );
+ $this->assertNet( '10.0.0.160', '10.0.0.161/28' );
+ $this->assertNet( '10.0.0.0', '10.0.0.3/28' );
+ $this->assertNet( '10.0.0.0', '10.0.0.3/30' );
+ $this->assertNet( '10.0.0.4', '10.0.0.4/30' );
+ $this->assertNet( '172.17.32.0', '172.17.35.48/21' );
+ $this->assertNet( '10.128.0.0', '10.135.0.0/9' );
+ $this->assertNet( '134.0.0.0', '134.0.5.1/8' );
+ }
+
+ /**
+ * @covers IP::canonicalize
+ */
+ public function testIPCanonicalizeOnValidIp() {
+ $this->assertEquals( '192.0.2.152', IP::canonicalize( '192.0.2.152' ),
+ 'Canonicalization of a valid IP returns it unchanged' );
+ }
+
+ /**
+ * @covers IP::canonicalize
+ */
+ public function testIPCanonicalizeMappedAddress() {
+ $this->assertEquals(
+ '192.0.2.152',
+ IP::canonicalize( '::ffff:192.0.2.152' )
+ );
+ $this->assertEquals(
+ '192.0.2.152',
+ IP::canonicalize( '::192.0.2.152' )
+ );
+ }
+
+ /**
+ * Issues there are most probably from IP::toHex() or IP::parseRange()
+ * @covers IP::isInRange
+ * @dataProvider provideIPsAndRanges
+ */
+ public function testIPIsInRange( $expected, $addr, $range, $message = '' ) {
+ $this->assertEquals(
+ $expected,
+ IP::isInRange( $addr, $range ),
+ $message
+ );
+ }
+
+ /** Provider for testIPIsInRange() */
+ public static function provideIPsAndRanges() {
+ # Format: (expected boolean, address, range, optional message)
+ return [
+ # IPv4
+ [ true, '192.0.2.0', '192.0.2.0/24', 'Network address' ],
+ [ true, '192.0.2.77', '192.0.2.0/24', 'Simple address' ],
+ [ true, '192.0.2.255', '192.0.2.0/24', 'Broadcast address' ],
+
+ [ false, '0.0.0.0', '192.0.2.0/24' ],
+ [ false, '255.255.255', '192.0.2.0/24' ],
+
+ # IPv6
+ [ false, '::1', '2001:DB8::/32' ],
+ [ false, '::', '2001:DB8::/32' ],
+ [ false, 'FE80::1', '2001:DB8::/32' ],
+
+ [ true, '2001:DB8::', '2001:DB8::/32' ],
+ [ true, '2001:0DB8::', '2001:DB8::/32' ],
+ [ true, '2001:DB8::1', '2001:DB8::/32' ],
+ [ true, '2001:0DB8::1', '2001:DB8::/32' ],
+ [ true, '2001:0DB8:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF',
+ '2001:DB8::/32' ],
+
+ [ false, '2001:0DB8:F::', '2001:DB8::/96' ],
+ ];
+ }
+
+ /**
+ * Test for IP::splitHostAndPort().
+ * @dataProvider provideSplitHostAndPort
+ */
+ public function testSplitHostAndPort( $expected, $input, $description ) {
+ $this->assertEquals( $expected, IP::splitHostAndPort( $input ), $description );
+ }
+
+ /**
+ * Provider for IP::splitHostAndPort()
+ */
+ public static function provideSplitHostAndPort() {
+ return [
+ [ false, '[', 'Unclosed square bracket' ],
+ [ false, '[::', 'Unclosed square bracket 2' ],
+ [ [ '::', false ], '::', 'Bare IPv6 0' ],
+ [ [ '::1', false ], '::1', 'Bare IPv6 1' ],
+ [ [ '::', false ], '[::]', 'Bracketed IPv6 0' ],
+ [ [ '::1', false ], '[::1]', 'Bracketed IPv6 1' ],
+ [ [ '::1', 80 ], '[::1]:80', 'Bracketed IPv6 with port' ],
+ [ false, '::x', 'Double colon but no IPv6' ],
+ [ [ 'x', 80 ], 'x:80', 'Hostname and port' ],
+ [ false, 'x:x', 'Hostname and invalid port' ],
+ [ [ 'x', false ], 'x', 'Plain hostname' ]
+ ];
+ }
+
+ /**
+ * Test for IP::combineHostAndPort()
+ * @dataProvider provideCombineHostAndPort
+ */
+ public function testCombineHostAndPort( $expected, $input, $description ) {
+ list( $host, $port, $defaultPort ) = $input;
+ $this->assertEquals(
+ $expected,
+ IP::combineHostAndPort( $host, $port, $defaultPort ),
+ $description );
+ }
+
+ /**
+ * Provider for IP::combineHostAndPort()
+ */
+ public static function provideCombineHostAndPort() {
+ return [
+ [ '[::1]', [ '::1', 2, 2 ], 'IPv6 default port' ],
+ [ '[::1]:2', [ '::1', 2, 3 ], 'IPv6 non-default port' ],
+ [ 'x', [ 'x', 2, 2 ], 'Normal default port' ],
+ [ 'x:2', [ 'x', 2, 3 ], 'Normal non-default port' ],
+ ];
+ }
+
+ /**
+ * Test for IP::sanitizeRange()
+ * @dataProvider provideIPCIDRs
+ */
+ public function testSanitizeRange( $input, $expected, $description ) {
+ $this->assertEquals( $expected, IP::sanitizeRange( $input ), $description );
+ }
+
+ /**
+ * Provider for IP::testSanitizeRange()
+ */
+ public static function provideIPCIDRs() {
+ return [
+ [ '35.56.31.252/16', '35.56.0.0/16', 'IPv4 range' ],
+ [ '135.16.21.252/24', '135.16.21.0/24', 'IPv4 range' ],
+ [ '5.36.71.252/32', '5.36.71.252/32', 'IPv4 silly range' ],
+ [ '5.36.71.252', '5.36.71.252', 'IPv4 non-range' ],
+ [ '0:1:2:3:4:c5:f6:7/96', '0:1:2:3:4:C5:0:0/96', 'IPv6 range' ],
+ [ '0:1:2:3:4:5:6:7/120', '0:1:2:3:4:5:6:0/120', 'IPv6 range' ],
+ [ '0:e1:2:3:4:5:e6:7/128', '0:E1:2:3:4:5:E6:7/128', 'IPv6 silly range' ],
+ [ '0:c1:A2:3:4:5:c6:7', '0:C1:A2:3:4:5:C6:7', 'IPv6 non range' ],
+ ];
+ }
+
+ /**
+ * Test for IP::prettifyIP()
+ * @dataProvider provideIPsToPrettify
+ */
+ public function testPrettifyIP( $ip, $prettified ) {
+ $this->assertEquals( $prettified, IP::prettifyIP( $ip ), "Prettify of $ip" );
+ }
+
+ /**
+ * Provider for IP::testPrettifyIP()
+ */
+ public static function provideIPsToPrettify() {
+ return [
+ [ '0:0:0:0:0:0:0:0', '::' ],
+ [ '0:0:0::0:0:0', '::' ],
+ [ '0:0:0:1:0:0:0:0', '0:0:0:1::' ],
+ [ '0:0::f', '::f' ],
+ [ '0::0:0:0:33:fef:b', '::33:fef:b' ],
+ [ '3f:535:0:0:0:0:e:fbb', '3f:535::e:fbb' ],
+ [ '0:0:fef:0:0:0:e:fbb', '0:0:fef::e:fbb' ],
+ [ 'abbc:2004::0:0:0:0', 'abbc:2004::' ],
+ [ 'cebc:2004:f:0:0:0:0:0', 'cebc:2004:f::' ],
+ [ '0:0:0:0:0:0:0:0/16', '::/16' ],
+ [ '0:0:0::0:0:0/64', '::/64' ],
+ [ '0:0::f/52', '::f/52' ],
+ [ '::0:0:33:fef:b/52', '::33:fef:b/52' ],
+ [ '3f:535:0:0:0:0:e:fbb/48', '3f:535::e:fbb/48' ],
+ [ '0:0:fef:0:0:0:e:fbb/96', '0:0:fef::e:fbb/96' ],
+ [ 'abbc:2004:0:0::0:0/40', 'abbc:2004::/40' ],
+ [ 'aebc:2004:f:0:0:0:0:0/80', 'aebc:2004:f::/80' ],
+ ];
+ }
+}
+++ /dev/null
-<?php
-
-/**
- * Tests timestamp parsing and output.
- */
-class ConvertableTimestampTest extends PHPUnit_Framework_TestCase {
- /**
- * @covers ConvertableTimestamp::__construct
- */
- public function testConstructWithNoTimestamp() {
- $timestamp = new ConvertableTimestamp();
- $this->assertInternalType( 'string', $timestamp->getTimestamp() );
- $this->assertNotEmpty( $timestamp->getTimestamp() );
- $this->assertNotEquals( false, strtotime( $timestamp->getTimestamp( TS_MW ) ) );
- }
-
- /**
- * @covers ConvertableTimestamp::__toString
- */
- public function testToString() {
- $timestamp = new ConvertableTimestamp( '1406833268' ); // Equivalent to 20140731190108
- $this->assertEquals( '1406833268', $timestamp->__toString() );
- }
-
- public static function provideValidTimestampDifferences() {
- return [
- [ '1406833268', '1406833269', '00 00 00 01' ],
- [ '1406833268', '1406833329', '00 00 01 01' ],
- [ '1406833268', '1406836929', '00 01 01 01' ],
- [ '1406833268', '1406923329', '01 01 01 01' ],
- ];
- }
-
- /**
- * @dataProvider provideValidTimestampDifferences
- * @covers ConvertableTimestamp::diff
- */
- public function testDiff( $timestamp1, $timestamp2, $expected ) {
- $timestamp1 = new ConvertableTimestamp( $timestamp1 );
- $timestamp2 = new ConvertableTimestamp( $timestamp2 );
- $diff = $timestamp1->diff( $timestamp2 );
- $this->assertEquals( $expected, $diff->format( '%D %H %I %S' ) );
- }
-
- /**
- * Test parsing of valid timestamps and outputing to MW format.
- * @dataProvider provideValidTimestamps
- * @covers ConvertableTimestamp::getTimestamp
- */
- public function testValidParse( $format, $original, $expected ) {
- $timestamp = new ConvertableTimestamp( $original );
- $this->assertEquals( $expected, $timestamp->getTimestamp( TS_MW ) );
- }
-
- /**
- * Test outputting valid timestamps to different formats.
- * @dataProvider provideValidTimestamps
- * @covers ConvertableTimestamp::getTimestamp
- */
- public function testValidOutput( $format, $expected, $original ) {
- $timestamp = new ConvertableTimestamp( $original );
- $this->assertEquals( $expected, (string)$timestamp->getTimestamp( $format ) );
- }
-
- /**
- * Test an invalid timestamp.
- * @expectedException TimestampException
- * @covers ConvertableTimestamp
- */
- public function testInvalidParse() {
- new ConvertableTimestamp( "This is not a timestamp." );
- }
-
- /**
- * Test an out of range timestamp
- * @dataProvider provideOutOfRangeTimestamps
- * @expectedException TimestampException
- * @covers ConvertableTimestamp
- */
- public function testOutOfRangeTimestamps( $format, $input ) {
- $timestamp = new ConvertableTimestamp( $input );
- $timestamp->getTimestamp( $format );
- }
-
- /**
- * Test requesting an invalid output format.
- * @expectedException TimestampException
- * @covers ConvertableTimestamp::getTimestamp
- */
- public function testInvalidOutput() {
- $timestamp = new ConvertableTimestamp( '1343761268' );
- $timestamp->getTimestamp( 98 );
- }
-
- /**
- * Returns a list of valid timestamps in the format:
- * [ type, timestamp_of_type, timestamp_in_MW ]
- */
- public static function provideValidTimestamps() {
- return [
- // Various formats
- [ TS_UNIX, '1343761268', '20120731190108' ],
- [ TS_MW, '20120731190108', '20120731190108' ],
- [ TS_DB, '2012-07-31 19:01:08', '20120731190108' ],
- [ TS_ISO_8601, '2012-07-31T19:01:08Z', '20120731190108' ],
- [ TS_ISO_8601_BASIC, '20120731T190108Z', '20120731190108' ],
- [ TS_EXIF, '2012:07:31 19:01:08', '20120731190108' ],
- [ TS_RFC2822, 'Tue, 31 Jul 2012 19:01:08 GMT', '20120731190108' ],
- [ TS_ORACLE, '31-07-2012 19:01:08.000000', '20120731190108' ],
- [ TS_POSTGRES, '2012-07-31 19:01:08 GMT', '20120731190108' ],
- // Some extremes and weird values
- [ TS_ISO_8601, '9999-12-31T23:59:59Z', '99991231235959' ],
- [ TS_UNIX, '-62135596801', '00001231235959' ]
- ];
- }
-
- /**
- * Returns a list of out of range timestamps in the format:
- * [ type, timestamp_of_type ]
- */
- public static function provideOutOfRangeTimestamps() {
- return [
- // Various formats
- [ TS_MW, '-62167219201' ], // -0001-12-31T23:59:59Z
- [ TS_MW, '253402300800' ], // 10000-01-01T00:00:00Z
- ];
- }
-}
--- /dev/null
+<?php
+
+/**
+ * Tests timestamp parsing and output.
+ */
+class ConvertibleTimestampTest extends PHPUnit_Framework_TestCase {
+ /**
+ * @covers ConvertibleTimestamp::__construct
+ */
+ public function testConstructWithNoTimestamp() {
+ $timestamp = new ConvertibleTimestamp();
+ $this->assertInternalType( 'string', $timestamp->getTimestamp() );
+ $this->assertNotEmpty( $timestamp->getTimestamp() );
+ $this->assertNotEquals( false, strtotime( $timestamp->getTimestamp( TS_MW ) ) );
+ }
+
+ /**
+ * @covers ConvertibleTimestamp::__toString
+ */
+ public function testToString() {
+ $timestamp = new ConvertibleTimestamp( '1406833268' ); // Equivalent to 20140731190108
+ $this->assertEquals( '1406833268', $timestamp->__toString() );
+ }
+
+ public static function provideValidTimestampDifferences() {
+ return [
+ [ '1406833268', '1406833269', '00 00 00 01' ],
+ [ '1406833268', '1406833329', '00 00 01 01' ],
+ [ '1406833268', '1406836929', '00 01 01 01' ],
+ [ '1406833268', '1406923329', '01 01 01 01' ],
+ ];
+ }
+
+ /**
+ * @dataProvider provideValidTimestampDifferences
+ * @covers ConvertibleTimestamp::diff
+ */
+ public function testDiff( $timestamp1, $timestamp2, $expected ) {
+ $timestamp1 = new ConvertibleTimestamp( $timestamp1 );
+ $timestamp2 = new ConvertibleTimestamp( $timestamp2 );
+ $diff = $timestamp1->diff( $timestamp2 );
+ $this->assertEquals( $expected, $diff->format( '%D %H %I %S' ) );
+ }
+
+ /**
+ * Test parsing of valid timestamps and outputing to MW format.
+ * @dataProvider provideValidTimestamps
+ * @covers ConvertibleTimestamp::getTimestamp
+ */
+ public function testValidParse( $format, $original, $expected ) {
+ $timestamp = new ConvertibleTimestamp( $original );
+ $this->assertEquals( $expected, $timestamp->getTimestamp( TS_MW ) );
+ }
+
+ /**
+ * Test outputting valid timestamps to different formats.
+ * @dataProvider provideValidTimestamps
+ * @covers ConvertibleTimestamp::getTimestamp
+ */
+ public function testValidOutput( $format, $expected, $original ) {
+ $timestamp = new ConvertibleTimestamp( $original );
+ $this->assertEquals( $expected, (string)$timestamp->getTimestamp( $format ) );
+ }
+
+ /**
+ * Test an invalid timestamp.
+ * @expectedException TimestampException
+ * @covers ConvertibleTimestamp
+ */
+ public function testInvalidParse() {
+ new ConvertibleTimestamp( "This is not a timestamp." );
+ }
+
+ /**
+ * @dataProvider provideValidTimestamps
+ * @covers ConvertibleTimestamp::convert
+ */
+ public function testConvert( $format, $expected, $original ) {
+ $this->assertSame( $expected, ConvertibleTimestamp::convert( $format, $original ) );
+ }
+
+ /**
+ * Format an invalid timestamp.
+ * @covers ConvertibleTimestamp::convert
+ */
+ public function testConvertInvalid() {
+ $this->assertSame( false, ConvertibleTimestamp::convert( 'Not a timestamp', 0 ) );
+ }
+
+ /**
+ * Test an out of range timestamp
+ * @dataProvider provideOutOfRangeTimestamps
+ * @expectedException TimestampException
+ * @covers ConvertibleTimestamp
+ */
+ public function testOutOfRangeTimestamps( $format, $input ) {
+ $timestamp = new ConvertibleTimestamp( $input );
+ $timestamp->getTimestamp( $format );
+ }
+
+ /**
+ * Test requesting an invalid output format.
+ * @expectedException TimestampException
+ * @covers ConvertibleTimestamp::getTimestamp
+ */
+ public function testInvalidOutput() {
+ $timestamp = new ConvertibleTimestamp( '1343761268' );
+ $timestamp->getTimestamp( 98 );
+ }
+
+ /**
+ * Returns a list of valid timestamps in the format:
+ * [ type, timestamp_of_type, timestamp_in_MW ]
+ */
+ public static function provideValidTimestamps() {
+ return [
+ // Various formats
+ [ TS_UNIX, '1343761268', '20120731190108' ],
+ [ TS_MW, '20120731190108', '20120731190108' ],
+ [ TS_DB, '2012-07-31 19:01:08', '20120731190108' ],
+ [ TS_ISO_8601, '2012-07-31T19:01:08Z', '20120731190108' ],
+ [ TS_ISO_8601_BASIC, '20120731T190108Z', '20120731190108' ],
+ [ TS_EXIF, '2012:07:31 19:01:08', '20120731190108' ],
+ [ TS_RFC2822, 'Tue, 31 Jul 2012 19:01:08 GMT', '20120731190108' ],
+ [ TS_ORACLE, '31-07-2012 19:01:08.000000', '20120731190108' ],
+ [ TS_POSTGRES, '2012-07-31 19:01:08 GMT', '20120731190108' ],
+ // Some extremes and weird values
+ [ TS_ISO_8601, '9999-12-31T23:59:59Z', '99991231235959' ],
+ [ TS_UNIX, '-62135596801', '00001231235959' ]
+ ];
+ }
+
+ /**
+ * Returns a list of out of range timestamps in the format:
+ * [ type, timestamp_of_type ]
+ */
+ public static function provideOutOfRangeTimestamps() {
+ return [
+ // Various formats
+ [ TS_MW, '-62167219201' ], // -0001-12-31T23:59:59Z
+ [ TS_MW, '253402300800' ], // 10000-01-01T00:00:00Z
+ ];
+ }
+}
$this->backend = new FSFileBackend( [
'name' => 'localtesting',
'wikiId' => wfWikiID(),
- 'containerPaths' => $containers
+ 'containerPaths' => $containers,
+ 'tmpDirectory' => $this->getNewTempDirectory()
] );
$this->repo = new FSRepo( $this->getRepoOptions() );
}
+++ /dev/null
-<?php
-/**
- * Tests for IP validity functions.
- *
- * Ported from /t/inc/IP.t by avar.
- *
- * @group IP
- * @todo Test methods in this call should be split into a method and a
- * dataprovider.
- */
-
-class IPTest extends PHPUnit_Framework_TestCase {
- /**
- * @covers IP::isIPAddress
- * @dataProvider provideInvalidIPs
- */
- public function isNotIPAddress( $val, $desc ) {
- $this->assertFalse( IP::isIPAddress( $val ), $desc );
- }
-
- /**
- * Provide a list of things that aren't IP addresses
- */
- public function provideInvalidIPs() {
- return [
- [ false, 'Boolean false is not an IP' ],
- [ true, 'Boolean true is not an IP' ],
- [ '', 'Empty string is not an IP' ],
- [ 'abc', 'Garbage IP string' ],
- [ ':', 'Single ":" is not an IP' ],
- [ '2001:0DB8::A:1::1', 'IPv6 with a double :: occurrence' ],
- [ '2001:0DB8::A:1::', 'IPv6 with a double :: occurrence, last at end' ],
- [ '::2001:0DB8::5:1', 'IPv6 with a double :: occurrence, firt at beginning' ],
- [ '124.24.52', 'IPv4 not enough quads' ],
- [ '24.324.52.13', 'IPv4 out of range' ],
- [ '.24.52.13', 'IPv4 starts with period' ],
- [ 'fc:100:300', 'IPv6 with only 3 words' ],
- ];
- }
-
- /**
- * @covers IP::isIPAddress
- */
- public function testisIPAddress() {
- $this->assertTrue( IP::isIPAddress( '::' ), 'RFC 4291 IPv6 Unspecified Address' );
- $this->assertTrue( IP::isIPAddress( '::1' ), 'RFC 4291 IPv6 Loopback Address' );
- $this->assertTrue( IP::isIPAddress( '74.24.52.13/20', 'IPv4 range' ) );
- $this->assertTrue( IP::isIPAddress( 'fc:100:a:d:1:e:ac:0/24' ), 'IPv6 range' );
- $this->assertTrue( IP::isIPAddress( 'fc::100:a:d:1:e:ac/96' ), 'IPv6 range with "::"' );
-
- $validIPs = [ 'fc:100::', 'fc:100:a:d:1:e:ac::', 'fc::100', '::fc:100:a:d:1:e:ac',
- '::fc', 'fc::100:a:d:1:e:ac', 'fc:100:a:d:1:e:ac:0', '124.24.52.13', '1.24.52.13' ];
- foreach ( $validIPs as $ip ) {
- $this->assertTrue( IP::isIPAddress( $ip ), "$ip is a valid IP address" );
- }
- }
-
- /**
- * @covers IP::isIPv6
- */
- public function testisIPv6() {
- $this->assertFalse( IP::isIPv6( ':fc:100::' ), 'IPv6 starting with lone ":"' );
- $this->assertFalse( IP::isIPv6( 'fc:100:::' ), 'IPv6 ending with a ":::"' );
- $this->assertFalse( IP::isIPv6( 'fc:300' ), 'IPv6 with only 2 words' );
- $this->assertFalse( IP::isIPv6( 'fc:100:300' ), 'IPv6 with only 3 words' );
-
- $this->assertTrue( IP::isIPv6( 'fc:100::' ) );
- $this->assertTrue( IP::isIPv6( 'fc:100:a::' ) );
- $this->assertTrue( IP::isIPv6( 'fc:100:a:d::' ) );
- $this->assertTrue( IP::isIPv6( 'fc:100:a:d:1::' ) );
- $this->assertTrue( IP::isIPv6( 'fc:100:a:d:1:e::' ) );
- $this->assertTrue( IP::isIPv6( 'fc:100:a:d:1:e:ac::' ) );
-
- $this->assertFalse( IP::isIPv6( 'fc:100:a:d:1:e:ac:0::' ), 'IPv6 with 8 words ending with "::"' );
- $this->assertFalse(
- IP::isIPv6( 'fc:100:a:d:1:e:ac:0:1::' ),
- 'IPv6 with 9 words ending with "::"'
- );
-
- $this->assertFalse( IP::isIPv6( ':::' ) );
- $this->assertFalse( IP::isIPv6( '::0:' ), 'IPv6 ending in a lone ":"' );
-
- $this->assertTrue( IP::isIPv6( '::' ), 'IPv6 zero address' );
- $this->assertTrue( IP::isIPv6( '::0' ) );
- $this->assertTrue( IP::isIPv6( '::fc' ) );
- $this->assertTrue( IP::isIPv6( '::fc:100' ) );
- $this->assertTrue( IP::isIPv6( '::fc:100:a' ) );
- $this->assertTrue( IP::isIPv6( '::fc:100:a:d' ) );
- $this->assertTrue( IP::isIPv6( '::fc:100:a:d:1' ) );
- $this->assertTrue( IP::isIPv6( '::fc:100:a:d:1:e' ) );
- $this->assertTrue( IP::isIPv6( '::fc:100:a:d:1:e:ac' ) );
-
- $this->assertFalse( IP::isIPv6( '::fc:100:a:d:1:e:ac:0' ), 'IPv6 with "::" and 8 words' );
- $this->assertFalse( IP::isIPv6( '::fc:100:a:d:1:e:ac:0:1' ), 'IPv6 with 9 words' );
-
- $this->assertFalse( IP::isIPv6( ':fc::100' ), 'IPv6 starting with lone ":"' );
- $this->assertFalse( IP::isIPv6( 'fc::100:' ), 'IPv6 ending with lone ":"' );
- $this->assertFalse( IP::isIPv6( 'fc:::100' ), 'IPv6 with ":::" in the middle' );
-
- $this->assertTrue( IP::isIPv6( 'fc::100' ), 'IPv6 with "::" and 2 words' );
- $this->assertTrue( IP::isIPv6( 'fc::100:a' ), 'IPv6 with "::" and 3 words' );
- $this->assertTrue( IP::isIPv6( 'fc::100:a:d', 'IPv6 with "::" and 4 words' ) );
- $this->assertTrue( IP::isIPv6( 'fc::100:a:d:1' ), 'IPv6 with "::" and 5 words' );
- $this->assertTrue( IP::isIPv6( 'fc::100:a:d:1:e' ), 'IPv6 with "::" and 6 words' );
- $this->assertTrue( IP::isIPv6( 'fc::100:a:d:1:e:ac' ), 'IPv6 with "::" and 7 words' );
- $this->assertTrue( IP::isIPv6( '2001::df' ), 'IPv6 with "::" and 2 words' );
- $this->assertTrue( IP::isIPv6( '2001:5c0:1400:a::df' ), 'IPv6 with "::" and 5 words' );
- $this->assertTrue( IP::isIPv6( '2001:5c0:1400:a::df:2' ), 'IPv6 with "::" and 6 words' );
-
- $this->assertFalse( IP::isIPv6( 'fc::100:a:d:1:e:ac:0' ), 'IPv6 with "::" and 8 words' );
- $this->assertFalse( IP::isIPv6( 'fc::100:a:d:1:e:ac:0:1' ), 'IPv6 with 9 words' );
-
- $this->assertTrue( IP::isIPv6( 'fc:100:a:d:1:e:ac:0' ) );
- }
-
- /**
- * @covers IP::isIPv4
- * @dataProvider provideInvalidIPv4Addresses
- */
- public function testisNotIPv4( $bogusIP, $desc ) {
- $this->assertFalse( IP::isIPv4( $bogusIP ), $desc );
- }
-
- public function provideInvalidIPv4Addresses() {
- return [
- [ false, 'Boolean false is not an IP' ],
- [ true, 'Boolean true is not an IP' ],
- [ '', 'Empty string is not an IP' ],
- [ 'abc', 'Letters are not an IP' ],
- [ ':', 'A colon is not an IP' ],
- [ '124.24.52', 'IPv4 not enough quads' ],
- [ '24.324.52.13', 'IPv4 out of range' ],
- [ '.24.52.13', 'IPv4 starts with period' ],
- ];
- }
-
- /**
- * @covers IP::isIPv4
- * @dataProvider provideValidIPv4Address
- */
- public function testIsIPv4( $ip, $desc ) {
- $this->assertTrue( IP::isIPv4( $ip ), $desc );
- }
-
- /**
- * Provide some IPv4 addresses and ranges
- */
- public function provideValidIPv4Address() {
- return [
- [ '124.24.52.13', 'Valid IPv4 address' ],
- [ '1.24.52.13', 'Another valid IPv4 address' ],
- [ '74.24.52.13/20', 'An IPv4 range' ],
- ];
- }
-
- /**
- * @covers IP::isValid
- */
- public function testValidIPs() {
- foreach ( range( 0, 255 ) as $i ) {
- $a = sprintf( "%03d", $i );
- $b = sprintf( "%02d", $i );
- $c = sprintf( "%01d", $i );
- foreach ( array_unique( [ $a, $b, $c ] ) as $f ) {
- $ip = "$f.$f.$f.$f";
- $this->assertTrue( IP::isValid( $ip ), "$ip is a valid IPv4 address" );
- }
- }
- foreach ( range( 0x0, 0xFFFF, 0xF ) as $i ) {
- $a = sprintf( "%04x", $i );
- $b = sprintf( "%03x", $i );
- $c = sprintf( "%02x", $i );
- foreach ( array_unique( [ $a, $b, $c ] ) as $f ) {
- $ip = "$f:$f:$f:$f:$f:$f:$f:$f";
- $this->assertTrue( IP::isValid( $ip ), "$ip is a valid IPv6 address" );
- }
- }
- // test with some abbreviations
- $this->assertFalse( IP::isValid( ':fc:100::' ), 'IPv6 starting with lone ":"' );
- $this->assertFalse( IP::isValid( 'fc:100:::' ), 'IPv6 ending with a ":::"' );
- $this->assertFalse( IP::isValid( 'fc:300' ), 'IPv6 with only 2 words' );
- $this->assertFalse( IP::isValid( 'fc:100:300' ), 'IPv6 with only 3 words' );
-
- $this->assertTrue( IP::isValid( 'fc:100::' ) );
- $this->assertTrue( IP::isValid( 'fc:100:a:d:1:e::' ) );
- $this->assertTrue( IP::isValid( 'fc:100:a:d:1:e:ac::' ) );
-
- $this->assertTrue( IP::isValid( 'fc::100' ), 'IPv6 with "::" and 2 words' );
- $this->assertTrue( IP::isValid( 'fc::100:a' ), 'IPv6 with "::" and 3 words' );
- $this->assertTrue( IP::isValid( '2001::df' ), 'IPv6 with "::" and 2 words' );
- $this->assertTrue( IP::isValid( '2001:5c0:1400:a::df' ), 'IPv6 with "::" and 5 words' );
- $this->assertTrue( IP::isValid( '2001:5c0:1400:a::df:2' ), 'IPv6 with "::" and 6 words' );
- $this->assertTrue( IP::isValid( 'fc::100:a:d:1' ), 'IPv6 with "::" and 5 words' );
- $this->assertTrue( IP::isValid( 'fc::100:a:d:1:e:ac' ), 'IPv6 with "::" and 7 words' );
-
- $this->assertFalse(
- IP::isValid( 'fc:100:a:d:1:e:ac:0::' ),
- 'IPv6 with 8 words ending with "::"'
- );
- $this->assertFalse(
- IP::isValid( 'fc:100:a:d:1:e:ac:0:1::' ),
- 'IPv6 with 9 words ending with "::"'
- );
- }
-
- /**
- * @covers IP::isValid
- */
- public function testInvalidIPs() {
- // Out of range...
- foreach ( range( 256, 999 ) as $i ) {
- $a = sprintf( "%03d", $i );
- $b = sprintf( "%02d", $i );
- $c = sprintf( "%01d", $i );
- foreach ( array_unique( [ $a, $b, $c ] ) as $f ) {
- $ip = "$f.$f.$f.$f";
- $this->assertFalse( IP::isValid( $ip ), "$ip is not a valid IPv4 address" );
- }
- }
- foreach ( range( 'g', 'z' ) as $i ) {
- $a = sprintf( "%04s", $i );
- $b = sprintf( "%03s", $i );
- $c = sprintf( "%02s", $i );
- foreach ( array_unique( [ $a, $b, $c ] ) as $f ) {
- $ip = "$f:$f:$f:$f:$f:$f:$f:$f";
- $this->assertFalse( IP::isValid( $ip ), "$ip is not a valid IPv6 address" );
- }
- }
- // Have CIDR
- $ipCIDRs = [
- '212.35.31.121/32',
- '212.35.31.121/18',
- '212.35.31.121/24',
- '::ff:d:321:5/96',
- 'ff::d3:321:5/116',
- 'c:ff:12:1:ea:d:321:5/120',
- ];
- foreach ( $ipCIDRs as $i ) {
- $this->assertFalse( IP::isValid( $i ),
- "$i is an invalid IP address because it is a block" );
- }
- // Incomplete/garbage
- $invalid = [
- 'www.xn--var-xla.net',
- '216.17.184.G',
- '216.17.184.1.',
- '216.17.184',
- '216.17.184.',
- '256.17.184.1'
- ];
- foreach ( $invalid as $i ) {
- $this->assertFalse( IP::isValid( $i ), "$i is an invalid IP address" );
- }
- }
-
- /**
- * Provide some valid IP blocks
- */
- public function provideValidBlocks() {
- return [
- [ '116.17.184.5/32' ],
- [ '0.17.184.5/30' ],
- [ '16.17.184.1/24' ],
- [ '30.242.52.14/1' ],
- [ '10.232.52.13/8' ],
- [ '30.242.52.14/0' ],
- [ '::e:f:2001/96' ],
- [ '::c:f:2001/128' ],
- [ '::10:f:2001/70' ],
- [ '::fe:f:2001/1' ],
- [ '::6d:f:2001/8' ],
- [ '::fe:f:2001/0' ],
- ];
- }
-
- /**
- * @covers IP::isValidBlock
- * @dataProvider provideValidBlocks
- */
- public function testValidBlocks( $block ) {
- $this->assertTrue( IP::isValidBlock( $block ), "$block is a valid IP block" );
- }
-
- /**
- * @covers IP::isValidBlock
- * @dataProvider provideInvalidBlocks
- */
- public function testInvalidBlocks( $invalid ) {
- $this->assertFalse( IP::isValidBlock( $invalid ), "$invalid is not a valid IP block" );
- }
-
- public function provideInvalidBlocks() {
- return [
- [ '116.17.184.5/33' ],
- [ '0.17.184.5/130' ],
- [ '16.17.184.1/-1' ],
- [ '10.232.52.13/*' ],
- [ '7.232.52.13/ab' ],
- [ '11.232.52.13/' ],
- [ '::e:f:2001/129' ],
- [ '::c:f:2001/228' ],
- [ '::10:f:2001/-1' ],
- [ '::6d:f:2001/*' ],
- [ '::86:f:2001/ab' ],
- [ '::23:f:2001/' ],
- ];
- }
-
- /**
- * @covers IP::sanitizeIP
- * @dataProvider provideSanitizeIP
- */
- public function testSanitizeIP( $expected, $input ) {
- $result = IP::sanitizeIP( $input );
- $this->assertEquals( $expected, $result );
- }
-
- /**
- * Provider for IP::testSanitizeIP()
- */
- public static function provideSanitizeIP() {
- return [
- [ '0.0.0.0', '0.0.0.0' ],
- [ '0.0.0.0', '00.00.00.00' ],
- [ '0.0.0.0', '000.000.000.000' ],
- [ '141.0.11.253', '141.000.011.253' ],
- [ '1.2.4.5', '1.2.4.5' ],
- [ '1.2.4.5', '01.02.04.05' ],
- [ '1.2.4.5', '001.002.004.005' ],
- [ '10.0.0.1', '010.0.000.1' ],
- [ '80.72.250.4', '080.072.250.04' ],
- [ 'Foo.1000.00', 'Foo.1000.00' ],
- [ 'Bar.01', 'Bar.01' ],
- [ 'Bar.010', 'Bar.010' ],
- [ null, '' ],
- [ null, ' ' ]
- ];
- }
-
- /**
- * @covers IP::toHex
- * @dataProvider provideToHex
- */
- public function testToHex( $expected, $input ) {
- $result = IP::toHex( $input );
- $this->assertTrue( $result === false || is_string( $result ) );
- $this->assertEquals( $expected, $result );
- }
-
- /**
- * Provider for IP::testToHex()
- */
- public static function provideToHex() {
- return [
- [ '00000001', '0.0.0.1' ],
- [ '01020304', '1.2.3.4' ],
- [ '7F000001', '127.0.0.1' ],
- [ '80000000', '128.0.0.0' ],
- [ 'DEADCAFE', '222.173.202.254' ],
- [ 'FFFFFFFF', '255.255.255.255' ],
- [ '8D000BFD', '141.000.11.253' ],
- [ false, 'IN.VA.LI.D' ],
- [ 'v6-00000000000000000000000000000001', '::1' ],
- [ 'v6-20010DB885A3000000008A2E03707334', '2001:0db8:85a3:0000:0000:8a2e:0370:7334' ],
- [ 'v6-20010DB885A3000000008A2E03707334', '2001:db8:85a3::8a2e:0370:7334' ],
- [ false, 'IN:VA::LI:D' ],
- [ false, ':::1' ]
- ];
- }
-
- /**
- * @covers IP::isPublic
- * @dataProvider provideIsPublic
- */
- public function testIsPublic( $expected, $input ) {
- $result = IP::isPublic( $input );
- $this->assertEquals( $expected, $result );
- }
-
- /**
- * Provider for IP::testIsPublic()
- */
- public static function provideIsPublic() {
- return [
- [ false, 'fc00::3' ], # RFC 4193 (local)
- [ false, 'fc00::ff' ], # RFC 4193 (local)
- [ false, '127.1.2.3' ], # loopback
- [ false, '::1' ], # loopback
- [ false, 'fe80::1' ], # link-local
- [ false, '169.254.1.1' ], # link-local
- [ false, '10.0.0.1' ], # RFC 1918 (private)
- [ false, '172.16.0.1' ], # RFC 1918 (private)
- [ false, '192.168.0.1' ], # RFC 1918 (private)
- [ true, '2001:5c0:1000:a::133' ], # public
- [ true, 'fc::3' ], # public
- [ true, '00FC::' ] # public
- ];
- }
-
- // Private wrapper used to test CIDR Parsing.
- private function assertFalseCIDR( $CIDR, $msg = '' ) {
- $ff = [ false, false ];
- $this->assertEquals( $ff, IP::parseCIDR( $CIDR ), $msg );
- }
-
- // Private wrapper to test network shifting using only dot notation
- private function assertNet( $expected, $CIDR ) {
- $parse = IP::parseCIDR( $CIDR );
- $this->assertEquals( $expected, long2ip( $parse[0] ), "network shifting $CIDR" );
- }
-
- /**
- * @covers IP::hexToQuad
- * @dataProvider provideIPsAndHexes
- */
- public function testHexToQuad( $ip, $hex ) {
- $this->assertEquals( $ip, IP::hexToQuad( $hex ) );
- }
-
- /**
- * Provide some IP addresses and their equivalent hex representations
- */
- public function provideIPsandHexes() {
- return [
- [ '0.0.0.1', '00000001' ],
- [ '255.0.0.0', 'FF000000' ],
- [ '255.255.255.255', 'FFFFFFFF' ],
- [ '10.188.222.255', '0ABCDEFF' ],
- // hex not left-padded...
- [ '0.0.0.0', '0' ],
- [ '0.0.0.1', '1' ],
- [ '0.0.0.255', 'FF' ],
- [ '0.0.255.0', 'FF00' ],
- ];
- }
-
- /**
- * @covers IP::hexToOctet
- * @dataProvider provideOctetsAndHexes
- */
- public function testHexToOctet( $octet, $hex ) {
- $this->assertEquals( $octet, IP::hexToOctet( $hex ) );
- }
-
- /**
- * Provide some hex and octet representations of the same IPs
- */
- public function provideOctetsAndHexes() {
- return [
- [ '0:0:0:0:0:0:0:1', '00000000000000000000000000000001' ],
- [ '0:0:0:0:0:0:FF:3', '00000000000000000000000000FF0003' ],
- [ '0:0:0:0:0:0:FF00:6', '000000000000000000000000FF000006' ],
- [ '0:0:0:0:0:0:FCCF:FAFF', '000000000000000000000000FCCFFAFF' ],
- [ 'FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF', 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF' ],
- // hex not left-padded...
- [ '0:0:0:0:0:0:0:0', '0' ],
- [ '0:0:0:0:0:0:0:1', '1' ],
- [ '0:0:0:0:0:0:0:FF', 'FF' ],
- [ '0:0:0:0:0:0:0:FFD0', 'FFD0' ],
- [ '0:0:0:0:0:0:FA00:0', 'FA000000' ],
- [ '0:0:0:0:0:0:FCCF:FAFF', 'FCCFFAFF' ],
- ];
- }
-
- /**
- * IP::parseCIDR() returns an array containing a signed IP address
- * representing the network mask and the bit mask.
- * @covers IP::parseCIDR
- */
- public function testCIDRParsing() {
- $this->assertFalseCIDR( '192.0.2.0', "missing mask" );
- $this->assertFalseCIDR( '192.0.2.0/', "missing bitmask" );
-
- // Verify if statement
- $this->assertFalseCIDR( '256.0.0.0/32', "invalid net" );
- $this->assertFalseCIDR( '192.0.2.0/AA', "mask not numeric" );
- $this->assertFalseCIDR( '192.0.2.0/-1', "mask < 0" );
- $this->assertFalseCIDR( '192.0.2.0/33', "mask > 32" );
-
- // Check internal logic
- # 0 mask always result in array(0,0)
- $this->assertEquals( [ 0, 0 ], IP::parseCIDR( '192.0.0.2/0' ) );
- $this->assertEquals( [ 0, 0 ], IP::parseCIDR( '0.0.0.0/0' ) );
- $this->assertEquals( [ 0, 0 ], IP::parseCIDR( '255.255.255.255/0' ) );
-
- // @todo FIXME: Add more tests.
-
- # This part test network shifting
- $this->assertNet( '192.0.0.0', '192.0.0.2/24' );
- $this->assertNet( '192.168.5.0', '192.168.5.13/24' );
- $this->assertNet( '10.0.0.160', '10.0.0.161/28' );
- $this->assertNet( '10.0.0.0', '10.0.0.3/28' );
- $this->assertNet( '10.0.0.0', '10.0.0.3/30' );
- $this->assertNet( '10.0.0.4', '10.0.0.4/30' );
- $this->assertNet( '172.17.32.0', '172.17.35.48/21' );
- $this->assertNet( '10.128.0.0', '10.135.0.0/9' );
- $this->assertNet( '134.0.0.0', '134.0.5.1/8' );
- }
-
- /**
- * @covers IP::canonicalize
- */
- public function testIPCanonicalizeOnValidIp() {
- $this->assertEquals( '192.0.2.152', IP::canonicalize( '192.0.2.152' ),
- 'Canonicalization of a valid IP returns it unchanged' );
- }
-
- /**
- * @covers IP::canonicalize
- */
- public function testIPCanonicalizeMappedAddress() {
- $this->assertEquals(
- '192.0.2.152',
- IP::canonicalize( '::ffff:192.0.2.152' )
- );
- $this->assertEquals(
- '192.0.2.152',
- IP::canonicalize( '::192.0.2.152' )
- );
- }
-
- /**
- * Issues there are most probably from IP::toHex() or IP::parseRange()
- * @covers IP::isInRange
- * @dataProvider provideIPsAndRanges
- */
- public function testIPIsInRange( $expected, $addr, $range, $message = '' ) {
- $this->assertEquals(
- $expected,
- IP::isInRange( $addr, $range ),
- $message
- );
- }
-
- /** Provider for testIPIsInRange() */
- public static function provideIPsAndRanges() {
- # Format: (expected boolean, address, range, optional message)
- return [
- # IPv4
- [ true, '192.0.2.0', '192.0.2.0/24', 'Network address' ],
- [ true, '192.0.2.77', '192.0.2.0/24', 'Simple address' ],
- [ true, '192.0.2.255', '192.0.2.0/24', 'Broadcast address' ],
-
- [ false, '0.0.0.0', '192.0.2.0/24' ],
- [ false, '255.255.255', '192.0.2.0/24' ],
-
- # IPv6
- [ false, '::1', '2001:DB8::/32' ],
- [ false, '::', '2001:DB8::/32' ],
- [ false, 'FE80::1', '2001:DB8::/32' ],
-
- [ true, '2001:DB8::', '2001:DB8::/32' ],
- [ true, '2001:0DB8::', '2001:DB8::/32' ],
- [ true, '2001:DB8::1', '2001:DB8::/32' ],
- [ true, '2001:0DB8::1', '2001:DB8::/32' ],
- [ true, '2001:0DB8:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF',
- '2001:DB8::/32' ],
-
- [ false, '2001:0DB8:F::', '2001:DB8::/96' ],
- ];
- }
-
- /**
- * Test for IP::splitHostAndPort().
- * @dataProvider provideSplitHostAndPort
- */
- public function testSplitHostAndPort( $expected, $input, $description ) {
- $this->assertEquals( $expected, IP::splitHostAndPort( $input ), $description );
- }
-
- /**
- * Provider for IP::splitHostAndPort()
- */
- public static function provideSplitHostAndPort() {
- return [
- [ false, '[', 'Unclosed square bracket' ],
- [ false, '[::', 'Unclosed square bracket 2' ],
- [ [ '::', false ], '::', 'Bare IPv6 0' ],
- [ [ '::1', false ], '::1', 'Bare IPv6 1' ],
- [ [ '::', false ], '[::]', 'Bracketed IPv6 0' ],
- [ [ '::1', false ], '[::1]', 'Bracketed IPv6 1' ],
- [ [ '::1', 80 ], '[::1]:80', 'Bracketed IPv6 with port' ],
- [ false, '::x', 'Double colon but no IPv6' ],
- [ [ 'x', 80 ], 'x:80', 'Hostname and port' ],
- [ false, 'x:x', 'Hostname and invalid port' ],
- [ [ 'x', false ], 'x', 'Plain hostname' ]
- ];
- }
-
- /**
- * Test for IP::combineHostAndPort()
- * @dataProvider provideCombineHostAndPort
- */
- public function testCombineHostAndPort( $expected, $input, $description ) {
- list( $host, $port, $defaultPort ) = $input;
- $this->assertEquals(
- $expected,
- IP::combineHostAndPort( $host, $port, $defaultPort ),
- $description );
- }
-
- /**
- * Provider for IP::combineHostAndPort()
- */
- public static function provideCombineHostAndPort() {
- return [
- [ '[::1]', [ '::1', 2, 2 ], 'IPv6 default port' ],
- [ '[::1]:2', [ '::1', 2, 3 ], 'IPv6 non-default port' ],
- [ 'x', [ 'x', 2, 2 ], 'Normal default port' ],
- [ 'x:2', [ 'x', 2, 3 ], 'Normal non-default port' ],
- ];
- }
-
- /**
- * Test for IP::sanitizeRange()
- * @dataProvider provideIPCIDRs
- */
- public function testSanitizeRange( $input, $expected, $description ) {
- $this->assertEquals( $expected, IP::sanitizeRange( $input ), $description );
- }
-
- /**
- * Provider for IP::testSanitizeRange()
- */
- public static function provideIPCIDRs() {
- return [
- [ '35.56.31.252/16', '35.56.0.0/16', 'IPv4 range' ],
- [ '135.16.21.252/24', '135.16.21.0/24', 'IPv4 range' ],
- [ '5.36.71.252/32', '5.36.71.252/32', 'IPv4 silly range' ],
- [ '5.36.71.252', '5.36.71.252', 'IPv4 non-range' ],
- [ '0:1:2:3:4:c5:f6:7/96', '0:1:2:3:4:C5:0:0/96', 'IPv6 range' ],
- [ '0:1:2:3:4:5:6:7/120', '0:1:2:3:4:5:6:0/120', 'IPv6 range' ],
- [ '0:e1:2:3:4:5:e6:7/128', '0:E1:2:3:4:5:E6:7/128', 'IPv6 silly range' ],
- [ '0:c1:A2:3:4:5:c6:7', '0:C1:A2:3:4:5:C6:7', 'IPv6 non range' ],
- ];
- }
-
- /**
- * Test for IP::prettifyIP()
- * @dataProvider provideIPsToPrettify
- */
- public function testPrettifyIP( $ip, $prettified ) {
- $this->assertEquals( $prettified, IP::prettifyIP( $ip ), "Prettify of $ip" );
- }
-
- /**
- * Provider for IP::testPrettifyIP()
- */
- public static function provideIPsToPrettify() {
- return [
- [ '0:0:0:0:0:0:0:0', '::' ],
- [ '0:0:0::0:0:0', '::' ],
- [ '0:0:0:1:0:0:0:0', '0:0:0:1::' ],
- [ '0:0::f', '::f' ],
- [ '0::0:0:0:33:fef:b', '::33:fef:b' ],
- [ '3f:535:0:0:0:0:e:fbb', '3f:535::e:fbb' ],
- [ '0:0:fef:0:0:0:e:fbb', '0:0:fef::e:fbb' ],
- [ 'abbc:2004::0:0:0:0', 'abbc:2004::' ],
- [ 'cebc:2004:f:0:0:0:0:0', 'cebc:2004:f::' ],
- [ '0:0:0:0:0:0:0:0/16', '::/16' ],
- [ '0:0:0::0:0:0/64', '::/64' ],
- [ '0:0::f/52', '::f/52' ],
- [ '::0:0:33:fef:b/52', '::33:fef:b/52' ],
- [ '3f:535:0:0:0:0:e:fbb/48', '3f:535::e:fbb/48' ],
- [ '0:0:fef:0:0:0:e:fbb/96', '0:0:fef::e:fbb/96' ],
- [ 'abbc:2004:0:0::0:0/40', 'abbc:2004::/40' ],
- [ 'aebc:2004:f:0:0:0:0:0/80', 'aebc:2004:f::/80' ],
- ];
- }
-}
--- /dev/null
+<?php
+
+/**
+ * Class simulating a local file repo.
+ *
+ * @ingroup FileRepo
+ * @since 1.28
+ */
+class MockLocalRepo extends LocalRepo {
+ function getLocalCopy( $virtualUrl ) {
+ return new MockFSFile( wfTempDir() . '/' . wfRandomString( 32 ) );
+ }
+
+ function getLocalReference( $virtualUrl ) {
+ return new MockFSFile( wfTempDir() . '/' . wfRandomString( 32 ) );
+ }
+
+ function getFileProps( $virtualUrl ) {
+ $fsFile = $this->getLocalReference( $virtualUrl );
+
+ return $fsFile->getProps();
+ }
+}
dépôts / lhc / web / wiklou.git / commitdiff