[Xoops-cvs2] xoops2/modules/system/blocks system_blocks.php,1.1,1.2

[<ok...@us...>]

Update of /cvsroot/xoops/xoops2/modules/system/blocks
In directory sc8-pr-cvs1:/tmp/cvs-serv28207/modules/system/blocks

Modified Files:
	system_blocks.php 
Log Message:
fix for user object sorting problem

Index: system_blocks.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/system/blocks/system_blocks.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** system_blocks.php	2 Jan 2003 20:19:29 -0000	1.1
--- system_blocks.php	5 Jan 2003 15:31:28 -0000	1.2
***************
*** 291,309 ****
  	$criteria = new CriteriaCompo(new Criteria('level', 0, '>'));
  	$limit = (!empty($options[0])) ? $options[0] : 10;
! 	$criteria->setOrder('user_regdate');
! 	$criteria->setSort('DESC');
  	$criteria->setLimit($limit);
  	$member_handler =& xoops_gethandler('member');
  	$newmembers =& $member_handler->getUsers($criteria);
! 	$count = count($newmembers);
! 	for ($i = 0; $i < $count; $i++) {
! 		if ( $options[1] == 1 ) {
! 			$block['users'][$i]['avatar'] = $newmembers[$i]->getVar('user_avatar') != 'blank.gif' ? XOOPS_URL.'/uploads/'.$newmembers[$i]->getVar('user_avatar') : '';
! 		} else {
! 			$block['users'][$i]['avatar'] = '';
  		}
- 		$block['users'][$i]['id'] = $newmembers[$i]->getVar('uid');
- 		$block['users'][$i]['name'] = $newmembers[$i]->getVar('uname');
- 		$block['users'][$i]['joindate'] = formatTimestamp($newmembers[$i]->getVar('user_regdate'), 's');
  	}
  	return $block;
--- 291,311 ----
  	$criteria = new CriteriaCompo(new Criteria('level', 0, '>'));
  	$limit = (!empty($options[0])) ? $options[0] : 10;
! 	$criteria->setOrder('DESC');
! 	$criteria->setSort('user_regdate');
  	$criteria->setLimit($limit);
  	$member_handler =& xoops_gethandler('member');
  	$newmembers =& $member_handler->getUsers($criteria);
! 	if (is_array($newmembers)) {
! 		$count = count($newmembers);
! 		for ($i = 0; $i < $count; $i++) {
! 			if ( $options[1] == 1 ) {
! 				$block['users'][$i]['avatar'] = $newmembers[$i]->getVar('user_avatar') != 'blank.gif' ? XOOPS_URL.'/uploads/'.$newmembers[$i]->getVar('user_avatar') : '';
! 			} else {
! 				$block['users'][$i]['avatar'] = '';
! 			}
! 			$block['users'][$i]['id'] = $newmembers[$i]->getVar('uid');
! 			$block['users'][$i]['name'] = $newmembers[$i]->getVar('uname');
! 			$block['users'][$i]['joindate'] = formatTimestamp($newmembers[$i]->getVar('user_regdate'), 's');
  		}
  	}
  	return $block;
***************
*** 319,338 ****
  		$criteria->add(new Criteria('rank', $options[$i], '<>'));
  	}
! 	$criteria->setOrder('posts');
! 	$criteria->setSort('DESC');
  	$criteria->setLimit($limit);
  	$member_handler =& xoops_gethandler('member');
  	$topposters =& $member_handler->getUsers($criteria);
! 	$count = count($topposters);
! 	for ($i = 0; $i < $count; $i++) {
! 		$block['users'][$i]['rank'] = $i+1;
! 		if ( $options[1] == 1 ) {
! 			$block['users'][$i]['avatar'] = $topposters[$i]->getVar('user_avatar') != 'blank.gif' ? XOOPS_URL.'/uploads/'.$topposters[$i]->getVar('user_avatar') : '';
! 		} else {
! 			$block['users'][$i]['avatar'] = '';
  		}
- 		$block['users'][$i]['id'] = $topposters[$i]->getVar('uid');
- 		$block['users'][$i]['name'] = $topposters[$i]->getVar('uname');
- 		$block['users'][$i]['posts'] = $topposters[$i]->getVar('posts');
  	}
  	return $block;
--- 321,342 ----
  		$criteria->add(new Criteria('rank', $options[$i], '<>'));
  	}
! 	$criteria->setOrder('DESC');
! 	$criteria->setSort('posts');
  	$criteria->setLimit($limit);
  	$member_handler =& xoops_gethandler('member');
  	$topposters =& $member_handler->getUsers($criteria);
! 	if (is_array($topposters)) {
! 		$count = count($topposters);
! 		for ($i = 0; $i < $count; $i++) {
! 			$block['users'][$i]['rank'] = $i+1;
! 			if ( $options[1] == 1 ) {
! 				$block['users'][$i]['avatar'] = $topposters[$i]->getVar('user_avatar') != 'blank.gif' ? XOOPS_URL.'/uploads/'.$topposters[$i]->getVar('user_avatar') : '';
! 			} else {
! 				$block['users'][$i]['avatar'] = '';
! 			}
! 			$block['users'][$i]['id'] = $topposters[$i]->getVar('uid');
! 			$block['users'][$i]['name'] = $topposters[$i]->getVar('uname');
! 			$block['users'][$i]['posts'] = $topposters[$i]->getVar('posts');
  		}
  	}
  	return $block;