Index: trunk/admin/users/user_select.php =================================================================== diff -u -r85 -r168 --- trunk/admin/users/user_select.php (.../user_select.php) (revision 85) +++ trunk/admin/users/user_select.php (.../user_select.php) (revision 168) @@ -149,6 +149,10 @@ $SelectorType = $_REQUEST["Selector"] ? $_REQUEST["Selector"] : 'checkbox'; +$objListView = new clsListView($objListToolBar); +$objListView->CurrentPageVar = "Page_UserSelect"; +$objListView->PerPageVar = "Perpage_User"; + if(strlen($_GET["source"])>0) { switch($_GET["source"]) @@ -177,8 +181,8 @@ $sql .="LEFT JOIN ".GetTablePrefix()."PortalGroup as g ON (ug.GroupId=g.GroupId) WHERE "; $sql .= "u.PortalUserId NOT IN (".$catlist.")"; - $sql .=" ".GetLimitSQL($objSession->GetVariable("Page_UserSelect"),$objConfig->Get("Perpage_User")); - $objUsers->Query_Item($sql); + //$sql .=" ".GetLimitSQL($objSession->GetVariable("Page_UserSelect"),$objConfig->Get("Perpage_User")); + $objUsers->Query_Item($sql, $objListView->GetLimitSQL() ); $itemcount = TableCount(GetTablePrefix()."PortalUser","PortalUserId NOT IN ($catlist)",0); } @@ -188,8 +192,8 @@ $sql .="FROM_UNIXTIME(u.CreatedOn,'%m-%d-%Y') as DateCreated FROM ".GetTablePrefix()."PortalUser as u "; $sql .="LEFT JOIN ".GetTablePrefix()."UserGroup as ug ON (u.PortalUserId=ug.PortalUserId) "; $sql .="LEFT JOIN ".GetTablePrefix()."PortalGroup as g ON (ug.GroupId=g.GroupId) WHERE ug.PrimaryGroup!=0"; - $sql .=" ".GetLimitSQL($objSession->GetVariable("Page_UserSelect"),$objConfig->Get("Perpage_User")); - $objUsers->Query_Item($sql); + //$sql .=" ".GetLimitSQL($objSession->GetVariable("Page_UserSelect"),$objConfig->Get("Perpage_User")); + $objUsers->Query_Item($sql, $objListView->GetLimitSQL() ); $itemcount = TableCount(GetTablePrefix()."PortalUser","PortalUserId NOT IN ($catlist)",0); } @@ -202,16 +206,16 @@ $sql .="FROM_UNIXTIME(u.CreatedOn,'%m-%d-%Y') as DateCreated FROM ".GetTablePrefix()."PortalUser as u "; $sql .="LEFT JOIN ".GetTablePrefix()."UserGroup as ug ON (u.PortalUserId=ug.PortalUserId) "; $sql .="LEFT JOIN ".GetTablePrefix()."PortalGroup as g ON (ug.GroupId=g.GroupId) WHERE ug.PrimaryGroup!=0 $where"; - $sql .=" ".GetLimitSQL($objSession->GetVariable("Page_UserSelect"),$objConfig->Get("Perpage_User")); + //$sql .=" ".GetLimitSQL($objSession->GetVariable("Page_UserSelect"),$objConfig->Get("Perpage_User")); - $objUsers->Query_Item($sql); + $objUsers->Query_Item($sql, $objListView->GetLimitSQL() ); $itemcount = TableCount(GetTablePrefix()."PortalUser","PortalUserId NOT IN ($catlist)",0); } if($objSession->HasSystemPermission("DEBUG.LIST")) echo htmlentities($sql,ENT_NOQUOTES)."
\n"; -$objListView = new clsListView($objListToolBar,$objUsers); +$objListView->SetListItems($objUsers); if(strlen($_GET["IdField"])>0) { $objListView->IdField = $_GET["IdField"]; @@ -240,8 +244,6 @@ $objListView->SearchBar = TRUE; $objListView->SearchKeywords = $SearchWords; $objListView->SearchAction="m_userselect_search"; -$objListView->CurrentPageVar = "Page_UserSelect"; -$objListView->PerPageVar = "Perpage_User"; $objListView->CheckboxName = "itemlist[]"; $objListView->SelectorType=$SelectorType; $objListView->TotalItemCount = $itemcount;