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

bugfix [ 1025755 ] UILevel can't be set to beginner (0)

Browse source
This commit is contained in:
JT Smith 2004-09-12 17:01:15 +00:00
parent 6afe9da116
commit 40a36966dd
3 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,6 +9,8 @@
- bugfix [ 1024643 ] Unknown column error. (Leendert Bottelberghs) - bugfix [ 1024643 ] Unknown column error. (Leendert Bottelberghs)
- bugfix [ 1025120 ] Pagination in forum thread doesn't work. New default thread template. (Leendert Bottelberghs) - bugfix [ 1025120 ] Pagination in forum thread doesn't work. New default thread template. (Leendert Bottelberghs)
- Fixed a bug where you couldn't delete templates. - Fixed a bug where you couldn't delete templates.
- bugfix [ 1025755 ] UILevel can't be set to beginner (0)
6.2.1 6.2.1

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

@ -15,6 +15,7 @@ use strict qw(vars subs);
use Tie::CPHash; use Tie::CPHash;
use Tie::IxHash; use Tie::IxHash;
use WebGUI::DateTime; use WebGUI::DateTime;
use WebGUI::FormProcessor;
use WebGUI::Group; use WebGUI::Group;
use WebGUI::Grouping; use WebGUI::Grouping;
use WebGUI::HTMLForm; use WebGUI::HTMLForm;
@ -517,19 +518,14 @@ sub www_editUserProfile {
$method = $data{dataType}; $method = $data{dataType};
$label = eval $data{fieldLabel}; $label = eval $data{fieldLabel};
if ($method eq "selectList" || $method eq "checkList" || $method eq "radioList") { if ($method eq "selectList" || $method eq "checkList" || $method eq "radioList") {
# note: this big if statement doesn't look elegant, but doing regular
# ORs caused problems with the array reference.
# make sure the values are ordered
my $orderedValues = {}; my $orderedValues = {};
tie %{$orderedValues}, 'Tie::IxHash'; tie %{$orderedValues}, 'Tie::IxHash';
foreach my $ov (sort keys %{$values}) { foreach my $ov (sort keys %{$values}) {
$orderedValues->{$ov} = $values->{$ov}; $orderedValues->{$ov} = $values->{$ov};
} }
if ($session{form}{$data{fieldName}}) { if ($session{form}{$data{fieldName}}) {
$default = [$session{form}{$data{fieldName}}]; $default = [$session{form}{$data{fieldName}}];
} elsif ($user{$data{fieldName}} && (defined($values->{$user{$data{fieldName}}}))) { } elsif (exists $user{$data{fieldName}} && (defined($values->{$user{$data{fieldName}}}))) {
$default = [$user{$data{fieldName}}]; $default = [$user{$data{fieldName}}];
} else { } else {
$default = eval $data{dataDefault}; $default = eval $data{dataDefault};
@ -568,12 +564,9 @@ sub www_editUserProfileSave {
my ($a, %field, $u); my ($a, %field, $u);
tie %field, 'Tie::CPHash'; tie %field, 'Tie::CPHash';
$u = WebGUI::User->new($session{form}{uid}); $u = WebGUI::User->new($session{form}{uid});
$a = WebGUI::SQL->read("select * from userProfileField"); $a = WebGUI::SQL->read("select fieldName,dataType from userProfileField");
while (%field = $a->hash) { while (%field = $a->hash) {
if ($field{dataType} eq "date") { $u->profileField($field{fieldName},WebGUI::FormProcessor::process($field{fieldName},$field{dataType}));
$session{form}{$field{fieldName}} = setToEpoch($session{form}{$field{fieldName}});
}
$u->profileField($field{fieldName},$session{form}{$field{fieldName}}) if (exists $session{form}{$field{fieldName}});
} }
$a->finish; $a->finish;
return www_editUserProfile(); return www_editUserProfile();

2
lib/WebGUI/User.pm
View file

@ -297,7 +297,7 @@ sub profileField {
$class = shift; $class = shift;
$fieldName = shift; $fieldName = shift;
$value = shift; $value = shift;
$value = WebGUI::Macro::negate($value); # Len Kranendonk - 20030701: fixed security hole $value = WebGUI::Macro::negate($value);
if (defined $value) { if (defined $value) {
$class->{_profile}{$fieldName} = $value; $class->{_profile}{$fieldName} = $value;
WebGUI::SQL->write("delete from userProfileData where userId=".quote($class->{_userId})." and fieldName=".quote($fieldName)); WebGUI::SQL->write("delete from userProfileData where userId=".quote($class->{_userId})." and fieldName=".quote($fieldName));