X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fuser%2FUser.php;h=fa84c94ca7550223ca5738a1135625cf363c942f;hp=a1119fafc4fa632fcbc5b2298cc502839551d3aa;hb=fb79f30319b9ad2a7eb0f5f4d1668143ec8f963e;hpb=2f28050b6b866f684da92c1832c0a3938b59ef0b

diff --git a/includes/user/User.php b/includes/user/User.php
index a1119fafc4..fa84c94ca7 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -305,12 +305,6 @@ class User implements IDBAccessObject {
 	/** @var integer User::READ_* constant bitfield used to load data */
 	protected $queryFlagsUsed = self::READ_NORMAL;
 
-	/** @var string Indicates type of block (used for eventlogging)
-	 * Permitted values: 'cookie-block', 'proxy-block', 'openproxy-block', 'xff-block',
-	 * 'config-block'
-	 */
-	public $blockTrigger = false;
-
 	public static $idCacheByName = [];
 
 	/**
@@ -609,7 +603,7 @@ class User implements IDBAccessObject {
 			]
 		);
 
-		return $id ? User::newFromId( $id ) : null;
+		return $id ? self::newFromId( $id ) : null;
 	}
 
 	/**
@@ -848,7 +842,7 @@ class User implements IDBAccessObject {
 		global $wgContLang, $wgMaxNameChars;
 
 		if ( $name == ''
-			|| User::isIP( $name )
+			|| self::isIP( $name )
 			|| strpos( $name, '/' ) !== false
 			|| strlen( $name ) > $wgMaxNameChars
 			|| $name != $wgContLang->ucfirst( $name )
@@ -1115,17 +1109,17 @@ class User implements IDBAccessObject {
 			case false:
 				break;
 			case 'valid':
-				if ( !User::isValidUserName( $name ) ) {
+				if ( !self::isValidUserName( $name ) ) {
 					$name = false;
 				}
 				break;
 			case 'usable':
-				if ( !User::isUsableName( $name ) ) {
+				if ( !self::isUsableName( $name ) ) {
 					$name = false;
 				}
 				break;
 			case 'creatable':
-				if ( !User::isCreatableName( $name ) ) {
+				if ( !self::isCreatableName( $name ) ) {
 					$name = false;
 				}
 				break;
@@ -1597,7 +1591,7 @@ class User implements IDBAccessObject {
 		// since extensions may change the set of searchable namespaces depending
 		// on user groups/permissions.
 		foreach ( $wgNamespacesToBeSearchedDefault as $nsnum => $val ) {
-			$defOpt['searchNs' . $nsnum] = (boolean)$val;
+			$defOpt['searchNs' . $nsnum] = (bool)$val;
 		}
 		$defOpt['skin'] = Skin::normalizeKey( $wgDefaultSkin );
 
@@ -1676,7 +1670,6 @@ class User implements IDBAccessObject {
 					'address' => $ip,
 					'systemBlock' => 'proxy',
 				] );
-				$this->blockTrigger = 'proxy-block';
 			} elseif ( $this->isAnon() && $this->isDnsBlacklisted( $ip ) ) {
 				$block = new Block( [
 					'byText' => wfMessage( 'sorbs' )->text(),
@@ -1684,7 +1677,6 @@ class User implements IDBAccessObject {
 					'address' => $ip,
 					'systemBlock' => 'dnsbl',
 				] );
-				$this->blockTrigger = 'openproxy-block';
 			}
 		}
 
@@ -1703,7 +1695,6 @@ class User implements IDBAccessObject {
 				# Mangle the reason to alert the user that the block
 				# originated from matching the X-Forwarded-For header.
 				$block->mReason = wfMessage( 'xffblockreason', $block->mReason )->text();
-				$this->blockTrigger = 'xff-block';
 			}
 		}
 
@@ -1719,7 +1710,6 @@ class User implements IDBAccessObject {
 				'anonOnly' => true,
 				'systemBlock' => 'wgSoftBlockRanges',
 			] );
-			$this->blockTrigger = 'config-block';
 		}
 
 		if ( $block instanceof Block ) {
@@ -1733,7 +1723,6 @@ class User implements IDBAccessObject {
 			$this->mBlockedby = '';
 			$this->mHideName = 0;
 			$this->mAllowUsertalk = false;
-			$this->blockTrigger = false;
 		}
 
 		// Avoid PHP 7.1 warning of passing $this by reference
@@ -1766,7 +1755,6 @@ class User implements IDBAccessObject {
 				$useBlockCookie = ( $config->get( 'CookieSetOnAutoblock' ) === true );
 				if ( $blockIsValid && $useBlockCookie ) {
 					// Use the block.
-					$this->blockTrigger = 'cookie-block';
 					return $tmpBlock;
 				} else {
 					// If the block is not valid, remove the cookie.
@@ -2224,7 +2212,7 @@ class User implements IDBAccessObject {
 	 * @return int The user's ID; 0 if the user is anonymous or nonexistent
 	 */
 	public function getId() {
-		if ( $this->mId === null && $this->mName !== null && User::isIP( $this->mName ) ) {
+		if ( $this->mId === null && $this->mName !== null && self::isIP( $this->mName ) ) {
 			// Special case, we know the user is anonymous
 			return 0;
 		} elseif ( !$this->isItemLoaded( 'id' ) ) {
@@ -4143,7 +4131,7 @@ class User implements IDBAccessObject {
 		}
 		$dbw->insert( 'user', $fields, __METHOD__, [ 'IGNORE' ] );
 		if ( $dbw->affectedRows() ) {
-			$newUser = User::newFromId( $dbw->insertId() );
+			$newUser = self::newFromId( $dbw->insertId() );
 		} else {
 			$newUser = null;
 		}
@@ -5048,7 +5036,7 @@ class User implements IDBAccessObject {
 			// Do nothing
 		} elseif ( $wgGroupsAddToSelf[$group] === true ) {
 			// No idea WHY this would be used, but it's there
-			$groups['add-self'] = User::getAllGroups();
+			$groups['add-self'] = self::getAllGroups();
 		} elseif ( is_array( $wgGroupsAddToSelf[$group] ) ) {
 			$groups['add-self'] = $wgGroupsAddToSelf[$group];
 		}
@@ -5056,7 +5044,7 @@ class User implements IDBAccessObject {
 		if ( empty( $wgGroupsRemoveFromSelf[$group] ) ) {
 			// Do nothing
 		} elseif ( $wgGroupsRemoveFromSelf[$group] === true ) {
-			$groups['remove-self'] = User::getAllGroups();
+			$groups['remove-self'] = self::getAllGroups();
 		} elseif ( is_array( $wgGroupsRemoveFromSelf[$group] ) ) {
 			$groups['remove-self'] = $wgGroupsRemoveFromSelf[$group];
 		}
@@ -5077,7 +5065,7 @@ class User implements IDBAccessObject {
 			// compatibility with old "userrights lets you change
 			// everything")
 			// Using array_merge to make the groups reindexed
-			$all = array_merge( User::getAllGroups() );
+			$all = array_merge( self::getAllGroups() );
 			return [
 				'add' => $all,
 				'remove' => $all,
@@ -5503,7 +5491,7 @@ class User implements IDBAccessObject {
 		global $wgLang;
 
 		$groups = [];
-		foreach ( User::getGroupsWithPermission( $permission ) as $group ) {
+		foreach ( self::getGroupsWithPermission( $permission ) as $group ) {
 			$groups[] = UserGroupMembership::getLink( $group, RequestContext::getMain(), 'wiki' );
 		}