Index: trunk/admin/users/user_list.php =================================================================== diff -u -r5431 -r7391 --- trunk/admin/users/user_list.php (.../user_list.php) (revision 5431) +++ trunk/admin/users/user_list.php (.../user_list.php) (revision 7391) @@ -5,8 +5,8 @@ ## In-portal ## ## Intechnic Corporation ## ## All Rights Reserved, 1998-2002 ## -## ## -## No portion of this code may be copied, reproduced or ## +## ## +## No portion of this code may be copied, reproduced or ## ## otherwise redistributed without proper written ## ## consent of Intechnic Corporation. Violation will ## ## result in revocation of the license and support ## @@ -38,8 +38,8 @@ $objSession->SetVariable('ReturnScript', 'users/'.basename($_SERVER['PHP_SELF']) ); /* -------------------------------------- Section configuration ------------------------------------------- */ -$section = 'in-portal:user_list'; -$envar = "env=" . BuildEnv(); +$section = 'in-portal:user_list'; +$envar = "env=" . BuildEnv(); $SortFieldVar = "User_SortField"; $SortOrderVar = "User_SortOrder"; @@ -59,7 +59,7 @@ $objListToolBar->Set("load_menu_func",""); $objListToolBar->Set("CheckClass",$CheckClass); $objListToolBar->Set("CheckForm",$ListForm); - + $listImages = array(); //$img, $alt, $link, $onMouseOver, $onMouseOut, $onClick @@ -98,6 +98,9 @@ "tool_deny.gif",FALSE,TRUE); $listImages[] = "UserChecks.addImage('user_ban','$imagesURL/toolbar/tool_ban_user.gif','$imagesURL/toolbar/tool_ban_user_f3.gif',1); "; + + + $objListToolBar->Add("divider"); $objListToolBar->Add("user_mail","la_ToolTip_SendMail","#", "if (UserChecks.itemChecked()) swap('user_mail','toolbar/tool_e-mail_f2.gif');", @@ -133,7 +136,7 @@ $UserView = $objConfig->Get("User_View"); if(!is_numeric($UserView)) -{ +{ $UserView = $Bit_All; //Set all bits ON $UserFilter = ""; } @@ -147,7 +150,7 @@ $Status[] = 2; if(count($Status)>0) - { + { $UserFilter = "Status IN (".implode(",",$Status).")"; } else @@ -167,7 +170,7 @@ if(strlen($UserFilter)) $where .= " AND (".$UserFilter.")"; - + /* ------------------------------------ Build the SQL statement to populate the list ---------------------------*/ $sql = "SELECT u.*,g.Name as GroupName,ELT(u.status+1,'".admin_language("la_Text_Disabled")." ','".admin_language("la_Text_Enabled")." ','".admin_language("la_Text_Pending")."') as UserStatus, "; @@ -183,15 +186,15 @@ if(strlen($orderBy)) $sql .=" ORDER BY ".$orderBy; -if( GetVar('resetpage') ) +if( GetVar('resetpage') ) { $page = 1; $objSession->SetVariable($CurrentPageVar,1); } else -{ +{ if( GetVar('lpn') ) - { + { $page = GetVar('lpn'); $objSession->SetVariable($CurrentPageVar, $page); } @@ -223,8 +226,8 @@ } else $title = prompt_language("la_Text_ShowingUsers")." (".$itemcount.")"; - - $objListView->SetListItems($objUsers); + + $objListView->SetListItems($objUsers); /* ---------------------------------------- Configure the list view ---------------------------------------- */ $objListView->IdField = "ResourceId"; @@ -252,8 +255,8 @@ foreach($FilterLabels as $Bit=>$Label) { $objListView->AddViewMenuFilter($Label,$Bit); - } - + } + for($i=0;$iItems);$i++) { $u =& $objUsers->GetItemRefByIndex($i); @@ -264,7 +267,7 @@ $filter = false; // always initialize variables before use if($objSession->GetVariable("UserSearchWord") != '') { $filter = true; -} +} else { if ($UserView != $Bit_All) { $filter = true; @@ -304,15 +307,17 @@ - +