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

fix: Thread layout flat not sticking Some WebGUI/Auth.pm cleanup.

Browse source
This commit is contained in:
Doug Bell 2006-11-07 21:28:47 +00:00
parent 9c8399d93b
commit 0fbbbea782
3 changed files with 30 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -37,6 +37,7 @@
- fix: Gantt chart bars erroneously being shifted one day to the right - fix: Gantt chart bars erroneously being shifted one day to the right
- fix: Post titles containing periods result in urls containing periods - fix: Post titles containing periods result in urls containing periods
- fix: Activity list expands outside of edit workflow screen - fix: Activity list expands outside of edit workflow screen
- fix: Thread layout "flat" doesn't stick
7.1.4 7.1.4
- Template variables in the main Survey Template were out of date in the - Template variables in the main Survey Template were out of date in the

6
lib/WebGUI/Asset/Post/Thread.pm
View file

@ -776,7 +776,10 @@ sub view {
my $out = WebGUI::Cache->new($self->session,"view_".$self->getId)->get; my $out = WebGUI::Cache->new($self->session,"view_".$self->getId)->get;
return $out if $out; return $out if $out;
} }
$self->session->scratch->set("discussionLayout",$self->session->form->process("layout")); $self->session->scratch->set("discussionLayout",$self->session->form->process("layout"))
if ($self->session->form->process("layout"));
my $layout = $self->session->scratch->get("discussionLayout")
|| $self->session->user->profileField("discussionLayout");
my $var = $self->getTemplateVars; my $var = $self->getTemplateVars;
$self->getParent->appendTemplateLabels($var); $self->getParent->appendTemplateLabels($var);
$var->{karmaIsEnabled} = $self->session->setting->get("useKarma"); $var->{karmaIsEnabled} = $self->session->setting->get("useKarma");
@ -788,7 +791,6 @@ sub view {
$var->{'layout.nested.url'} = $self->getLayoutUrl("nested"); $var->{'layout.nested.url'} = $self->getLayoutUrl("nested");
$var->{'layout.flat.url'} = $self->getLayoutUrl("flat"); $var->{'layout.flat.url'} = $self->getLayoutUrl("flat");
my $layout = $self->session->scratch->get("discussionLayout") || $self->session->user->profileField("discussionLayout");
$var->{'layout.isFlat'} = ($layout eq "flat"); $var->{'layout.isFlat'} = ($layout eq "flat");
$var->{'layout.isNested'} = ($layout eq "nested" || !$var->{'layout.isFlat'}); $var->{'layout.isNested'} = ($layout eq "nested" || !$var->{'layout.isFlat'});

11
lib/WebGUI/Auth.pm
View file

@ -93,8 +93,13 @@ sub _isValidUsername {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub _logLogin { sub _logLogin {
my $self = shift; my $self = shift;
$self->session->db->write("insert into userLoginLog values (".$self->session->db->quote($_[0]).",".$self->session->db->quote($_[1]).",".$self->session->datetime->time()."," $self->session->db->write("insert into userLoginLog values (?,?,?,?,?)",
.$self->session->db->quote($self->session->env->getIp).",".$self->session->db->quote($self->session->env->get("HTTP_USER_AGENT")).")"); $_[0],
$_[1],
$self->session->datetime->time(),
$self->session->env->getIp,
$self->session->env->get("HTTP_USER_AGENT")
);
} }
@ -579,7 +584,7 @@ Authentication should always happen in the subclass routine.
sub login { sub login {
my $self = shift; my $self = shift;
my ($cmd, $uid, $u, $authMethod,$msg,$userData,$expireDate); my ($cmd, $uid, $u);
#Create a new user #Create a new user
$uid = $self->userId; $uid = $self->userId;