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

Changed default behavior to return nothing instead of the macro tag when no

Browse source 
matching collateral is found.
This commit is contained in:
Alan Ritari 2003-12-29 20:35:52 +00:00
parent e8c305d919
commit 47015a8b26
6 changed files with 37 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/WebGUI/Macro/File.pm
View file

@ -18,8 +18,14 @@ use WebGUI::Session;
#-------------------------------------------------------------------
sub process {
my @param = WebGUI::Macro::getParams($_[0]);
my $collateral = WebGUI::Collateral->find($param[0]);
return '<a href="'.$collateral->getURL.'"><img src="'.$collateral->getIcon.'" align="middle" border="0" /> '.$collateral->get("name").'</a>';
if (my $collateral = WebGUI::Collateral->find($param[0])) {
return '<a href="' . $collateral->getURL .
'"><img src="' . $collateral->getIcon .
'" align="middle" border="0" /> ' .
$collateral->get("name") . '</a>';
} else {
return undef;
}
}
1;

7
lib/WebGUI/Macro/RandomImage.pm
View file

@ -28,8 +28,11 @@ sub process {
}
my @images = WebGUI::SQL->buildArray("select collateralId from collateral
where collateralType='image' and collateralFolderId=".$collateralFolderId);
my $collateral = WebGUI::Collateral->new($images[rand($#images+1)]);
return '<img src="'.$collateral->getURL.'" '.$collateral->get("parameters").' />';
if (my $collateral = WebGUI::Collateral->new($images[rand($#images+1)])) {
return '<img src="'.$collateral->getURL.'" '.$collateral->get("parameters").' />';
} else {
return undef;
}
}

7
lib/WebGUI/Macro/RandomSnippet.pm
View file

@ -28,8 +28,11 @@ sub process {
}
my @snippets = WebGUI::SQL->buildArray("select collateralId from collateral
where collateralType='snippet' and collateralFolderId=".$collateralFolderId);
my $collateral = WebGUI::Collateral->new($snippets[rand($#snippets+1)]);
return $collateral->get("parameters");
if (my $collateral = WebGUI::Collateral->new($snippets[rand($#snippets+1)])) {
return $collateral->get("parameters");
} else {
return undef;
}
}

7
lib/WebGUI/Macro/Snippet.pm
View file

@ -20,8 +20,11 @@ use WebGUI::Session;
sub process {
my (@param, $temp);
@param = WebGUI::Macro::getParams($_[0]);
my $collateral = WebGUI::Collateral->find($param[0]);
return $collateral->get("parameters");
if (my $collateral = WebGUI::Collateral->find($param[0])) {
return $collateral->get("parameters");
} else {
return undef;
}
}

7
lib/WebGUI/Macro/Thumbnail.pm
View file

@ -18,8 +18,11 @@ use WebGUI::Session;
#-------------------------------------------------------------------
sub process {
my @param = WebGUI::Macro::getParams($_[0]);
my $collateral = WebGUI::Collateral->find($param[0]);
return $collateral->getThumbnail;
if (my $collateral = WebGUI::Collateral->find($param[0])) {
return $collateral->getThumbnail;
} else {
return undef;
}
}

15
lib/WebGUI/Macro/ThumbnailLinker.pm
View file

@ -18,12 +18,15 @@ use WebGUI::Session;
#-------------------------------------------------------------------
sub process {
my @param = WebGUI::Macro::getParams($_[0]);
my $collateral = WebGUI::Collateral->find($param[0]);
my $output = '<a href="'.$collateral->getURL.'"';
$output .= ' target="_blank"' if ($param[1]);
$output .= '><img src="'.$collateral->getThumbnail.
'" border="0"></a><br><b>'.$param[0].'</b><p>';
return $output;
if (my $collateral = WebGUI::Collateral->find($param[0])) {
my $output = '<a href="'.$collateral->getURL.'"';
$output .= ' target="_blank"' if ($param[1]);
$output .= '><img src="' . $collateral->getThumbnail;
$output .= '" border="0"></a><br><b>'.$param[0].'</b><p>';
return $output;
} else {
return undef;
}
}