200198 - user-error.html.tmpl's use [% changedsince %] instead of $changedsince

Status: RESOLVED FIXED

(Bugzilla :: Bugzilla-General, defect)

Description

[Tobias Burnus]

In global/user-error.html.tmpl there is this line:

  [% ELSIF error == "no_dupe_stats_error_whenever" %]
    [% title = "Error Reading Previous Dupes File" %]
    An error occurred opening $changedsince days ago ($whenever)'s

Relevant lines from duplicates.cgi:
  my $changedsince = formvalue("changedsince", 7);
  my $whenever = days_ago($changedsince);
  # If error then
        $vars->{'changedsince'} = $changedsince;
        $vars->{'whenever'} = $whenever;
        ThrowUserError("no_dupe_stats_error_whenever");
});

Comment 1

[Tobias Burnus]

Attachment: v1: detain earlier and use [% %] (with FILTER html)

This patch is based on the patch from bug 192677.

I use FILTER html though this is not needed since the variables are detained or
save, respectively.

Comment 2

[Gervase Markham [:gerv]]

burnus: is this patch still necessary? I'm sure some of it's already gone in...

Gerv

Comment 3

[Tobias Burnus]

Attachment: Rediff

> is this patch still necessary? I'm sure some of it's already gone in...
Hmm, I couldn't find any changes (other that duplicates.cgi's patch didn't
apply anymore).

Comment 4

[Gervase Markham [:gerv]]

Comment on attachment 121799 [details] [diff] [review]
Rediff

Why does the detaint code have to move 20 lines up the file?

Gerv

Comment 5

[Tobias Burnus]

> Why does the detaint code have to move 20 lines up the file?
|detaint_natural($maxrows)
No particular reason but keeping the two detaints together.

|detaint_natural($changedsince)
Well, I like to detain $changedsince before I use it, since I filter it anyway
in the template, it shouldn't matter though. (Not knowing what exactly might get
wrong in this line: tie(%before, 'AnyDBM_File',
"data/duplicates/dupes$whenever"[...])

This comes between the new and the former location:
  my $whenever = days_ago($changedsince);
    if (!$!{ENOENT}) {
        ThrowUserError("no_dupe_stats_error_whenever",
                       { error_msg => $!,
                         changedsince => $changedsince,
                         whenever => $whenever,
                       });

Comment 6

[Tobias Burnus]

Checking in duplicates.cgi;
/cvsroot/mozilla/webtools/bugzilla/duplicates.cgi,v  <--  duplicates.cgi
new revision: 1.37; previous revision: 1.36
done
Checking in template/en/default/global/user-error.html.tmpl;
/cvsroot/mozilla/webtools/bugzilla/template/en/default/global/user-error.html.tmpl,v
 <--  user-error.html.tmpl
new revision: 1.35; previous revision: 1.34
done