# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
use strict;
+#use warnings; FIXME - Bug 2505
use Digest::MD5 qw(md5_base64);
use Storable qw(thaw freeze);
use URI::Escape;
use POSIX qw/strftime/;
# use utf8;
-use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $debug $ldap $cas);
+use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $debug $ldap $cas $caslogout);
BEGIN {
$VERSION = 3.02; # set version for version checking
- $debug = $ENV{DEBUG} || 1 ; # Changed
+ $debug = $ENV{DEBUG};
@ISA = qw(Exporter);
@EXPORT = qw(&checkauth &get_template_and_user &haspermission &get_user_subpermissions);
@EXPORT_OK = qw(&check_api_auth &get_session &check_cookie_auth &checkpw &get_all_subpermissions &get_user_subpermissions);
%EXPORT_TAGS = (EditPermissions => [qw(get_all_subpermissions get_user_subpermissions)]);
$ldap = C4::Context->config('useldapserver') || 0;
- $cas = C4::Context->config('usecasserver') || 0;
+ $cas = C4::Context->preference('casAuthentication');
+ $caslogout = C4::Context->preference('casLogout');
if ($ldap) {
require C4::Auth_with_ldap; # no import
import C4::Auth_with_ldap qw(checkpw_ldap);
}
if ($cas) {
require C4::Auth_with_cas; # no import
- import C4::Auth_with_cas qw(checkpw_cas login_cas logout_cas);
+ import C4::Auth_with_cas qw(checkpw_cas login_cas logout_cas login_cas_url);
}
}
=cut
+my $SEARCH_HISTORY_INSERT_SQL =<<EOQ;
+INSERT INTO search_history(userid, sessionid, query_desc, query_cgi, total, time )
+VALUES ( ?, ?, ?, ?, ?, FROM_UNIXTIME(?))
+EOQ
sub get_template_and_user {
my $in = shift;
my $template =
$template->param( bartotal => $total->{'bartotal'}, ) if ($total->{'bartotal'} > scalar (@$barshelves));
}
- $borrowernumber = getborrowernumber($user);
+ $borrowernumber = getborrowernumber($user) if defined($user);
+
my ( $borr ) = GetMemberDetails( $borrowernumber );
my @bordat;
$bordat[0] = $borr;
# And if there's a cookie with searches performed when the user was not logged in,
# we add them to the logged-in search history
- my @recentSearches;
my $searchcookie = $in->{'query'}->cookie('KohaOpacRecentSearches');
if ($searchcookie){
$searchcookie = uri_unescape($searchcookie);
- if (thaw($searchcookie)) {
- @recentSearches = @{thaw($searchcookie)};
- }
-
- if (@recentSearches > 0) {
- my $query = "INSERT INTO search_history(userid, sessionid, query_desc, query_cgi, total, time) VALUES";
- my $icount = 1;
- foreach my $asearch (@recentSearches) {
- $query .= "(";
- $query .= $borrowernumber . ", ";
- $query .= '"' . $in->{'query'}->cookie("CGISESSID") . "\", ";
- $query .= '"' . $asearch->{'query_desc'} . "\", ";
- $query .= '"' . $asearch->{'query_cgi'} . "\", ";
- $query .= $asearch->{'total'} . ", ";
- $query .= 'FROM_UNIXTIME(' . $asearch->{'time'} . "))";
- if ($icount < @recentSearches) { $query .= ", ";}
- $icount++;
- }
-
- my $sth = $dbh->prepare($query);
- $sth->execute;
+ my @recentSearches = @{thaw($searchcookie) || []};
+ if (@recentSearches) {
+ my $sth = $dbh->prepare($SEARCH_HISTORY_INSERT_SQL);
+ $sth->execute( $borrowernumber,
+ $in->{'query'}->cookie("CGISESSID"),
+ $_->{'query_desc'},
+ $_->{'query_cgi'},
+ $_->{'total'},
+ $_->{'time'},
+ ) foreach @recentSearches;
# And then, delete the cookie's content
my $newsearchcookie = $in->{'query'}->cookie(
}
# Anonymous opac search history
# If opac search history is enabled and at least one search has already been performed
- if (C4::Context->preference('EnableOpacSearchHistory') && $in->{'query'}->cookie('KohaOpacRecentSearches')) {
+ if (C4::Context->preference('EnableOpacSearchHistory')) {
+ my $searchcookie = $in->{'query'}->cookie('KohaOpacRecentSearches');
+ if ($searchcookie){
+ $searchcookie = uri_unescape($searchcookie);
+ my @recentSearches = @{thaw($searchcookie) || []};
# We show the link in opac
- if (thaw(uri_unescape($in->{'query'}->cookie('KohaOpacRecentSearches')))) {
- my @recentSearches = @{thaw(uri_unescape($in->{'query'}->cookie('KohaOpacRecentSearches')))};
- if (@recentSearches > 0) {
+ if (@recentSearches) {
$template->param(ShowOpacRecentSearchLink => 1);
}
}
}
+ if(C4::Context->preference('dateformat')){
+ if(C4::Context->preference('dateformat') eq "metric"){
+ $template->param(dateformat_metric => 1);
+ } elsif(C4::Context->preference('dateformat') eq "us"){
+ $template->param(dateformat_us => 1);
+ } else {
+ $template->param(dateformat_iso => 1);
+ }
+ } else {
+ $template->param(dateformat_iso => 1);
+ }
+
# these template parameters are set the same regardless of $in->{'type'}
$template->param(
"BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1,
'item-level_itypes' => C4::Context->preference('item-level_itypes'),
patronimages => C4::Context->preference("patronimages"),
singleBranchMode => C4::Context->preference("singleBranchMode"),
- XSLTDetailsDisplay => C4::Context->preference("XSLTDetailsDisplay"),
- XSLTResultsDisplay => C4::Context->preference("XSLTResultsDisplay"),
- );
+ XSLTDetailsDisplay => C4::Context->preference("XSLTDetailsDisplay"),
+ XSLTResultsDisplay => C4::Context->preference("XSLTResultsDisplay"),
+ BranchesLoop => GetBranchesLoop(),
+ using_https => $in->{'query'}->https() ? 1 : 0,
+ );
if ( $in->{'type'} eq "intranet" ) {
$template->param(
AmazonContent => C4::Context->preference("AmazonContent"),
+ AmazonCoverImages => C4::Context->preference("AmazonCoverImages"),
+ AmazonEnabled => C4::Context->preference("AmazonEnabled"),
AmazonSimilarItems => C4::Context->preference("AmazonSimilarItems"),
AutoLocation => C4::Context->preference("AutoLocation"),
"BiblioDefaultView".C4::Context->preference("IntranetBiblioDefaultView") => 1,
} elsif($mylibraryfirst){
$opac_name = C4::Branch::GetBranchName($mylibraryfirst);
}
+ my $checkstyle = C4::Context->preference("opaccolorstylesheet");
+ if ($checkstyle =~ /http/)
+ {
+ $template->param( opacexternalsheet => $checkstyle);
+ } else
+ {
+ my $opaccolorstylesheet = C4::Context->preference("opaccolorstylesheet");
+ $template->param( opaccolorstylesheet => $opaccolorstylesheet);
+ }
$template->param(
AmazonContent => "" . C4::Context->preference("AmazonContent"),
AnonSuggestions => "" . C4::Context->preference("AnonSuggestions"),
LibraryName => "" . C4::Context->preference("LibraryName"),
LibraryNameTitle => "" . $LibraryNameTitle,
LoginBranchname => C4::Context->userenv?C4::Context->userenv->{"branchname"}:"",
- OPACAmazonSimilarItems => "" . C4::Context->preference("OPACAmazonSimilarItems"),
+ OPACAmazonEnabled => C4::Context->preference("OPACAmazonEnabled"),
+ OPACAmazonSimilarItems => C4::Context->preference("OPACAmazonSimilarItems"),
+ OPACAmazonCoverImages => C4::Context->preference("OPACAmazonCoverImages"),
+ OPACAmazonReviews => C4::Context->preference("OPACAmazonReviews"),
OPACFRBRizeEditions => C4::Context->preference("OPACFRBRizeEditions"),
+ OpacHighlightedWords => C4::Context->preference("OpacHighlightedWords"),
OPACItemHolds => C4::Context->preference("OPACItemHolds"),
OPACShelfBrowser => "". C4::Context->preference("OPACShelfBrowser"),
OPACURLOpenInNewWindow => "" . C4::Context->preference("OPACURLOpenInNewWindow"),
hidelostitems => C4::Context->preference("hidelostitems"),
mylibraryfirst => (C4::Context->preference("SearchMyLibraryFirst") && C4::Context->userenv) ? C4::Context->userenv->{'branch'} : '',
opaclayoutstylesheet => "" . C4::Context->preference("opaclayoutstylesheet"),
- opaccolorstylesheet => "" . C4::Context->preference("opaccolorstylesheet"),
opacstylesheet => "" . C4::Context->preference("opacstylesheet"),
opacbookbag => "" . C4::Context->preference("opacbookbag"),
opaccredits => "" . C4::Context->preference("opaccredits"),
reviewson => C4::Context->preference("reviewson"),
suggestion => "" . C4::Context->preference("suggestion"),
virtualshelves => "" . C4::Context->preference("virtualshelves"),
- OPACSerialIssueDisplayCount => C4::Context->preference("OPACSerialIssueDisplayCount"),
+ OPACSerialIssueDisplayCount => C4::Context->preference("OPACSerialIssueDisplayCount"),
+ OpacAddMastheadLibraryPulldown => C4::Context->preference("OpacAddMastheadLibraryPulldown"),
+ OPACXSLTDetailsDisplay => C4::Context->preference("OPACXSLTDetailsDisplay"),
+ OPACXSLTResultsDisplay => C4::Context->preference("OPACXSLTResultsDisplay"),
+ SyndeticsClientCode => C4::Context->preference("SyndeticsClientCode"),
+ SyndeticsEnabled => C4::Context->preference("SyndeticsEnabled"),
+ SyndeticsCoverImages => C4::Context->preference("SyndeticsCoverImages"),
+ SyndeticsTOC => C4::Context->preference("SyndeticsTOC"),
+ SyndeticsSummary => C4::Context->preference("SyndeticsSummary"),
+ SyndeticsEditions => C4::Context->preference("SyndeticsEditions"),
+ SyndeticsExcerpt => C4::Context->preference("SyndeticsExcerpt"),
+ SyndeticsReviews => C4::Context->preference("SyndeticsReviews"),
+ SyndeticsAuthorNotes => C4::Context->preference("SyndeticsAuthorNotes"),
+ SyndeticsAwards => C4::Context->preference("SyndeticsAwards"),
+ SyndeticsSeries => C4::Context->preference("SyndeticsSeries"),
+ SyndeticsCoverImageSize => C4::Context->preference("SyndeticsCoverImageSize"),
);
}
$template->param(listloop=>[{shelfname=>"Freelist", shelfnumber=>110}]);
$sessionID = undef;
$userid = undef;
- if ($cas) {
- warn "Here we cas logout the user";
- # Add a syspref here
+ if ($cas and $caslogout) {
logout_cas($query);
}
}
my $sessionID = $session->id;
C4::Context->_new_userenv($sessionID);
$cookie = $query->cookie(CGISESSID => $sessionID);
- if ($cas && !$query->param('ticket')) {
- login_cas($query);
- }
- if ($cas || ($userid = $query->param('userid')) ) {
+ $userid = $query->param('userid');
+ if ($cas || $userid) {
my $password = $query->param('password');
my ($return, $cardnumber);
- if ($cas) {
+ if ($cas && $query->param('ticket')) {
my $retuserid;
( $return, $cardnumber, $retuserid ) = checkpw( $dbh, $userid, $password, $query );
$userid = $retuserid;
+ $info{'invalidCasLogin'} = 1 unless ($return);
} else {
( $return, $cardnumber ) = checkpw( $dbh, $userid, $password, $query );
}
if ($return) {
_session_log(sprintf "%20s from %16s logged in at %30s.\n", $userid,$ENV{'REMOTE_ADDR'},localtime);
- if ( $flags = haspermission( $dbh, $userid, $flagsrequired ) ) {
+ if ( $flags = haspermission( $userid, $flagsrequired ) ) {
$loggedin = 1;
}
else {
# get the inputs from the incoming query
my @inputs = ();
foreach my $name ( param $query) {
- (next) if ( $name eq 'userid' || $name eq 'password' );
+ (next) if ( $name eq 'userid' || $name eq 'password' || $name eq 'ticket' );
my $value = $query->param($name);
push @inputs, { name => $name, value => $value };
}
my $template_name = ( $type eq 'opac' ) ? 'opac-auth.tmpl' : 'auth.tmpl';
my $template = gettemplate( $template_name, $type, $query );
$template->param(branchloop => \@branch_loop,);
+ my $checkstyle = C4::Context->preference("opaccolorstylesheet");
+ if ($checkstyle =~ /\//)
+ {
+ $template->param( opacexternalsheet => $checkstyle);
+ } else
+ {
+ my $opaccolorstylesheet = C4::Context->preference("opaccolorstylesheet");
+ $template->param( opaccolorstylesheet => $opaccolorstylesheet);
+ }
$template->param(
login => 1,
INPUTS => \@inputs,
+ casAuthentication => C4::Context->preference("casAuthentication"),
suggestion => C4::Context->preference("suggestion"),
virtualshelves => C4::Context->preference("virtualshelves"),
LibraryName => C4::Context->preference("LibraryName"),
opacreadinghistory => C4::Context->preference("opacreadinghistory"),
opacsmallimage => C4::Context->preference("opacsmallimage"),
opaclayoutstylesheet => C4::Context->preference("opaclayoutstylesheet"),
- opaccolorstylesheet => C4::Context->preference("opaccolorstylesheet"),
opaclanguagesdisplay => C4::Context->preference("opaclanguagesdisplay"),
opacuserjs => C4::Context->preference("opacuserjs"),
opacbookbag => "" . C4::Context->preference("opacbookbag"),
);
$template->param( loginprompt => 1 ) unless $info{'nopermission'};
+ if ($cas) {
+ $template->param(
+ casServerUrl => login_cas_url(),
+ invalidCasLogin => $info{'invalidCasLogin'}
+ );
+ }
+
my $self_url = $query->url( -absolute => 1 );
$template->param(
url => $self_url,
return ("failed", undef, undef);
}
my ($return, $cardnumber);
- if ($cas) {
+ if ($cas && $query->param('ticket')) {
my $retuserid;
( $return, $cardnumber, $retuserid ) = checkpw( $dbh, $userid, $password, $query );
$userid = $retuserid;
} else {
( $return, $cardnumber ) = checkpw( $dbh, $userid, $password, $query );
}
- if ($return and haspermission( $dbh, $userid, $flagsrequired)) {
+ if ($return and haspermission( $userid, $flagsrequired)) {
my $session = get_session("");
return ("failed", undef, undef) unless $session;
($retval) and return ($retval,$retcard);
}
- if ($cas) {
+ if ($cas && $query->param('ticket')) {
$debug and print STDERR "## checkpw - checking CAS\n";
# In case of a CAS authentication, we use the ticket instead of the password
my $ticket = $query->param('ticket');
- warn ("ticket : $ticket");
my ($retval,$retcard,$retuserid) = checkpw_cas($dbh, $ticket, $query); # EXTERNAL AUTH
- warn "retval : $retval $retcard";
($retval) and return ($retval,$retcard,$retuserid);
+ return 0;
}
# INTERNAL AUTH
projects / srvgit / blobdiff