diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/listUsersBL.php b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/listUsersBL.php
index b3823ed..f7795be 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/listUsersBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/listUsersBL.php
@@ -48,10 +48,10 @@ if (checkSession()) {
} else {
$default->log->info("fGroupID=$fGroupID");
}
- $oPatternCustom->setHtml(getPage($fGroupID));
+ $oPatternCustom->setHtml(getPage($fGroupID, $fName));
require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
$main->setCentralPayload($oPatternCustom);
$main->setFormAction($_SERVER['PHP_SELF']);
$main->render();
}
-?>
\ No newline at end of file
+?>
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/listUsersUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/listUsersUI.inc
index 237ca7f..ea35055 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/listUsersUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/listUsersUI.inc
@@ -47,7 +47,11 @@ function getGroupDisplay($iGroupID) {
return "
| Filter By Group | " . $oPatternListBox->render() . " |
";
}
-function getUsers($fGroupID) {
+function getNameDisplay($sName) {
+ return "";
+}
+
+function getUsers($fGroupID, $sName) {
global $default;
// changed from inner to outer joins to include users that aren't in any groups (Stefano Ciancio [s.ciancio@pisa.iol.it])
$sQuery = "SELECT DISTINCT U.id as userID, U.name as name, U.username, " .
@@ -59,6 +63,10 @@ function getUsers($fGroupID) {
if ($fGroupID) {
$sWhereClause = "WHERE UGL.group_id = $fGroupID ";
}
+ // filter by name
+ if ($sName) {
+ $sWhereClause = "WHERE U.name like '%$sName%' ";
+ }
// #2978 don't display sys admin accounts if you're not a sysadmin
if (!Permission::userIsSystemAdministrator()) {
$sRestrictUsers = " GL.is_sys_admin = 0 ";
@@ -85,7 +93,7 @@ function getUsers($fGroupID) {
return $oSearchResults->render() ;
}
-function getPage($fGroupID) {
+function getPage($fGroupID, $sName) {
global $default;
$sToRender .= renderHeading("User Management");
@@ -94,7 +102,8 @@ function getPage($fGroupID) {
$sToRender .= getAddLink("addUser", "Add A User");
}
$sToRender .= getGroupDisplay($fGroupID);
- $sToRender .= getUsers($fGroupID);
+ $sToRender .= getNameDisplay($sName);
+ $sToRender .= getUsers($fGroupID, $sName);
return $sToRender;
}
-?>
\ No newline at end of file
+?>