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

more session related bug fixes

Browse source
This commit is contained in:
JT Smith 2006-01-15 18:34:44 +00:00
parent f2cccdff9f
commit b0ffb721b6
44 changed files with 143 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI/Operation/Auth.pm
View file

@ -33,7 +33,7 @@ sub getInstance {
my $session = shift;
#Get Auth Settings
my $authMethod = $session->user->authMethod || $session->setting->get("authMethod");
$authMethod = $session->setting->get("authMethod") if($session->user->profileField("userId") eq '1');
$authMethod = $session->setting->get("authMethod") if($session->user->userId eq '1');
$authMethod = $_[0] if($_[0] && isIn($_[0], @{$session->config->get("authMethods")}));
my $userId = $_[1];
#Create Auth Object

4
lib/WebGUI/Operation/Commerce.pm
View file

@ -123,7 +123,7 @@ sub www_checkoutConfirm {
$i18n = WebGUI::International->new($session, 'Commerce');
# If the user isn't logged in yet, let him do so or have him create an account
if ($session->user->profileField("userId") == 1) {
if ($session->user->userId == 1) {
$session->scratch->set('redirectAfterLogin', $session->url->page('op=checkout'));
return WebGUI::Operation::execute('auth');
}
@ -204,7 +204,7 @@ sub www_checkoutSubmit {
$i18n = WebGUI::International->new($session, 'Commerce');
# check if user has already logged in
if ($session->user->profileField("userId") == 1) {
if ($session->user->userId == 1) {
$session->scratch->set('redirectAfterLogin', $session->url->page('op=checkout'));
return WebGUI::Operation::execute('displayLogin');
}

14
lib/WebGUI/Operation/Group.pm
View file

@ -27,7 +27,7 @@ use WebGUI::Utility;
sub _hasSecondaryPrivilege {
my $session = shift;
return 0 unless ($session->user->isInGroup(11));
return $group->userIsAdmin($session->user->profileField("userId"),$_[0]);
return $group->userIsAdmin($session->user->userId,$_[0]);
}
@ -175,10 +175,10 @@ sub www_addUsersToGroupSave {
#-------------------------------------------------------------------
sub www_autoAddToGroup {
my $session = shift;
return WebGUI::AdminConsole->new($session,"groups")->render($session->privilege->insufficient()) unless ($session->user->profileField("userId") ne 1);
return WebGUI::AdminConsole->new($session,"groups")->render($session->privilege->insufficient()) unless ($session->user->userId ne 1);
my $group = WebGUI::Group->new($session->form->process("groupId"));
if ($group->autoAdd) {
$group->addUsers([$session->user->profileField("userId")],[$session->form->process("groupId")]);
$group->addUsers([$session->user->userId],[$session->form->process("groupId")]);
}
return "";
}
@ -186,10 +186,10 @@ sub www_autoAddToGroup {
#-------------------------------------------------------------------
sub www_autoDeleteFromGroup {
my $session = shift;
return WebGUI::AdminConsole->new($session,"groups")->render($session->privilege->insufficient()) unless ($session->user->profileField("userId") ne 1);
return WebGUI::AdminConsole->new($session,"groups")->render($session->privilege->insufficient()) unless ($session->user->userId ne 1);
my $group = WebGUI::Group->new($session->form->process("groupId"));
if ($group->autoDelete) {
$group->deleteUsers([$session->user->profileField("userId")],[$session->form->process("groupId")]);
$group->deleteUsers([$session->user->userId],[$session->form->process("groupId")]);
}
return "";
}
@ -241,7 +241,7 @@ perform this operation, and the
sub www_deleteGrouping {
my $session = shift;
return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
if (($session->user->profileField("userId") eq $session->form->process("uid") || $session->form->process("uid") eq '3') && $session->form->process("gid") eq '3') {
if (($session->user->userId eq $session->form->process("uid") || $session->form->process("uid") eq '3') && $session->form->process("gid") eq '3') {
return $session->privilege->vitalComponent();
}
my @users = $session->form->selectList('uid');
@ -565,7 +565,7 @@ sub www_listGroups {
return _submenu($output,'',"groups manage");
} elsif ($session->user->isInGroup(11)) {
my ($output, $p, $sth, @data, @row, $i, $userCount);
my @editableGroups = $session->db->buildArray("select groupId from groupings where userId=".$session->db->quote($session->user->profileField("userId"))." and groupAdmin=1");
my @editableGroups = $session->db->buildArray("select groupId from groupings where userId=".$session->db->quote($session->user->userId)." and groupAdmin=1");
push (@editableGroups,0);
$sth = $session->db->read("select groupId,groupName,description from groups
where groupId in (".$session->db->quoteAndJoin(\@editableGroups).") order by groupName");

8
lib/WebGUI/Operation/MessageLog.pm
View file

@ -55,11 +55,11 @@ Templated display all messages for the current user.
sub www_viewMessageLog {
my $session = shift;
my (@msg, $vars);
return $session->privilege->insufficient() unless ($session->user->isInGroup(2,$session->user->profileField("userId")));
return $session->privilege->insufficient() unless ($session->user->isInGroup(2,$session->user->userId));
my $i18n = WebGUI::International->new($session);
$vars->{displayTitle} = '<h1>'.$i18n->get(159).'</h1>';
my $p = WebGUI::Paginator->new($session,$session->url->page('op=viewMessageLog'));
my $query = "select messageLogId,subject,url,dateOfEntry,status from messageLog where userId=".$session->db->quote($session->user->profileField("userId"))." order by dateOfEntry desc";
my $query = "select messageLogId,subject,url,dateOfEntry,status from messageLog where userId=".$session->db->quote($session->user->userId)." order by dateOfEntry desc";
$p->setDataByQuery($query);
$vars->{'message.subject.label'} = $i18n->get(351);
@ -101,11 +101,11 @@ Templated display of a single message for the user.
sub www_viewMessageLogMessage {
my $session = shift;
my ($data, $vars);
return $session->privilege->insufficient() unless ($session->user->isInGroup(2,$session->user->profileField("userId")));
return $session->privilege->insufficient() unless ($session->user->isInGroup(2,$session->user->userId));
my $i18n = WebGUI::International->new($session);
$vars->{displayTitle} = '<h1>'.$i18n->get(159).'</h1>';
$data = $session->db->quickHashRef("select * from messageLog where messageLogId=".$session->db->quote($session->form->process("mlog"))." and userId=".$session->db->quote($session->user->profileField("userId")));
$data = $session->db->quickHashRef("select * from messageLog where messageLogId=".$session->db->quote($session->form->process("mlog"))." and userId=".$session->db->quote($session->user->userId));
$vars->{'message.subject'} = $data->{subject};
$vars->{'message.dateOfEntry'} =$session->datetime->epochToHuman($data->{dateOfEntry});

14
lib/WebGUI/Operation/Profile.pm
View file

@ -53,7 +53,7 @@ sub getRequiredProfileFields {
sub isDuplicateEmail {
my $session = shift;
my $email = shift;
my ($otherEmail) = $session->db->quickArray("select count(*) from userProfileData where fieldName='email' and fieldData = ".$session->db->quote($email)." and userId <> ".$session->db->quote($session->user->profileField("userId")));
my ($otherEmail) = $session->db->quickArray("select count(*) from userProfileData where fieldName='email' and fieldData = ".$session->db->quote($email)." and userId <> ".$session->db->quote($session->user->userId));
return ($otherEmail > 0);
}
@ -94,7 +94,7 @@ sub validateProfileData {
#-------------------------------------------------------------------
sub www_editProfile {
my $session = shift;
return WebGUI::Operation::Auth::www_auth("init") if($session->user->profileField("userId") eq '1');
return WebGUI::Operation::Auth::www_auth("init") if($session->user->userId eq '1');
my $i18n = WebGUI::International->new($session);
my $vars = {};
$vars->{displayTitle} .= '<h1>'.$i18n->get(338).'</h1>';
@ -103,7 +103,7 @@ sub www_editProfile {
$vars->{'profile.form.footer'} = WebGUI::Form::formFooter($session,);
$vars->{'profile.form.hidden'} = WebGUI::Form::hidden($session,{"name"=>"op","value"=>"editProfileSave"});
$vars->{'profile.form.hidden'} .= WebGUI::Form::hidden($session,{"name"=>"uid","value"=>$session->user->profileField("userId")});
$vars->{'profile.form.hidden'} .= WebGUI::Form::hidden($session,{"name"=>"uid","value"=>$session->user->userId});
my @array = ();
foreach my $category (@{WebGUI::ProfileCategory->getCategories}) {
next unless $category->isEditable;
@ -132,14 +132,14 @@ sub www_editProfile {
sub www_editProfileSave {
my $session = shift;
my ($profile, $fieldName, $error, $u, $warning);
return WebGUI::Operation::Auth::www_auth("init") if ($session->user->profileField("userId") eq '1');
return WebGUI::Operation::Auth::www_auth("init") if ($session->user->userId eq '1');
($profile, $error, $warning) = validateProfileData();
$error .= $warning;
return www_editProfile('<ul>'.$error.'</ul>') if($error ne "");
$u = WebGUI::User->new($session->user->profileField("userId"));
$u = WebGUI::User->new($session->user->userId);
foreach $fieldName (keys %{$profile}) {
$u->profileField($fieldName,$profile->{$fieldName});
}
@ -157,7 +157,7 @@ sub www_viewProfile {
return $session->privilege->notMember() if($u->username eq "");
return $session->style->userStyle($vars->{displayTitle}.$i18n->get(862)) if($u->profileField("publicProfile") < 1 && ($session->user->profileField("userId") ne $session->form->process("uid") || $session->user->isInGroup(3)));
return $session->style->userStyle($vars->{displayTitle}.$i18n->get(862)) if($u->profileField("publicProfile") < 1 && ($session->user->userId ne $session->form->process("uid") || $session->user->isInGroup(3)));
return $session->privilege->insufficient() if(!$session->user->isInGroup(2));
my @array = ();
@ -174,7 +174,7 @@ sub www_viewProfile {
}
}
$vars->{'profile.elements'} = \@array;
if ($session->user->profileField("userId") eq $session->form->process("uid")) {
if ($session->user->userId eq $session->form->process("uid")) {
$vars->{'profile.accountOptions'} = WebGUI::Operation::Shared::accountOptions();
}
return $session->style->userStyle(WebGUI::Asset::Template->new("PBtmpl0000000000000052")->process($vars));

2
lib/WebGUI/Operation/Shared.pm
View file

@ -42,7 +42,7 @@ use Safe;
}
unless ($session->form->process("op") eq "viewProfile"){
my %hash;
$hash{'options.display'} = '<a href="'.$session->url->page('op=viewProfile;uid='.$session->user->profileField("userId")).'">'.$i18n->get(343).'</a>';
$hash{'options.display'} = '<a href="'.$session->url->page('op=viewProfile;uid='.$session->user->userId).'">'.$i18n->get(343).'</a>';
push(@array,\%hash);
}
unless ($session->form->process("op") eq "viewMessageLog"){

2
lib/WebGUI/Operation/TransactionLog.pm
View file

@ -34,7 +34,7 @@ sub www_viewPurchaseHistory {
$var{errorMessage} = shift;
@history = @{WebGUI::Commerce::Transaction->transactionsByUser($session->user->profileField("userId"))};
@history = @{WebGUI::Commerce::Transaction->transactionsByUser($session->user->userId)};
foreach (@history) {
%properties = %{$_->get};
$properties{initDate} = $session->datetime->epochToHuman($properties{initDate});

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

@ -313,7 +313,7 @@ sub www_editUser {
Deactivated =>$i18n->get(818),
Selfdestructed =>$i18n->get(819)
);
if ($u->userId eq $session->user->profileField("userId")) {
if ($u->userId eq $session->user->userId) {
$tabform->getTab("account")->hidden(
-name => "status",
-value => $u->status
@ -365,7 +365,7 @@ sub www_editUser {
foreach my $group (@exclude) {
unless (
$group eq "1" || $group eq "2" || $group eq "7" # can't remove user from magic groups
|| ($session->user->profileField("userId") eq $u->userId && $group eq 3) # cannot remove self from admin
|| ($session->user->userId eq $u->userId && $group eq 3) # cannot remove self from admin
|| ($u->userId eq "3" && $group eq "3") # admin user cannot be remove from admin
) {
push(@include,$group);
@ -461,7 +461,7 @@ sub www_editUserKarmaSave {
return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
my ($u);
$u = WebGUI::User->new($session->form->process("uid"));
$u->karma($session->form->process("amount"),$session->user->profileField("username")." (".$session->user->profileField("userId").")",$session->form->process("description"));
$u->karma($session->form->process("amount"),$session->user->username." (".$session->user->userId.")",$session->form->process("description"));
return www_editUser();
}