View | Details | Raw Unified | Return to bug 4461
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/problem-reports.tt (-2 / +2 lines)
Lines 79-86 Link Here
79
                                        <b>[% report.title | html %]</b><br>
79
                                        <b>[% report.title | html %]</b><br>
80
                                        [% report.content | html %]
80
                                        [% report.content | html %]
81
                                    </td>
81
                                    </td>
82
                                    <td><a href="[% report.problempage | url %]">[% report.problempage | html %]</a></td>
82
                                    <td><a href="[% OPACBaseURL | url %][% report.problempage | url %]">[% OPACBaseURL | url %][% report.problempage | html %]</a></td>
83
                                    <td>[% report.recipient %]</td>
83
                                    <td>[% report.recipient | html %]</td>
84
                                    <td><span title="[% report.created_on | html %]">[% report.created_on | $KohaDates with_hours => 1 %]</span></td>
84
                                    <td><span title="[% report.created_on | html %]">[% report.created_on | $KohaDates with_hours => 1 %]</span></td>
85
                                    <td>[% INCLUDE 'patron-title.inc' patron => report.patron hide_patron_infos_if_needed=1 %]</td>
85
                                    <td>[% INCLUDE 'patron-title.inc' patron => report.patron hide_patron_infos_if_needed=1 %]</td>
86
                                    <td class="status[% report.status | html %]" name="status"><span id="status_[% report.reportid | html %]">[% report.status | html %]</span></td>
86
                                    <td class="status[% report.status | html %]" name="status"><span id="status_[% report.reportid | html %]">[% report.status | html %]</span></td>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt (-3 / +3 lines)
Lines 37-43 Link Here
37
                                [% ELSE %]
37
                                [% ELSE %]
38
                                    Your problem report has been sent to the library.
38
                                    Your problem report has been sent to the library.
39
                                [% END %]
39
                                [% END %]
40
                            [% CASE 'error_on_send' %][#% We really should avoid reaching this! %]
40
                            [% CASE 'error_on_send' #We really should avoid reaching this! %]
41
                                Something wrong happened when sending the report. Please contact your library.
41
                                Something wrong happened when sending the report. Please contact your library.
42
                            [% END %]
42
                            [% END %]
43
                        </div>
43
                        </div>
Lines 62-69 Link Here
62
                                    </li>
62
                                    </li>
63
                                    <li>
63
                                    <li>
64
                                        <label for="problempage">Problem found on page: </label>
64
                                        <label for="problempage">Problem found on page: </label>
65
                                        <input type="hidden" name="problempage" id="problempage" value="[% problempage | html %]">
65
                                        <input type="hidden" name="problempage" id="problempage" value="[% problempage | url %]">
66
                                        [% problempage | html %]
66
                                         [% problempage | html %]<br/>
67
                                    </li>
67
                                    </li>
68
                                    <li>
68
                                    <li>
69
                                        <label for="user">Username: </label>
69
                                        <label for="user">Username: </label>
(-)a/opac/opac-reportproblem.pl (-3 / +6 lines)
Lines 28-33 use Koha::ProblemReport; Link Here
28
use Koha::Libraries;
28
use Koha::Libraries;
29
use Koha::Patrons;
29
use Koha::Patrons;
30
use Koha::Util::Navigation;
30
use Koha::Util::Navigation;
31
use URI::Escape;
32
use Encode;
31
33
32
my $input = new CGI;
34
my $input = new CGI;
33
35
Lines 46-52 if ( !C4::Context->preference('OPACReportProblem') Link Here
46
    print $input->redirect("/cgi-bin/koha/errors/404.pl");
48
    print $input->redirect("/cgi-bin/koha/errors/404.pl");
47
}
49
}
48
50
49
my $problempage = C4::Context->preference('OPACBaseURL') . Koha::Util::Navigation::local_referer($input );
51
my $referer = Koha::Util::Navigation::local_referer($input );
52
$referer = Encode::decode_utf8 uri_unescape $referer,
50
53
51
my $patron = Koha::Patrons->find($borrowernumber);
54
my $patron = Koha::Patrons->find($borrowernumber);
52
my $username = $patron->userid;
55
my $username = $patron->userid;
Lines 56-62 my @messages; Link Here
56
59
57
$template->param(
60
$template->param(
58
    username    => $username,
61
    username    => $username,
59
    problempage => $problempage,
62
    problempage => $referer,
60
    library     => $library,
63
    library     => $library,
61
);
64
);
62
65
Lines 66-71 if ( $op eq 'addreport' ) { Link Here
66
    my $subject = $input->param('subject');
69
    my $subject = $input->param('subject');
67
    my $message = $input->param('message');
70
    my $message = $input->param('message');
68
    my $problempage = $input->param('problempage');
71
    my $problempage = $input->param('problempage');
72
    $problempage = Encode::decode_utf8 uri_unescape $problempage;
69
    my $recipient = $input->param('recipient') || 'admin';
73
    my $recipient = $input->param('recipient') || 'admin';
70
74
71
    try {
75
    try {
72
- 

Return to bug 4461