Index: trunk/admin/users/adduser_groups.php =================================================================== diff -u -r624 -r629 --- trunk/admin/users/adduser_groups.php (.../adduser_groups.php) (revision 624) +++ trunk/admin/users/adduser_groups.php (.../adduser_groups.php) (revision 629) @@ -187,20 +187,20 @@ $objGroups->Clear(); /* ----------------------------------------- Set the View Filter ---------------------------------------- */ /* bit place holders for category view menu */ -$Bit_Pending=4; +//$Bit_Pending=4; $Bit_Disabled=2; $Bit_Valid=1; -$Bit_All = 7; +$Bit_All = 3; //7; $FilterLabels = array(); $FilterLabels[0] = admin_language("la_Text_Enabled"); $FilterLabels[1] = admin_language("la_Text_Disabled"); -$FilterLabels[2] = admin_language("la_Text_Pending"); +//$FilterLabels[2] = admin_language("la_Text_Pending"); /* determine current view menu settings */ $GroupView = $objConfig->Get($CurrentFilterVar); - +$Status = Array(); if(!is_numeric($GroupView)) { $GroupView = $Bit_All; //Set all bits ON @@ -214,15 +214,15 @@ if($GroupView & $Bit_Disabled) $Status[] = 0; - if($GroupView & $Bit_Pending) - $Status[] = 2; +/* if($GroupView & $Bit_Pending) + $Status[] = 2;*/ if(count($Status)>0) { - $GroupFilter = "Status IN (".implode(",",$Status).")"; + $GroupFilter = "Enabled IN (".implode(",",$Status).")"; } else - $GroupFilter = "Status = -1"; + $GroupFilter = "Enabled = -1"; } @@ -247,7 +247,7 @@ if($objSession->HasSystemPermission("DEBUG.LIST")) echo htmlentities($sql,ENT_NOQUOTES)."
\n"; -//echo "SQL: $sql
"; + $objGroups->Query_Item($sql); /* ---------------------------------------- Configure the list view ---------------------------------------- */