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

moved uploadsAccessHandler into the main webgui handler mechanism

Browse source 
converted macros to use references
fixed some other various bugs
This commit is contained in:
JT Smith 2005-11-07 01:40:07 +00:00
parent 2818ade8b0
commit ea868a8c0e
73 changed files with 256 additions and 275 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -461,7 +461,9 @@ sub getRecordTemplateVars {
$data{value} = WebGUI::DateTime::setToEpoch($data{value}) if ($data{type} eq "date");
}
if (not exists $data{value}) {
$data{value} = WebGUI::Macro::process($data{defaultValue});
my $defaultValue = $data{defaultValue};
WebGUI::Macro::process(\$defaultValue);
$data{value} = $defaultValue;
}
my $hidden = (($data{status} eq "hidden" && !$session{var}{adminOn}) || ($data{isMailField} && !$self->get("mailData")));
my $value = $data{value};
@ -503,7 +505,9 @@ sub getRecordTemplateVars {
$data{value} = WebGUI::DateTime::setToEpoch($data{value}) if ($data{type} eq "date");
}
if (not exists $data{value}) {
$data{value} = WebGUI::Macro::process($data{defaultValue});
my $defaultValue = $data{defaultValue};
WebGUI::Macro::process(\$defaultValue);
$data{value} = $defaultValue;
}
my $hidden = (($data{status} eq "hidden" && !$session{var}{adminOn}) || ($data{isMailField} && !$self->get("mailData")));
my $value = $data{value};
@ -612,7 +616,8 @@ sub purge {
sub sendEmail {
my $self = shift;
my $var = shift;
my $message = WebGUI::Macro::process($self->processTemplate($var,$self->get("emailTemplateId")));
my $message = $self->processTemplate($var,$self->get("emailTemplateId"));
WebGUI::Macro::process(\$message);
my ($to, $subject, $from, $bcc, $cc);
foreach my $row (@{$var->{field_loop}}) {
if ($row->{"field.name"} eq "to") {
@ -1079,7 +1084,7 @@ sub www_process {
my $value = $row{defaultValue};
if ($row{status} eq "required" || $row{status} eq "editable") {
$value = WebGUI::FormProcessor::process($row{name},$row{type},$row{defaultValue});
$value = WebGUI::Macro::filter($value);
WebGUI::Macro::filter(\$value);
}
if ($row{status} eq "required" && ($value =~ /^\s$/ || $value eq "" || not defined $value)) {
push (@errors,{
@ -1089,7 +1094,8 @@ sub www_process {
delete $var->{entryId};
}
if ($row{status} eq "hidden") {
$value = WebGUI::Macro::process($row{defaultValue});
$value = $row{defaultValue};
WebGUI::Macro::process(\$value);
}
unless ($hadErrors) {
my ($exists) = WebGUI::SQL->quickArray("select count(*) from DataForm_entryData where DataForm_entryId=".quote($entryId)."

1
lib/WebGUI/Asset/Wobject/EventsCalendar.pm
View file

@ -15,7 +15,6 @@ use Tie::CPHash;
use WebGUI::DateTime;
use WebGUI::ErrorHandler;
use WebGUI::International;
use WebGUI::Macro;
use WebGUI::Privilege;
use WebGUI::Id;
use WebGUI::Session;

4
lib/WebGUI/Asset/Wobject/IndexedSearch.pm
View file

@ -235,7 +235,9 @@ sub view {
$var{query} .= " ".join(" ",map("-".$_,split(/\s+/,$var{without}))) if ($var{without});
# Remove macro's from query
$var{query} = WebGUI::Macro::negate($var{query});
my $query = $var{query};
WebGUI::Macro::negate(\$query);
$var{query} = $query;
# Set some standard vars
$var{submit} = WebGUI::Form::submit({value=>WebGUI::International::get(16, "Asset_IndexedSearch")});

5
lib/WebGUI/Asset/Wobject/SQLReport.pm
View file

@ -293,7 +293,7 @@ sub _parsePlaceholderParams {
} elsif ($type =~ /^query(\d)/) {
$param = $self->{_query}{$1}{rowData}{$field};
}
$param = WebGUI::Macro::process($param);
WebGUI::Macro::process(\$param);
push(@placeholderParams, $param);
}
return \@placeholderParams;
@ -316,7 +316,8 @@ sub _processQuery {
# Preprocess macros
if ($self->{_query}{$nr}{preprocessMacros}) {
$query = WebGUI::Macro::process($self->{_query}{$nr}{dbQuery});
my $query = $self->{_query}{$nr}{dbQuery};
WebGUI::Macro::process(\$query);
} else {
$query = $self->{_query}{$nr}{dbQuery};
}

6
lib/WebGUI/Asset/Wobject/WSClient.pm
View file

@ -298,8 +298,10 @@ sub view {
# snag our SOAP call and preprocess if needed
if ($self->get('preprocessMacros')) {
$call = WebGUI::Macro::process($self->get("callMethod"));
$param_str = WebGUI::Macro::process($self->get("params"));
$call = $self->get("callMethod");
WebGUI::Macro::process(\$call);
$param_str = $self->get("params");
WebGUI::Macro::process(\$param_str);
} else {
$call = $self->get('callMethod');
$param_str = $self->get('params');