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

Rollback r3340 since it broke specialState:init.

Browse source
This commit is contained in:
Drake 2006-12-06 17:49:22 +00:00
parent f3f2a2296b
commit e795f06fd8
4 changed files with 19 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lib/WebGUI/User.pm
View file

@ -63,13 +63,6 @@ sub _create {
$session->db->write("insert into users (userId,dateCreated) values (?,?)",[$userId, time()]);
WebGUI::Group->new($session,2)->addUsers([$userId]);
WebGUI::Group->new($session,7)->addUsers([$userId]);
# Give user all profile fields as default values.
foreach my $field (@{WebGUI::ProfileField->getFields($session)}) {
my $defaultValue = WebGUI::Operation::Shared::secureEval($session, $field->get('dataDefault'));
$session->db->write("INSERT INTO userProfileData (userId, fieldName, fieldData) VALUES (?, ?, ?)", [$userId, $field->getId, $defaultValue]);
}
return $userId;
}
@ -392,8 +385,22 @@ sub new {
my %user;
tie %user, 'Tie::CPHash';
%user = $session->db->quickHash("select * from users where userId=".$session->db->quote($userId));
my %profile = $session->db->buildHash("SELECT fieldName, fieldData FROM userProfileData WHERE userId = ?", [$user{userId}]);
$profile{alias} = $user{username} if $profile{alias} !~ /\w/;
my %profile = $session->db->buildHash("select userProfileField.fieldName, userProfileData.fieldData
from userProfileField, userProfileData where userProfileField.fieldName=userProfileData.fieldName and
userProfileData.userId=".$session->db->quote($user{userId}));
my %default = $session->db->buildHash("select fieldName, dataDefault from userProfileField");
foreach my $key (keys %default) {
my $value;
if ($profile{$key} eq "" && $default{$key}) {
$value = eval($default{$key});
if (ref $value eq "ARRAY") {
$profile{$key} = $$value[0];
} else {
$profile{$key} = $value;
}
}
}
$profile{alias} = $user{username} if ($profile{alias} =~ /^\W+$/ || $profile{alias} eq "");
$userData = {
_userId => $userId,
_user => \%user,