From: Rotem Liss <rotem@users.mediawiki.org>
Date: Wed, 19 Dec 2007 19:00:36 +0000 (+0000)
Subject: Various cleanups and fixes.
X-Git-Tag: 1.31.0-rc.0~50338
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=d2d11d8dbaf35ccec5e3f185ac508cccd294155e;p=lhc%2Fweb%2Fwiklou.git

Various cleanups and fixes.
---

diff --git a/includes/SpecialUserrights.php b/includes/SpecialUserrights.php
index 6378d0858c..2b35f1b169 100644
--- a/includes/SpecialUserrights.php
+++ b/includes/SpecialUserrights.php
@@ -78,52 +78,37 @@ class UserrightsForm extends HTMLForm {
 	 */
 	function saveUserGroups( $username, $removegroup, $addgroup, $reason = '') {
 		$split = $this->splitUsername( $username );
-		if( WikiError::isError( $split ) ) {
-			$wgOut->addWikiText( wfMsg( 'userrights-nodatabase', $split->getMessage() ) );
+		if( !$split ) {
 			return;
 		}
-
 		list( $database, $name ) = $split;
-		$this->db =& $this->getDB( $database );
-		$userid = $this->getUserId( $database, $name );
 
-		if( $userid == 0) {
-			$wgOut->addWikiText( wfMsg( 'nosuchusershort', wfEscapeWikiText( $username ) ) );
-			return;
-		}
-
-		global $wgUser;
-		if ($database != '' && !$wgUser->isAllowed('userrights-interwiki')) {
-			$wgOut->addWikiText( wfMsg( 'userrights-no-interwiki' ) );
-			return;
-		}
-
-		$oldGroups = $this->getUserGroups( $database, $userid );
+		$oldGroups = $this->getUserGroups();
 		$newGroups = $oldGroups;
-		// remove then add groups		
+		// remove then add groups
 		if(isset($removegroup)) {
 			$newGroups = array_diff($newGroups, $removegroup);
 			foreach( $removegroup as $group ) {
-				$this->removeUserGroup( $database, $userid, $group );
+				$this->removeUserGroup( $group );
 			}
 		}
 		if(isset($addgroup)) {
 			$newGroups = array_merge($newGroups, $addgroup);
 			foreach( $addgroup as $group ) {
-				$this->addUserGroup( $database, $userid, $group );
+				$this->addUserGroup( $group );
 			}
 		}
 		$newGroups = array_unique( $newGroups );
 
 		// Ensure that caches are cleared
-		$this->touchUser( $database, $userid );
+		$this->touchUser( $database );
 
 		wfDebug( 'oldGroups: ' . print_r( $oldGroups, true ) );
 		wfDebug( 'newGroups: ' . print_r( $newGroups, true ) );
 		wfRunHooks( 'UserRights', array( &$u, $addgroup, $removegroup ) );
 
 		$log = new LogPage( 'rights' );
-		$log->addEntry( 'rights', Title::makeTitle( NS_USER, $username ), $this->mReason, array( $this->makeGroupNameList( $oldGroups ),
+		$log->addEntry( 'rights', Title::makeTitleSafe( NS_USER, $username ), $this->mReason, array( $this->makeGroupNameList( $oldGroups ),
 			$this->makeGroupNameList( $newGroups ) ) );
 	}
 
@@ -132,52 +117,66 @@ class UserrightsForm extends HTMLForm {
 	 * @param string $username Name of the user.
 	 */
 	function editUserGroupsForm($username) {
-		global $wgOut, $wgUser;
-		
+		global $wgOut;
+
 		$split = $this->splitUsername( $username );
-		if( WikiError::isError( $split ) ) {
-			$wgOut->addWikiText( wfMsg( 'userrights-nodatabase', $split->getMessage() ) );
+		if( !$split ) {
 			return;
 		}
-
 		list( $database, $name ) = $split;
-		$this->db =& $this->getDB( $database );
-		$userid = $this->getUserId( $database, $name );
-
-		if( $name == '' ) {
-			$wgOut->addWikiText( wfMsg( 'nouserspecified' ) );
-			return;
-		} elseif( $userid == 0) {
-			$wgOut->addWikiText( wfMsg( 'nosuchusershort', wfEscapeWikiText( $username ) ) );
-			return;
-		}
-
-		global $wgUser;
-		if ($database != '' && !$wgUser->isAllowed('userrights-interwiki')) {
-			$wgOut->addWikiText( wfMsg( 'userrights-no-interwiki' ) );
-			return;
-		}
 
-		$groups = $this->getUserGroups( $database, $userid );
+		$groups = $this->getUserGroups();
 		
 		$this->showEditUserGroupsForm( $username, $groups );
 
-		if ($database == '') {
+		if ($database == '' && $username{0} != '#') {
 			$this->showLogFragment( User::newFromName($username), $wgOut );
 		}
 	}
 
 	function splitUsername( $username ) {
+		global $wgOut, $wgUser, $wgLocalDatabases;
+
 		$parts = explode( '@', $username );
 		if( count( $parts ) < 2 ) {
-			return array( '', $username );
+			$name = $username;
+			$database = '';
+		} else {
+			list( $name, $database ) = $parts;
+		}
+
+		if( $database != '' && !in_array( $database, $wgLocalDatabases ) ) {
+			$wgOut->addWikiText( wfMsg( 'userrights-nodatabase', $database ) );
+			return;
+		}
+
+		if( $name == '' ) {
+			$wgOut->addWikiText( wfMsg( 'nouserspecified' ) );
+			return;
+		}
+
+		if( $name{0} != '#' ) {
+			# Avoid normalization when the input is a user ID
+			$name = User::getCanonicalName( $name );
+			if( !$name ) {
+				$wgOut->addWikiText( wfMsg( 'noname' ) );
+				return;
+			}
+		}
+		$this->db =& $this->getDB( $database );
+		$this->userid = $this->getUserId( $name );
+
+		if( $this->userid == 0 ) {
+			$wgOut->addWikiText( wfMsg( 'nosuchusershort', wfEscapeWikiText( $username ) ) );
+			return;
+		}
+
+		if( $database != '' && !$wgUser->isAllowed('userrights-interwiki') ) {
+			$wgOut->addWikiText( wfMsg( 'userrights-no-interwiki' ) );
+			return;
 		}
-		list( $name, $database ) = $parts;
 
-		global $wgLocalDatabases;
-		return array_search( $database, $wgLocalDatabases ) !== false
-			? array( $database, $name )
-			: new WikiError( 'Bogus database suffix "' . wfEscapeWikiText( $database ) . '"' );
+		return array( $database, $name );
 	}
 
 	/**
@@ -208,7 +207,7 @@ class UserrightsForm extends HTMLForm {
 		return $wgDBserver;
 	}
 
-	function getUserId( $database, $name ) {
+	function getUserId( $name ) {
 		if( $name === '' )
 			return 0;
 		return ( $name{0} == "#" )
@@ -216,14 +215,14 @@ class UserrightsForm extends HTMLForm {
 			: IntVal( $this->db->selectField( 'user',
 				'user_id',
 				array( 'user_name' => $name ),
-				'MakesysopStewardForm::getUserId' ) );
+				__METHOD__ ) );
 	}
 
-	function getUserGroups( $database, $userid ) {
+	function getUserGroups() {
 		$res = $this->db->select( 'user_groups',
 			array( 'ug_group' ),
-			array( 'ug_user' => $userid ),
-			'MakesysopStewardForm::getUserGroups' );
+			array( 'ug_user' => $this->userid ),
+			__METHOD__ );
 		$groups = array();
 		while( $row = $this->db->fetchObject( $res ) ) {
 			$groups[] = $row->ug_group;
@@ -231,36 +230,36 @@ class UserrightsForm extends HTMLForm {
 		return $groups;
 	}
 
-	function addUserGroup( $database, $userid, $group ) {
+	function addUserGroup( $group ) {
 		$this->db->insert( 'user_groups',
 			array(
-				'ug_user' => $userid,
+				'ug_user' => $this->userid,
 				'ug_group' => $group,
 			),
-			'MakesysopStewardForm::addUserGroup',
+			__METHOD__,
 			array( 'IGNORE' ) );
 	}
 
-	function removeUserGroup( $database, $userid, $group ) {
+	function removeUserGroup( $group ) {
 		$this->db->delete( 'user_groups',
 			array(
-				'ug_user' => $userid,
+				'ug_user' => $this->userid,
 				'ug_group' => $group,
 			),
-			'MakesysopStewardForm::addUserGroup' );
+			__METHOD__ );
 	}
 
-	function touchUser( $database, $userid ) {
+	function touchUser( $database ) {
 		$this->db->update( 'user',
 			array( 'user_touched' => $this->db->timestamp() ),
-			array( 'user_id' => $userid ),
-			'MakesysopStewardForm::touchUser' );
+			array( 'user_id' => $this->userid ),
+			__METHOD__ );
 		
 		global $wgMemc;
 		if ( function_exists( 'wfForeignMemcKey' ) ) {
-			$key = wfForeignMemcKey( $database, false, 'user', 'id', $userid );
+			$key = wfForeignMemcKey( $database, false, 'user', 'id', $this->userid );
 		} else {
-			$key = "$database:user:id:$userid";
+			$key = "$database:user:id:" . $this->userid;
 		}
 		$wgMemc->delete( $key );
 	}
@@ -452,9 +451,11 @@ class UserrightsForm extends HTMLForm {
 			// This group gives the right to modify everything (reverse-
 			// compatibility with old "userrights lets you change
 			// everything")
+			// Using array_merge to make the groups reindexed
+			$all = array_merge( User::getAllGroups() );
 			return array(
-				'add' => User::getAllGroups(),
-				'remove' => User::getAllGroups()
+				'add' => $all,
+				'remove' => $all
 			);
 		}
 
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 13f8e0a399..81fa149e1f 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1339,6 +1339,7 @@ Unselected groups will not be changed. You can deselect a group with CTRL + Left
 'userrights-available-add'    => 'You can add users to $1.',
 'userrights-available-remove' => 'You can remove users from $1.',
 'userrights-no-interwiki'     => 'You do not have permission to edit user rights on other wikis.',
+'userrights-nodatabase'       => 'Database $1 is not exist or is not local.',
 
 # Groups
 'group'               => 'Group:',
diff --git a/languages/messages/MessagesHe.php b/languages/messages/MessagesHe.php
index bc8b970a08..c55a1aa4fb 100644
--- a/languages/messages/MessagesHe.php
+++ b/languages/messages/MessagesHe.php
@@ -1099,6 +1099,7 @@ $2',
 'userrights-available-add'    => 'באפשרותכם להוסיף משתמשים לקבוצות $1.',
 'userrights-available-remove' => 'באפשרותכם להסיר משתמשים מהקבוצות $1.',
 'userrights-no-interwiki'     => 'אין לכם הרשאה לערוך הרשאות משתמש באתרים אחרים.',
+'userrights-nodatabase'       => 'מסד הנתונים $1 אינו קיים או אינו מקומי.',
 
 # Groups
 'group'               => 'קבוצה:',
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index e280710318..58fb57315b 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -744,6 +744,7 @@ $wgMessageStructure = array(
 		'userrights-available-add',
 		'userrights-available-remove',
 		'userrights-no-interwiki',
+		'userrights-nodatabase',
 	),
 	'group' => array(
 		'group',