Revert r29671, it was based on a misunderstanding of the purpose of the LoggedOut...
[lhc/web/wiklou.git] / includes / SpecialListusers.php
index 2f32193..460d425 100644 (file)
@@ -40,9 +40,12 @@ class UsersPager extends AlphabeticPager {
                global $wgRequest;
                $this->requestedGroup = $group != "" ? $group : $wgRequest->getVal( 'group' );
                $un = $wgRequest->getText( 'username' );
+               $this->requestedUser = '';
                if ( $un != '' ) {
                        $username = Title::makeTitleSafe( NS_USER, $un );
-                       $this->requestedUser = $username->getText();
+                       if( ! is_null( $username ) ) {
+                               $this->requestedUser = $username->getText();
+                       }
                }
                parent::__construct();
        }
@@ -54,6 +57,8 @@ class UsersPager extends AlphabeticPager {
 
        function getQueryInfo() {
                $conds=array();
+               // don't show hidden names
+               $conds[]='ipb_deleted IS NULL OR ipb_deleted = 0';
                if ($this->requestedGroup != "") {
                        $conds['ug_group'] = $this->requestedGroup;
                }
@@ -61,10 +66,10 @@ class UsersPager extends AlphabeticPager {
                        $conds[] = 'user_name >= ' . wfGetDB()->addQuotes( $this->requestedUser );
                }
 
-               list ($user,$user_groups) = wfGetDB()->tableNamesN('user','user_groups');
+               list ($user,$user_groups,$ipblocks) = wfGetDB()->tableNamesN('user','user_groups','ipblocks');
 
                return array(
-                       'tables' => " $user LEFT JOIN $user_groups ON user_id=ug_user ",
+                       'tables' => " $user LEFT JOIN $user_groups ON user_id=ug_user LEFT JOIN $ipblocks ON user_id=ipb_user AND ipb_auto=0 ",
                        'fields' => array('user_name',
                                'MAX(user_id) AS user_id',
                                'COUNT(ug_group) AS numgroups', 
@@ -72,35 +77,25 @@ class UsersPager extends AlphabeticPager {
                        'options' => array('GROUP BY' => 'user_name'), 
                        'conds' => $conds
                );
+
        }
 
-       function formatRow($row) {
-               $userPage = Title::makeTitle(NS_USER, $row->user_name);
+       function formatRow( $row ) {
+               $userPage = Title::makeTitle( NS_USER, $row->user_name );
                $name = $this->getSkin()->makeLinkObj( $userPage, htmlspecialchars( $userPage->getText() ) );
-               $groups = array();
-               if ($row->numgroups > 1 || ( $this->requestedGroup and $row->numgroups == 1) ) {
-                       $dbr = wfGetDB(DB_SLAVE);
-                       $result = $dbr->select( 'user_groups', 'ug_group',
-                               array( 'ug_user' => $row->user_id ),
-                               'UsersPager::formatRow' );
-                       while ( $group = $dbr->fetchObject($result)) {
-                               $groups[$group->ug_group] = User::getGroupMember ( $group->ug_group );
-                       }
-                       $dbr->freeResult($result);
-               } elseif ($row->numgroups == 1 ) { // MAX hack inside query :)
-                       $groups[$row->singlegroup] = User::getGroupMember( $row->singlegroup );
-               }
 
-               if ( count($groups) > 0 ) {
-                       foreach( $groups as $group => $desc ) {
-                               $list[] = User::makeGroupLinkHTML( $group, $desc);
-                       }
-                       $groups = implode( ', ', $list);
+               if( $row->numgroups > 1 || ( $this->requestedGroup && $row->numgroups == 1 ) ) {
+                       $list = array();
+                       foreach( self::getGroups( $row->user_id ) as $group )
+                               $list[] = self::buildGroupLink( $group );
+                       $groups = implode( ', ', $list );
+               } elseif( $row->numgroups == 1 ) {
+                       $groups = self::buildGroupLink( $row->singlegroup );
                } else {
-                       $groups ='';
+                       $groups = '';
                }
-               //$ulink = $skin->userLink( $result->user, $result->user_text ) . ' ' . $skin->userToolLinks( $result->user, $result->user_text );
-               return '<li>' . wfSpecialList ($name, $groups) .'</li>';
+
+               return '<li>' . wfSpecialList( $name, $groups ) . '</li>';
        }
 
        function getBody() {
@@ -108,7 +103,6 @@ class UsersPager extends AlphabeticPager {
                        $this->doQuery();
                }
                $batch = new LinkBatch;
-               $db = $this->mDb;
 
                $this->mResult->rewind();
 
@@ -121,36 +115,30 @@ class UsersPager extends AlphabeticPager {
        }
 
        function getPageHeader( ) {
-               global $wgRequest;
+               global $wgScript, $wgRequest;
                $self = $this->getTitle();
 
                # Form tag
-               $out  = Xml::openElement( 'form', array( 'method' => 'get', 'action' => $self->getLocalUrl() ) ) .
+               $out  = Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript ) ) .
                        '<fieldset>' .
                        Xml::element( 'legend', array(), wfMsg( 'listusers' ) );
+               $out .= Xml::hidden( 'title', $self->getPrefixedDbKey() );
 
                # Username field
                $out .= Xml::label( wfMsg( 'listusersfrom' ), 'offset' ) . ' ' .
-                       Xml::input( 'username', 20, $this->requestedUser ) . ' ';
-
-               if( $this->mLimit )
-                       $out .= Xml::hidden( 'limit', $this->mLimit );
+                       Xml::input( 'username', 20, $this->requestedUser, array( 'id' => 'offset' ) ) . ' ';
 
                # Group drop-down list
                $out .= Xml::label( wfMsg( 'group' ), 'group' ) . ' ' .
                        Xml::openElement('select',  array( 'name' => 'group', 'id' => 'group' ) ) .
-                       Xml::option( wfMsg( 'group-all' ), '' );  # Item for "all groups"
-
-               $groups = User::getAllGroups();
-               foreach( $groups as $group ) {
-                       $attribs = array( 'value' => $group );
-                       if( $group == $this->requestedGroup )
-                               $attribs['selected'] = 'selected';
-                       $out .= Xml::option( User::getGroupName( $group ), $attribs['value'], $attribs['selected'] );
-               }
+                       Xml::option( wfMsg( 'group-all' ), '' );
+               foreach( User::getAllGroups() as $group )
+                       $out .= Xml::option( User::getGroupName( $group ), $group, $group == $this->requestedGroup );
                $out .= Xml::closeElement( 'select' ) . ' ';
 
                # Submit button and form bottom
+               if( $this->mLimit )
+                       $out .= Xml::hidden( 'limit', $this->mLimit );
                $out .= Xml::submitButton( wfMsg( 'allpagessubmit' ) ) .
                        '</fieldset>' .
                        Xml::closeElement( 'form' );
@@ -170,6 +158,37 @@ class UsersPager extends AlphabeticPager {
                        $query['username'] = $this->requestedUser;
                return $query;
        }
+
+       /**
+        * Get a list of groups the specified user belongs to
+        *
+        * @param int $uid
+        * @return array
+        */
+       private static function getGroups( $uid ) {
+               $dbr = wfGetDB( DB_SLAVE );
+               $groups = array();
+               $res = $dbr->select( 'user_groups', 'ug_group', array( 'ug_user' => $uid ), __METHOD__ );
+               if( $res && $dbr->numRows( $res ) > 0 ) {
+                       while( $row = $dbr->fetchObject( $res ) )
+                               $groups[] = $row->ug_group;
+                       $dbr->freeResult( $res );
+               }
+               return $groups;
+       }
+
+       /**
+        * Format a link to a group description page
+        *
+        * @param string $group
+        * @return string
+        */
+       private static function buildGroupLink( $group ) {
+               static $cache = array();
+               if( !isset( $cache[$group] ) )
+                       $cache[$group] = User::makeGroupLinkHtml( $group, User::getGroupMember( $group ) );
+               return $cache[$group];
+       }
 }
 
 /**
@@ -179,10 +198,6 @@ class UsersPager extends AlphabeticPager {
 function wfSpecialListusers( $par = null ) {
        global $wgRequest, $wgOut;
 
-       list( $limit, $offset ) = wfCheckLimits();
-
-       $groupTarget = isset($par) ? $par : $wgRequest->getVal( 'group' );
-
        $up = new UsersPager($par);
 
        # getBody() first to check, if empty
@@ -195,7 +210,8 @@ function wfSpecialListusers( $par = null ) {
        } else {
                $s .=   '<p>' . wfMsgHTML('listusers-noresult') . '</p>';
        };
-        $wgOut->addHTML( $s );
+
+       $wgOut->addHTML( $s );
 }
 
-?>
+