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

some minor changes.

Browse source
This commit is contained in:
Matthew Wilson 2006-01-18 05:21:34 +00:00
parent 6c49511082
commit 401c72f062
3 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/WebGUI.pm
View file

@ -74,7 +74,7 @@ sub contentHandler {
} else {
$output = page($session);
}
$r->print($session->http->getHeader());
$session->http->getHeader();
$r->print($output) unless ($session->http->isRedirect());
WebGUI::Affiliate::grabReferral($session); # process affilliate tracking request
}
@ -141,7 +141,6 @@ sub processOperations {
# $session{form} = \%form;
# $output = processOperations($session,$opNumber);
# }
$session->http->getHeader;
return $output;
}

25
lib/WebGUI/Asset/Template/Parser.pm
View file

@ -32,19 +32,18 @@ A reference the template variable hash.
sub addSessionVars {
my $self = shift;
my $vars = shift;
while (my ($section, $hash) = each %{$self->session}) {
next unless (ref $hash eq 'HASH');
while (my ($key, $value) = each %$hash) {
unless (lc($key) eq "password" || lc($key) eq "identifier") {
$vars->{"session.".$section.".".$key} = $value;
}
}
}
$vars->{"webgui.version"} = $WebGUI::VERSION;
$vars->{"webgui.status"} = $WebGUI::STATUS;
return $vars;
my $vars = shift;
# These are the only session template variables used in the core as
# of 6.8.5. Further use of session template vars is deprecated.
$vars->{"session.user.username"} = $self->session->user->username;
$vars->{"session.user.firstDayOfWeek"} = $self->session->user->profileField("firstDayOfWeek");
$vars->{"session.config.extrasurl"} = $self->session->config->get("extrasURL");
$vars->{"session.var.adminOn"} = $self->session->var->isAdminOn;
$vars->{"session.setting.companyName"} = $self->session->setting->get("companyName");
$vars->{"session.setting.anonymousRegistration"} = $self->session->setting->get("anonymousRegistration");
$vars->{"webgui.version"} = $WebGUI::VERSION;
$vars->{"webgui.status"} = $WebGUI::STATUS;
return $vars;
}
#-------------------------------------------------------------------

7
lib/WebGUI/Asset/Wobject/DataForm.pm
View file

@ -32,7 +32,8 @@ sub _createField {
my %param;
$param{name} = $data->{name};
$param{name} = "field_".$data->{sequenceNumber} if ($param{name} eq ""); # Empty fieldname not allowed
$self->session->form->process($param{name}) =~ s/\^.*?\;//gs ; # remove macro's from user input
my $name = $param{name};
$name =~ s/\^.*?\;//gs ; # remove macro's from user input
$param{value} = $data->{value};
$param{size} = $data->{width};
$param{rows} = $data->{rows} || 5;
@ -45,8 +46,8 @@ sub _createField {
}
if (isIn($data->{type},qw(selectList checkList))) {
my @defaultValues;
if ($self->session->form->process($param{name})) {
@defaultValues = $self->session->form->selectList($param{name});
if ($name) {
@defaultValues = $self->session->form->selectList($name);
} else {
foreach (split(/\n/, $data->{value})) {
s/\s+$//; # remove trailing spaces