diff --git a/mozilla/webtools/testopia/.bzrrev b/mozilla/webtools/testopia/.bzrrev index 96fb20c16ef..d15aedf3cab 100644 --- a/mozilla/webtools/testopia/.bzrrev +++ b/mozilla/webtools/testopia/.bzrrev @@ -1 +1 @@ -691 \ No newline at end of file +692 \ No newline at end of file diff --git a/mozilla/webtools/testopia/.gitrev b/mozilla/webtools/testopia/.gitrev index 9c69c7e28d3..6d6baeb357f 100644 --- a/mozilla/webtools/testopia/.gitrev +++ b/mozilla/webtools/testopia/.gitrev @@ -1 +1 @@ -fb3848612ab2230541953742c08351055ea11f52 \ No newline at end of file +44f94130be5ed5376e0dc5fa57273e439e7eb394 \ No newline at end of file diff --git a/mozilla/webtools/testopia/extensions/Testopia/contrib/drivers/php/.xmlrpc.inc.php b/mozilla/webtools/testopia/extensions/Testopia/contrib/drivers/php/.xmlrpc.inc.php index 484455eea38..a2a44fae0aa 100644 --- a/mozilla/webtools/testopia/extensions/Testopia/contrib/drivers/php/.xmlrpc.inc.php +++ b/mozilla/webtools/testopia/extensions/Testopia/contrib/drivers/php/.xmlrpc.inc.php @@ -1,7 +1,7 @@ -// $Id: .xmlrpc.inc.php,v 1.54 2015-03-15 15:45:20 bzrmirror%bugzilla.org Exp $ +// $Id: .xmlrpc.inc.php,v 1.55 2015-03-15 15:45:33 bzrmirror%bugzilla.org Exp $ // Copyright (c) 1999,2000,2002 Edd Dumbill. // All rights reserved. diff --git a/mozilla/webtools/testopia/tr_caserun_reports.cgi b/mozilla/webtools/testopia/tr_caserun_reports.cgi deleted file mode 100644 index 0a476e6d5f8..00000000000 --- a/mozilla/webtools/testopia/tr_caserun_reports.cgi +++ /dev/null @@ -1,103 +0,0 @@ -#!/usr/bin/perl -wT -# -*- Mode: perl; indent-tabs-mode: nil -*- -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Bugzilla Testopia System. -# -# The Initial Developer of the Original Code is Greg Hendricks. -# Portions created by Greg Hendricks are Copyright (C) 2006 -# Novell. All Rights Reserved. -# -# Contributor(s): Greg Hendricks - -# Portions taken from Bugzilla reports by Gervase Markham - -use strict; -use lib qw(. lib); - -use Bugzilla; -use Bugzilla::Constants; -use Bugzilla::Error; -use Bugzilla::Util; - -BEGIN { Bugzilla->extensions } - -use Bugzilla::Extension::Testopia::Util; -use Bugzilla::Extension::Testopia::Constants; -use Bugzilla::Extension::Testopia::Report; - -my $vars = {}; -my $template = Bugzilla->template; -my $cgi = Bugzilla->cgi; - -Bugzilla->login(LOGIN_REQUIRED); - -my $type = $cgi->param('type') || ''; - -if ($type eq 'status-breakdown'){ -} -else{ - $cgi->param('current_tab', 'case_run'); - $cgi->param('viewall', 1); - my $report = Bugzilla::Extension::Testopia::Report->new('caserun', 'tr_list_caseruns.cgi', $cgi); - $vars->{'report'} = $report; - $vars->{'qname'} = $cgi->param('qname'); - - ### From Bugzilla report.cgi by Gervase Markham - my $formatparam = $cgi->param('format'); - my $report_action = $cgi->param('report_action'); - if ($report_action eq "data") { - # So which template are we using? If action is "wrap", we will be using - # no format (it gets passed through to be the format of the actual data), - # and either report.csv.tmpl (CSV), or report.html.tmpl (everything else). - # report.html.tmpl produces an HTML framework for either tables of HTML - # data, or images generated by calling report.cgi again with action as - # "plot". - $formatparam =~ s/[^a-zA-Z\-]//g; - trick_taint($formatparam); - $vars->{'format'} = $formatparam; - $formatparam = ''; - } - elsif ($report_action eq "plot") { - # If action is "plot", we will be using a format as normal (pie, bar etc.) - # and a ctype as normal (currently only png.) - $vars->{'cumulate'} = $cgi->param('cumulate') ? 1 : 0; - $vars->{'x_labels_vertical'} = $cgi->param('x_labels_vertical') ? 1 : 0; - $vars->{'data'} = $report->{'image_data'}; - } - else { - ThrowUserError("unknown_action", {action => $cgi->param('report_action')}); - } - - my $format = $template->get_format("testopia/reports/report", $formatparam, - scalar($cgi->param('ctype'))); - - my @time = localtime(time()); - my $date = sprintf "%04d-%02d-%02d", 1900+$time[5],$time[4]+1,$time[3]; - my $filename = "report-" . $date . ".$format->{extension}"; - - my $disp = "inline"; - # We set CSV files to be downloaded, as they are designed for importing - # into other programs. - if ( $format->{'extension'} eq "csv" || $format->{'extension'} eq "xml" ){ - $disp = "attachment"; - } - - print $cgi->header(-type => $format->{'ctype'}, - -content_disposition => "$disp; filename=$filename"); - - $vars->{'time'} = $date; - $template->process("$format->{'template'}", $vars) - || ThrowTemplateError($template->error()); - - exit; -}