Bug 15005: Replace CGI->url with the corresponding url
CGI->url does not return the correct url on install using packages. Test plan: 1/ Try to reproduce the bug from the description of bug 15005. You should be able to login to the intranet and the OPAC 2/ Send a basket and a list from the intranet and the OPAC. Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
parent
390233a10c
commit
912f238c5e
|
|
@ -1245,9 +1245,7 @@ sub checkauth {
|
|||
);
|
||||
}
|
||||
|
||||
my $self_url = $query->url( -absolute => 1 );
|
||||
$template->param(
|
||||
url => $self_url,
|
||||
LibraryName => C4::Context->preference("LibraryName"),
|
||||
);
|
||||
$template->param(%info);
|
||||
|
|
|
|||
|
|
@ -381,8 +381,6 @@ sub checkauth {
|
|||
$template->param( login => 1 );
|
||||
$template->param( loginprompt => 1 ) unless $info{'nopermission'};
|
||||
|
||||
my $self_url = $query->url( -absolute => 1 );
|
||||
$template->param( url => $self_url, );
|
||||
$template->param( \%info );
|
||||
$cookie = $query->cookie(
|
||||
-name => 'CGISESSID',
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
[% END %]
|
||||
|
||||
<!-- login prompt time-->
|
||||
<form action="[% url %]" method="post" name="loginform" id="loginform">
|
||||
<form action="/cgi-bin/koha/mainpage.pl" method="post" name="loginform" id="loginform">
|
||||
<input type="hidden" name="koha_login_context" value="intranet" />
|
||||
[% FOREACH INPUT IN INPUTS %]
|
||||
<input type="hidden" name="[% INPUT.name |html %]" value="[% INPUT.value |html %]" />
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
[% ELSE %]
|
||||
|
||||
<form action="[% url %]" method="post">
|
||||
<form action="/cgi-bin/koha/basket/sendbasket.pl" method="post">
|
||||
|
||||
<fieldset class="rows">
|
||||
<legend>Sending your cart</legend>
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
|
||||
[% IF ( loginprompt ) %]
|
||||
<!-- login prompt time-->
|
||||
<form action="[% url %]" method="post" name="mainform" id="mainform">
|
||||
<form action="/cgi-bin/koha/installer/install.pl" method="post" name="mainform" id="mainform">
|
||||
[% FOREACH INPUT IN INPUTS %]
|
||||
<input type="hidden" name="[% INPUT.name |html %]" value="[% INPUT.value |html %]" />
|
||||
[% END %]
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
[% ELSE %]
|
||||
|
||||
<form action="[% url %]" method="post">
|
||||
<form action="/cgi-bin/koha/virtualshelves/sendshelf.pl" method="post">
|
||||
|
||||
<fieldset class="rows">
|
||||
<legend>Sending your list</legend>
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@
|
|||
|
||||
[% END # / IF casAuthentication %]
|
||||
|
||||
<form action="[% url %]" name="auth" id="auth" method="post">
|
||||
<form action="/cgi-bin/koha/opac-user.pl" name="auth" id="auth" method="post">
|
||||
<input type="hidden" name="koha_login_context" value="opac" />
|
||||
<fieldset class="brief">
|
||||
[% FOREACH INPUT IN INPUTS %]
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
[% ELSE %]
|
||||
<h1>Sending your cart</h1>
|
||||
<form action="[% url %]" method="post" id="sendbasketform">
|
||||
<form action="/cgi-bin/koha/opac-sendbasket.pl" method="post" id="sendbasketform">
|
||||
<fieldset>
|
||||
<label for="email_add">Email address:</label>
|
||||
<input type="text" id="email_add" name="email_add" size="43" class="focus" />
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
<p><a class="button close" href="/cgi-bin/koha/opac-shelves.pl?viewshelf=[% shelfid %]">Back to lists</a></p>
|
||||
[% ELSE %]
|
||||
<h1>Sending your list</h1>
|
||||
<form action="[% url %]" method="post" id="sendshelfform">
|
||||
<form action="/cgi-bin/koha/opac-sendshelf.pl" method="post" id="sendshelfform">
|
||||
<fieldset>
|
||||
<label for="email">Email address:</label>
|
||||
<input type="text" id="email" name="email" size="43" class="focus" />
|
||||
|
|
|
|||
Loading…
Reference in New Issue