oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- User search now includes user alias.

Browse source 
- Fixed a bug in the user manager where userId, date created, date updated,
   and karma were not showing up when editing users.
This commit is contained in:
JT Smith 2005-08-26 16:23:08 +00:00
parent f6cd24f515
commit 947c7f99d2
2 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docs/changelog/6.x.x.txt
View file

@ -1,3 +1,9 @@
6.7.3
- User search now includes user alias.
- Fixed a bug in the user manager where userId, date created, date updated,
and karma were not showing up when editing users.
6.7.2 6.7.2
- fix [ 1163407 ] Ampersand XHTML 1.0 Non-Compliant - fix [ 1163407 ] Ampersand XHTML 1.0 Non-Compliant
- fix [ 1243559 ] profile field security vulnerability (Len Kranendonk) - fix [ 1243559 ] profile field security vulnerability (Len Kranendonk)

16
lib/WebGUI/Operation/User.pm
View file

@ -84,9 +84,11 @@ sub doUserSearch {
} }
$keyword = quote($keyword); $keyword = quote($keyword);
my $sql = "select users.userId, users.username, users.status, users.dateCreated, users.lastUpdated, my $sql = "select users.userId, users.username, users.status, users.dateCreated, users.lastUpdated,
email.fieldData as email from users left join userProfileData email on users.userId=email.userId and email.fieldName='email' email.fieldData as email from users
where $selectedStatus and (users.username like ".$keyword." or email.fieldData like ".$keyword.") left join userProfileData email on users.userId=email.userId and email.fieldName='email'
and users.userId not in (".quoteAndJoin($userFilter).") order by users.username"; left join userProfileData useralias on users.userId=useralias.userId and useralias.fieldName='alias'
where $selectedStatus and (users.username like ".$keyword." or useralias.fieldData like ".$keyword." or email.fieldData like ".$keyword.")
and users.userId not in (".quoteAndJoin($userFilter).") order by users.username";
if ($returnPaginator) { if ($returnPaginator) {
my $p = WebGUI::Paginator->new(WebGUI::URL::page("op=".$op)); my $p = WebGUI::Paginator->new(WebGUI::URL::page("op=".$op));
$p->setDataByQuery($sql); $p->setDataByQuery($sql);
@ -227,10 +229,10 @@ sub www_editUser {
$tabform->hidden({name=>"op",value=>"editUserSave"}); $tabform->hidden({name=>"op",value=>"editUserSave"});
$tabform->hidden({name=>"uid",value=>$session{form}{uid}}); $tabform->hidden({name=>"uid",value=>$session{form}{uid}});
$tabform->getTab("account")->raw('<tr><td width="170">&nbsp;</td><td>&nbsp;</td></tr>'); $tabform->getTab("account")->raw('<tr><td width="170">&nbsp;</td><td>&nbsp;</td></tr>');
$tabform->getTab("account")->readOnly($session{form}{uid},$i18n->get(378)); $tabform->getTab("account")->readOnly(value=>$session{form}{uid},label=>$i18n->get(378));
$tabform->getTab("account")->readOnly($u->karma,$i18n->get(537)) if ($session{setting}{useKarma}); $tabform->getTab("account")->readOnly(value=>$u->karma,label=>$i18n->get(537)) if ($session{setting}{useKarma});
$tabform->getTab("account")->readOnly(epochToHuman($u->dateCreated,"%z"),$i18n->get(453)); $tabform->getTab("account")->readOnly(value=>epochToHuman($u->dateCreated,"%z"),label=>$i18n->get(453));
$tabform->getTab("account")->readOnly(epochToHuman($u->lastUpdated,"%z"),$i18n->get(454)); $tabform->getTab("account")->readOnly(value=>epochToHuman($u->lastUpdated,"%z"),label=>$i18n->get(454));
$tabform->getTab("account")->text( $tabform->getTab("account")->text(
-name=>"username", -name=>"username",
-label=>$i18n->get(50), -label=>$i18n->get(50),