aboutsummaryrefslogtreecommitdiffstats
path: root/showdependencygraph.cgi
diff options
context:
space:
mode:
authorbbaetz%acm.org <>2003-11-22 11:50:36 +0000
committerbbaetz%acm.org <>2003-11-22 11:50:36 +0000
commitda857afa089e79ad16fb833dd1ffe397055fd892 (patch)
tree4582f630aa59c35fdb25aa30fd71c617977e0a86 /showdependencygraph.cgi
parent63790559f094b702688365ed12242526ce3ff969 (diff)
downloadbugs-da857afa089e79ad16fb833dd1ffe397055fd892.tar
bugs-da857afa089e79ad16fb833dd1ffe397055fd892.tar.gz
bugs-da857afa089e79ad16fb833dd1ffe397055fd892.tar.bz2
bugs-da857afa089e79ad16fb833dd1ffe397055fd892.tar.xz
bugs-da857afa089e79ad16fb833dd1ffe397055fd892.zip
Bug 208604 - Make data/template dir locations configurable
Diffstat (limited to 'showdependencygraph.cgi')
-rwxr-xr-xshowdependencygraph.cgi16
1 files changed, 9 insertions, 7 deletions
diff --git a/showdependencygraph.cgi b/showdependencygraph.cgi
index d13f77c5d..5fe5143ec 100755
--- a/showdependencygraph.cgi
+++ b/showdependencygraph.cgi
@@ -27,6 +27,7 @@ use lib qw(.);
use File::Temp;
use Bugzilla;
+use Bugzilla::Config qw(:DEFAULT $webdotdir);
require "CGI.pl";
@@ -85,7 +86,7 @@ if (!defined($::FORM{'id'}) && !defined($::FORM{'doall'})) {
my ($fh, $filename) = File::Temp::tempfile("XXXXXXXXXX",
SUFFIX => '.dot',
- DIR => "data/webdot");
+ DIR => $webdotdir);
my $urlbase = Param('urlbase');
print $fh "digraph G {";
@@ -189,7 +190,7 @@ if ($webdotbase =~ /^https?:/) {
my $dotfh;
my ($pngfh, $pngfilename) = File::Temp::tempfile("XXXXXXXXXX",
SUFFIX => '.png',
- DIR => 'data/webdot');
+ DIR => $webdotdir);
open (DOT, '-|') or exec ($webdotbase, "-Tpng", $filename);
print $pngfh $_ while <DOT>;
close DOT;
@@ -198,7 +199,7 @@ if ($webdotbase =~ /^https?:/) {
my ($mapfh, $mapfilename) = File::Temp::tempfile("XXXXXXXXXX",
SUFFIX => '.map',
- DIR => 'data/webdot');
+ DIR => $webdotdir);
open (DOT, '-|') or exec ($webdotbase, "-Tismap", $filename);
print $mapfh $_ while <DOT>;
close DOT;
@@ -209,15 +210,16 @@ if ($webdotbase =~ /^https?:/) {
# Cleanup any old .dot files created from previous runs.
my $since = time() - 24 * 60 * 60;
# Can't use glob, since even calling that fails taint checks for perl < 5.6
-opendir(DIR, "data/webdot/");
-my @files = grep { /\.dot$|\.png$|\.map$/ && -f "data/webdot/$_" } readdir(DIR);
+opendir(DIR, $webdotdir);
+my @files = grep { /\.dot$|\.png$|\.map$/ && -f "$webdotdir/$_" } readdir(DIR);
closedir DIR;
foreach my $f (@files)
{
- $f = "data/webdot/$f";
+ $f = "$webdotdir/$f";
# Here we are deleting all old files. All entries are from the
- # data/webdot/ directory. Since we're deleting the file (not following
+ # $webdot directory. Since we're deleting the file (not following
# symlinks), this can't escape to delete anything it shouldn't
+ # (unless someone moves the location of $webdotdir, of course)
trick_taint($f);
if (ModTime($f) < $since) {
unlink $f;