[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha/C4 Auth.pm
|
From: |
Chris Cormack |
|
Subject: |
[Koha-cvs] koha/C4 Auth.pm |
|
Date: |
Sun, 21 May 2006 05:59:47 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch:
Changes by: Chris Cormack <address@hidden> 06/05/21 05:59:47
Modified files:
C4 : Auth.pm
Log message:
Merging dev_week, and fixing formatting
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/C4/Auth.pm.diff?tr1=1.50&tr2=1.51&r1=text&r2=text
Patches:
Index: koha/C4/Auth.pm
diff -u koha/C4/Auth.pm:1.50 koha/C4/Auth.pm:1.51
--- koha/C4/Auth.pm:1.50 Fri May 19 09:52:54 2006
+++ koha/C4/Auth.pm Sun May 21 05:59:47 2006
@@ -25,10 +25,11 @@
require Exporter;
use C4::Context;
-use C4::Output; # to get the template
+use C4::Output; # to get the template
use C4::Interface::CGI::Output;
-use C4::Circulation::Circ2; # getpatroninformation
+use C4::Circulation::Circ2; # getpatroninformation
use C4::Koha;
+
# use Net::LDAP;
# use Net::LDAP qw(:all);
@@ -75,12 +76,10 @@
=cut
-
-
address@hidden = qw(Exporter);
address@hidden = qw(Exporter);
@EXPORT = qw(
- &checkauth
- &get_template_and_user
+ &checkauth
+ &get_template_and_user
);
=item get_template_and_user
@@ -109,101 +108,131 @@
=cut
-
sub get_template_and_user {
- my $in = shift;
- my $template = gettemplate($in->{'template_name'},
$in->{'type'},$in->{'query'});
- my ($user, $cookie, $sessionID, $flags)
- = checkauth($in->{'query'}, $in->{'authnotrequired'},
$in->{'flagsrequired'}, $in->{'type'});
-
- my $borrowernumber;
- if ($user) {
- $template->param(loggedinusername => $user);
- $template->param(sessionID => $sessionID);
-
- $borrowernumber = getborrowernumber($user);
- my ($borr, $alternativeflags) = getpatroninformation(undef,
$borrowernumber);
- my @bordat;
- $bordat[0] = $borr;
- $template->param(USER_INFO => address@hidden,
- );
-
- # We are going to use the $flags returned by checkauth
- # to create the template's parameters that will indicate
- # which menus the user can access.
- if ($flags && $flags->{superlibrarian} == 1)
- {
- $template->param(CAN_user_circulate => 1);
- $template->param(CAN_user_catalogue => 1);
- $template->param(CAN_user_parameters => 1);
- $template->param(CAN_user_borrowers => 1);
- $template->param(CAN_user_permission => 1);
- $template->param(CAN_user_reserveforothers => 1);
- $template->param(CAN_user_borrow => 1);
- $template->param(CAN_user_reserveforself => 1);
- $template->param(CAN_user_editcatalogue => 1);
- $template->param(CAN_user_updatecharge => 1);
- $template->param(CAN_user_acquisition => 1);
- $template->param(CAN_user_management => 1);
- $template->param(CAN_user_tools => 1); }
-
- if ($flags && $flags->{circulate} eq 1) {
- $template->param(CAN_user_circulate => 1); }
-
- if ($flags && $flags->{catalogue} eq 1) {
- $template->param(CAN_user_catalogue => 1); }
-
-
- if ($flags && $flags->{parameters} eq 1) {
- $template->param(CAN_user_parameters => 1);
- $template->param(CAN_user_management => 1);
- $template->param(CAN_user_tools => 1); }
-
-
- if ($flags && $flags->{borrowers} eq 1) {
- $template->param(CAN_user_borrowers => 1); }
-
-
- if ($flags && $flags->{permissions} eq 1) {
- $template->param(CAN_user_permission => 1); }
-
- if ($flags && $flags->{reserveforothers} eq 1) {
- $template->param(CAN_user_reserveforothers => 1); }
-
-
- if ($flags && $flags->{borrow} eq 1) {
- $template->param(CAN_user_borrow => 1); }
-
-
- if ($flags && $flags->{reserveforself} eq 1) {
- $template->param(CAN_user_reserveforself => 1); }
-
-
- if ($flags && $flags->{editcatalogue} eq 1) {
- $template->param(CAN_user_editcatalogue => 1); }
-
-
- if ($flags && $flags->{updatecharges} eq 1) {
- $template->param(CAN_user_updatecharge => 1); }
-
- if ($flags && $flags->{acquisition} eq 1) {
- $template->param(CAN_user_acquisition => 1); }
-
- if ($flags && $flags->{management} eq 1) {
- $template->param(CAN_user_management => 1);
- $template->param(CAN_user_tools => 1); }
-
- if ($flags && $flags->{tools} eq 1) {
- $template->param(CAN_user_tools => 1); }
-
- }
- $template->param(
- LibraryName =>
C4::Context->preference("LibraryName"),
- branchname => C4::Context->userenv->{'branchname'},
- );
- return ($template, $borrowernumber, $cookie);
-}
+ my $in = shift;
+ my $template =
+ gettemplate( $in->{'template_name'}, $in->{'type'}, $in->{'query'} );
+ my ( $user, $cookie, $sessionID, $flags ) = checkauth(
+ $in->{'query'},
+ $in->{'authnotrequired'},
+ $in->{'flagsrequired'},
+ $in->{'type'}
+ );
+
+ my $borrowernumber;
+ if ($user) {
+ $template->param( loggedinusername => $user );
+ $template->param( sessionID => $sessionID );
+
+ $borrowernumber = getborrowernumber($user);
+ my ( $borr, $alternativeflags ) =
+ getpatroninformation( undef, $borrowernumber );
+ my @bordat;
+ $bordat[0] = $borr;
+ $template->param( USER_INFO => address@hidden, );
+
+ # We are going to use the $flags returned by checkauth
+ # to create the template's parameters that will indicate
+ # which menus the user can access.
+ if ( $flags && $flags->{superlibrarian} == 1 ) {
+ $template->param( CAN_user_circulate => 1 );
+ $template->param( CAN_user_catalogue => 1 );
+ $template->param( CAN_user_parameters => 1 );
+ $template->param( CAN_user_borrowers => 1 );
+ $template->param( CAN_user_permission => 1 );
+ $template->param( CAN_user_reserveforothers => 1 );
+ $template->param( CAN_user_borrow => 1 );
+ $template->param( CAN_user_reserveforself => 1 );
+ $template->param( CAN_user_editcatalogue => 1 );
+ $template->param( CAN_user_updatecharge => 1 );
+ $template->param( CAN_user_acquisition => 1 );
+ $template->param( CAN_user_management => 1 );
+ $template->param( CAN_user_tools => 1 );
+ }
+
+ if ( $flags && $flags->{circulate} == 1 ) {
+ $template->param( CAN_user_circulate => 1 );
+ }
+
+ if ( $flags && $flags->{catalogue} == 1 ) {
+ $template->param( CAN_user_catalogue => 1 );
+ }
+
+ if ( $flags && $flags->{parameters} == 1 ) {
+ $template->param( CAN_user_parameters => 1 );
+ $template->param( CAN_user_management => 1 );
+ $template->param( CAN_user_tools => 1 );
+ }
+
+ if ( $flags && $flags->{borrowers} == 1 ) {
+ $template->param( CAN_user_borrowers => 1 );
+ }
+
+ if ( $flags && $flags->{permissions} == 1 ) {
+ $template->param( CAN_user_permission => 1 );
+ }
+
+ if ( $flags && $flags->{reserveforothers} == 1 ) {
+ $template->param( CAN_user_reserveforothers => 1 );
+ }
+
+ if ( $flags && $flags->{borrow} == 1 ) {
+ $template->param( CAN_user_borrow => 1 );
+ }
+
+ if ( $flags && $flags->{reserveforself} == 1 ) {
+ $template->param( CAN_user_reserveforself => 1 );
+ }
+
+ if ( $flags && $flags->{editcatalogue} == 1 ) {
+ $template->param( CAN_user_editcatalogue => 1 );
+ }
+
+ if ( $flags && $flags->{updatecharges} == 1 ) {
+ $template->param( CAN_user_updatecharge => 1 );
+ }
+
+ if ( $flags && $flags->{acquisition} == 1 ) {
+ $template->param( CAN_user_acquisition => 1 );
+ }
+
+ if ( $flags && $flags->{management} == 1 ) {
+ $template->param( CAN_user_management => 1 );
+ $template->param( CAN_user_tools => 1 );
+ }
+
+ if ( $flags && $flags->{tools} == 1 ) {
+ $template->param( CAN_user_tools => 1 );
+ }
+ }
+ unless ( $in->{'type'} eq "intranet" ) {
+ $template->param(
+ suggestion => C4::Context->preference("suggestion"),
+ virtualshelves => C4::Context->preference("virtualshelves"),
+ OpacNav => C4::Context->preference("OpacNav"),
+ opacheader => C4::Context->preference("opacheader"),
+ opaccredits => C4::Context->preference("opaccredits"),
+ opacsmallimage => C4::Context->preference("opacsmallimage"),
+ opaclayoutstylesheet =>
+ C4::Context->preference("opaclayoutstylesheet"),
+ opaccolorstylesheet =>
+ C4::Context->preference("opaccolorstylesheet"),
+ opaclanguagesdisplay =>
+ C4::Context->preference("opaclanguagesdisplay"),
+ TemplateEncoding => C4::Context->preference("TemplateEncoding"),
+ opacuserlogin => C4::Context->preference("opacuserlogin"),
+ opacbookbag => C4::Context->preference("opacbookbag"),
+ );
+ }
+ $template->param(
+ TemplateEncoding => C4::Context->preference("TemplateEncoding"),
+ AmazonContent => C4::Context->preference("AmazonContent"),
+ LibraryName => C4::Context->preference("LibraryName"),
+ branchname => C4::Context->userenv->{'branchname'},
+ );
+ return ( $template, $borrowernumber, $cookie );
+}
=item checkauth
@@ -263,324 +292,411 @@
=cut
+sub checkauth {
+ my $query = shift;
+# $authnotrequired will be set for scripts which will run without
authentication
+ my $authnotrequired = shift;
+ my $flagsrequired = shift;
+ my $type = shift;
+ $type = 'opac' unless $type;
+
+ my $dbh = C4::Context->dbh;
+ my $timeout = C4::Context->preference('timeout');
+ $timeout = 600 unless $timeout;
+
+ my $template_name;
+ if ( $type eq 'opac' ) {
+ $template_name = "opac-auth.tmpl";
+ }
+ else {
+ $template_name = "auth.tmpl";
+ }
+
+ # state variables
+ my $loggedin = 0;
+ my %info;
+ my ( $userid, $cookie, $sessionID, $flags, $envcookie );
+ my $logout = $query->param('logout.x');
+ if ( $userid = $ENV{'REMOTE_USER'} ) {
+
+ # Using Basic Authentication, no cookies required
+ $cookie = $query->cookie(
+ -name => 'sessionID',
+ -value => '',
+ -expires => ''
+ );
+ $loggedin = 1;
+ }
+ elsif ( $sessionID = $query->cookie('sessionID') ) {
+ C4::Context->_new_userenv($sessionID);
+ if ( my %hash = $query->cookie('userenv') ) {
+ C4::Context::set_userenv(
+ $hash{number}, $hash{id},
+ $hash{cardnumber}, $hash{firstname},
+ $hash{surname}, $hash{branch},
+ $hash{branchname}, $hash{flags},
+ $hash{emailaddress}, $hash{branchprinter}
+ );
+ }
+ my ( $ip, $lasttime );
+
+ ( $userid, $ip, $lasttime ) =
+ $dbh->selectrow_array(
+ "SELECT userid,ip,lasttime FROM sessions WHERE sessionid=?",
+ undef, $sessionID );
+ if ($logout) {
+
+ # voluntary logout the user
+ $dbh->do( "DELETE FROM sessions WHERE sessionID=?",
+ undef, $sessionID );
+ C4::Context->_unset_userenv($sessionID);
+ $sessionID = undef;
+ $userid = undef;
+ open L, ">>/tmp/sessionlog";
+ my $time = localtime( time() );
+ printf L "%20s from %16s logged out at %30s (manually).\n",
$userid,
+ $ip, $time;
+ close L;
+ }
+ if ($userid) {
+ if ( $lasttime < time() - $timeout ) {
+
+ # timed logout
+ $info{'timed_out'} = 1;
+ $dbh->do( "DELETE FROM sessions WHERE sessionID=?",
+ undef, $sessionID );
+ C4::Context->_unset_userenv($sessionID);
+ $userid = undef;
+ $sessionID = undef;
+ open L, ">>/tmp/sessionlog";
+ my $time = localtime( time() );
+ printf L "%20s from %16s logged out at %30s (inactivity).\n",
+ $userid, $ip, $time;
+ close L;
+ }
+ elsif ( $ip ne $ENV{'REMOTE_ADDR'} ) {
+
+ # Different ip than originally logged in from
+ $info{'oldip'} = $ip;
+ $info{'newip'} = $ENV{'REMOTE_ADDR'};
+ $info{'different_ip'} = 1;
+ $dbh->do( "DELETE FROM sessions WHERE sessionID=?",
+ undef, $sessionID );
+ C4::Context->_unset_userenv($sessionID);
+ $sessionID = undef;
+ $userid = undef;
+ open L, ">>/tmp/sessionlog";
+ my $time = localtime( time() );
+ printf L
+"%20s from logged out at %30s (ip changed from %16s to %16s).\n",
+ $userid, $time, $ip, $info{'newip'};
+ close L;
+ }
+ else {
+ $cookie = $query->cookie(
+ -name => 'sessionID',
+ -value => $sessionID,
+ -expires => ''
+ );
+ $dbh->do( "UPDATE sessions SET lasttime=? WHERE sessionID=?",
+ undef, ( time(), $sessionID ) );
+ $flags = haspermission( $dbh, $userid, $flagsrequired );
+ if ($flags) {
+ $loggedin = 1;
+ }
+ else {
+ $info{'nopermission'} = 1;
+ }
+ }
+ }
+ }
+ unless ($userid) {
+ $sessionID = int( rand() * 100000 ) . '-' . time();
+ $userid = $query->param('userid');
+ C4::Context->_new_userenv($sessionID);
+ my $password = $query->param('password');
+ C4::Context->_new_userenv($sessionID);
+ my ( $return, $cardnumber ) = checkpw( $dbh, $userid, $password );
+ if ($return) {
+ $dbh->do( "DELETE FROM sessions WHERE sessionID=? AND userid=?",
+ undef, ( $sessionID, $userid ) );
+ $dbh->do(
+"INSERT INTO sessions (sessionID, userid, ip,lasttime) VALUES (?, ?, ?, ?)",
+ undef,
+ ( $sessionID, $userid, $ENV{'REMOTE_ADDR'}, time() )
+ );
+ open L, ">>/tmp/sessionlog";
+ my $time = localtime( time() );
+ printf L "%20s from %16s logged in at %30s.\n", $userid,
+ $ENV{'REMOTE_ADDR'}, $time;
+ close L;
+ $cookie = $query->cookie(
+ -name => 'sessionID',
+ -value => $sessionID,
+ -expires => ''
+ );
+ if ( $flags = haspermission( $dbh, $userid, $flagsrequired ) ) {
+ $loggedin = 1;
+ }
+ else {
+ $info{'nopermission'} = 1;
+ C4::Context->_unset_userenv($sessionID);
+ }
+ if ( $return == 1 ) {
+ my ( $bornum, $firstname, $surname, $userflags, $branchcode,
+ $branchname, $branchprinter, $emailaddress );
+ my $sth =
+ $dbh->prepare(
+"select borrowernumber, firstname, surname, flags, borrowers.branchcode,
branches.branchname as branchname,branches.branchprinter as branchprinter,
email from borrowers left join branches on
borrowers.branchcode=branches.branchcode where userid=?"
+ );
+ $sth->execute($userid);
+ (
+ $bornum, $firstname, $surname, $userflags, $branchcode,
+ $branchname, $branchprinter, $emailaddress
+ )
+ = $sth->fetchrow
+ if ( $sth->rows );
-sub checkauth {
- my $query=shift;
- # $authnotrequired will be set for scripts which will run without
authentication
- my $authnotrequired = shift;
- my $flagsrequired = shift;
- my $type = shift;
- $type = 'opac' unless $type;
-
- my $dbh = C4::Context->dbh;
- my $timeout = C4::Context->preference('timeout');
- $timeout = 600 unless $timeout;
-
- my $template_name;
- if ($type eq 'opac') {
- $template_name = "opac-auth.tmpl";
- } else {
- $template_name = "auth.tmpl";
- }
-
- # state variables
- my $loggedin = 0;
- my %info;
- my ($userid, $cookie, $sessionID, $flags,$envcookie);
- my $logout = $query->param('logout.x');
- if ($userid = $ENV{'REMOTE_USER'}) {
- # Using Basic Authentication, no cookies required
- $cookie=$query->cookie(-name => 'sessionID',
- -value => '',
- -expires => '');
- $loggedin = 1;
- } elsif ($sessionID=$query->cookie('sessionID')) {
- C4::Context->_new_userenv($sessionID);
- if (my %hash=$query->cookie('userenv')){
- C4::Context::set_userenv(
- $hash{number},
- $hash{id},
- $hash{cardnumber},
- $hash{firstname},
- $hash{surname},
- $hash{branch},
- $hash{branchname},
- $hash{flags},
- $hash{emailaddress},
- $hash{branchprinter}
- );
- }
- my ($ip , $lasttime);
-
- ($userid, $ip, $lasttime) = $dbh->selectrow_array(
- "SELECT userid,ip,lasttime FROM sessions WHERE
sessionid=?",
- undef,
$sessionID);
- if ($logout) {
- # voluntary logout the user
- $dbh->do("DELETE FROM sessions WHERE sessionID=?", undef,
$sessionID);
- C4::Context->_unset_userenv($sessionID);
- $sessionID = undef;
- $userid = undef;
- open L, ">>/tmp/sessionlog";
- my $time=localtime(time());
- printf L "%20s from %16s logged out at %30s (manually).\n",
$userid, $ip, $time;
- close L;
- }
- if ($userid) {
- if ($lasttime<time()-$timeout) {
- # timed logout
- $info{'timed_out'} = 1;
- $dbh->do("DELETE FROM sessions WHERE
sessionID=?", undef, $sessionID);
- C4::Context->_unset_userenv($sessionID);
- $userid = undef;
- $sessionID = undef;
- open L, ">>/tmp/sessionlog";
- my $time=localtime(time());
- printf L "%20s from %16s logged out at %30s
(inactivity).\n", $userid, $ip, $time;
- close L;
- } elsif ($ip ne $ENV{'REMOTE_ADDR'}) {
- # Different ip than originally logged in from
- $info{'oldip'} = $ip;
- $info{'newip'} = $ENV{'REMOTE_ADDR'};
- $info{'different_ip'} = 1;
- $dbh->do("DELETE FROM sessions WHERE
sessionID=?", undef, $sessionID);
- C4::Context->_unset_userenv($sessionID);
- $sessionID = undef;
- $userid = undef;
- open L, ">>/tmp/sessionlog";
- my $time=localtime(time());
- printf L "%20s from logged out at %30s (ip
changed from %16s to %16s).\n", $userid, $time, $ip, $info{'newip'};
- close L;
- } else {
- $cookie=$query->cookie(-name => 'sessionID',
- -value => $sessionID,
- -expires => '');
- $dbh->do("UPDATE sessions SET lasttime=? WHERE
sessionID=?",
- undef, (time(), $sessionID));
- $flags = haspermission($dbh, $userid,
$flagsrequired);
- if ($flags) {
- $loggedin = 1;
- } else {
- $info{'nopermission'} = 1;
- }
- }
- }
- }
- unless ($userid) {
- $sessionID=int(rand()*100000).'-'.time();
- $userid=$query->param('userid');
- C4::Context->_new_userenv($sessionID);
- my $password=$query->param('password');
- C4::Context->_new_userenv($sessionID);
- my ($return, $cardnumber) = checkpw($dbh,$userid,$password);
- if ($return) {
- $dbh->do("DELETE FROM sessions WHERE sessionID=? AND
userid=?",
- undef, ($sessionID, $userid));
- $dbh->do("INSERT INTO sessions (sessionID, userid,
ip,lasttime) VALUES (?, ?, ?, ?)",
- undef, ($sessionID, $userid,
$ENV{'REMOTE_ADDR'}, time()));
- open L, ">>/tmp/sessionlog";
- my $time=localtime(time());
- printf L "%20s from %16s logged in at %30s.\n",
$userid, $ENV{'REMOTE_ADDR'}, $time;
- close L;
- $cookie=$query->cookie(-name => 'sessionID',
- -value => $sessionID,
- -expires => '');
- if ($flags = haspermission($dbh, $userid,
$flagsrequired)) {
- $loggedin = 1;
- } else {
- $info{'nopermission'} = 1;
- C4::Context->_unset_userenv($sessionID);
- }
- if ($return == 1){
- my
($bornum,$firstname,$surname,$userflags,$branchcode,$branchname,$branchprinter,$emailaddress);
- my $sth=$dbh->prepare("select borrowernumber,
firstname, surname, flags, borrowers.branchcode, branches.branchname as
branchname,branches.branchprinter as branchprinter, email from borrowers left
join branches on borrowers.branchcode=branches.branchcode where userid=?");
- $sth->execute($userid);
-
($bornum,$firstname,$surname,$userflags,$branchcode,$branchname,$branchprinter,$emailaddress)
= $sth->fetchrow if ($sth->rows);
# warn
"$cardnumber,$bornum,$userid,$firstname,$surname,$userflags,$branchcode,$emailaddress";
- unless ($sth->rows){
- my $sth=$dbh->prepare("select
borrowernumber, firstname, surname, flags, borrowers.branchcode,
branches.branchname as branchname, branches.branchprinter as branchprinter,
email from borrowers left join branches on
borrowers.branchcode=branches.branchcode where cardnumber=?");
- $sth->execute($cardnumber);
-
($bornum,$firstname,$surname,$userflags,$branchcode,$branchcode,$branchprinter,
$emailaddress) = $sth->fetchrow if ($sth->rows);
+ unless ( $sth->rows ) {
+ my $sth =
+ $dbh->prepare(
+"select borrowernumber, firstname, surname, flags, borrowers.branchcode,
branches.branchname as branchname, branches.branchprinter as branchprinter,
email from borrowers left join branches on
borrowers.branchcode=branches.branchcode where cardnumber=?"
+ );
+ $sth->execute($cardnumber);
+ (
+ $bornum, $firstname, $surname, $userflags, $branchcode,
+ $branchcode, $branchprinter, $emailaddress
+ )
+ = $sth->fetchrow
+ if ( $sth->rows );
+
# warn
"$cardnumber,$bornum,$userid,$firstname,$surname,$userflags,$branchcode,$emailaddress";
- unless ($sth->rows){
- $sth->execute($userid);
-
($bornum,$firstname,$surname,$userflags,$branchcode,$branchprinter,$emailaddress)
= $sth->fetchrow if ($sth->rows);
- }
+ unless ( $sth->rows ) {
+ $sth->execute($userid);
+ (
+ $bornum, $firstname, $surname, $userflags,
+ $branchcode, $branchprinter, $emailaddress
+ )
+ = $sth->fetchrow
+ if ( $sth->rows );
+ }
+
# warn
"$cardnumber,$bornum,$userid,$firstname,$surname,$userflags,$branchcode,$emailaddress";
- }
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# # # # # # # #
+ }
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# # # # # # # #
# new op dev :
# launch a sequence to check if we have a ip for the branch, if we have one we
replace the branchcode of the userenv by the branch bound in the ip.
- my $ip = $ENV{'REMOTE_ADDR'};
- my $branches = getbranches();
- my @branchesloop;
- my $branchprinter;
- foreach my $br (keys %$branches) {
-# now we work with the treatment of ip
- my $domain=$branches->{$br}->{branchip};
- if ($domain && $ip =~ /^$domain/){
- $branchcode = $branches->{$br}->{'branchcode'};
-# new op dev : add the branchprinter and branchname in
the cookie
- $branchprinter = $branches->{$br}->{'branchprinter'};
- $branchname = $branches->{$br}->{'branchname'};
- }
- }
-
- my $hash = C4::Context::set_userenv(
- $bornum,
- $userid,
- $cardnumber,
- $firstname,
- $surname,
- $branchcode,
- $branchname,
- $userflags,
- $emailaddress,
- $branchprinter,
- );
-
- $envcookie=$query->cookie(-name => 'userenv',
- -value => $hash,
- -expires => '');
- } elsif ($return == 2) {
- #We suppose the user is the superlibrarian
- my $hash = C4::Context::set_userenv(
- 0,0,
- C4::Context->config('user'),
- C4::Context->config('user'),
- C4::Context->config('user'),
-
"",1,C4::Context->preference('KohaAdminEmailAddress')
- );
- $envcookie=$query->cookie(-name => 'userenv',
- -value => $hash,
- -expires => '');
- }
- } else {
- if ($userid) {
- $info{'invalid_username_or_password'} = 1;
- C4::Context->_unset_userenv($sessionID);
- }
- }
- }
- my $insecure = C4::Context->boolean_preference('insecure');
- # finished authentification, now respond
- if ($loggedin || $authnotrequired || (defined($insecure) && $insecure))
{
- # successful login
- unless ($cookie) {
- $cookie=$query->cookie(-name => 'sessionID',
- -value => '',
- -expires => '');
- }
- if ($envcookie){
- return ($userid, [$cookie,$envcookie], $sessionID,
$flags)
- } else {
- return ($userid, $cookie, $sessionID, $flags);
- }
- }
- # else we have a problem...
- # get the inputs from the incoming query
- my @inputs =();
- foreach my $name (param $query) {
- (next) if ($name eq 'userid' || $name eq 'password');
- my $value = $query->param($name);
- push @inputs, {name => $name , value => $value};
- }
-
- my $template = gettemplate($template_name, $type,$query);
- $template->param(INPUTS => address@hidden);
- $template->param(loginprompt => 1) unless $info{'nopermission'};
-
- my $self_url = $query->url(-absolute => 1);
- $template->param(url => $self_url, LibraryName=> =>
C4::Context->preference("LibraryName"),);
- $template->param(\%info);
- $cookie=$query->cookie(-name => 'sessionID',
- -value => $sessionID,
- -expires => '');
- print $query->header(
- -type => guesstype($template->output),
- -cookie => $cookie
- ), $template->output;
- exit;
-}
+ my $ip = $ENV{'REMOTE_ADDR'};
+ my $branches = getbranches();
+ my @branchesloop;
+ my $branchprinter;
+ foreach my $br ( keys %$branches ) {
+
+ # now we work with the treatment of ip
+ my $domain = $branches->{$br}->{branchip};
+ if ( $domain && $ip =~ /^$domain/ ) {
+ $branchcode = $branches->{$br}->{'branchcode'};
+
+ # new op dev : add the branchprinter and
branchname in the cookie
+ $branchprinter = $branches->{$br}->{'branchprinter'};
+ $branchname = $branches->{$br}->{'branchname'};
+ }
+ }
+
+ my $hash = C4::Context::set_userenv(
+ $bornum, $userid, $cardnumber,
+ $firstname, $surname, $branchcode,
+ $branchname, $userflags, $emailaddress,
+ $branchprinter,
+ );
+
+ $envcookie = $query->cookie(
+ -name => 'userenv',
+ -value => $hash,
+ -expires => ''
+ );
+ }
+ elsif ( $return == 2 ) {
+
+ #We suppose the user is the superlibrarian
+ my $hash = C4::Context::set_userenv(
+ 0,
+ 0,
+ C4::Context->config('user'),
+ C4::Context->config('user'),
+ C4::Context->config('user'),
+ "",
+ 1,
+ C4::Context->preference('KohaAdminEmailAddress')
+ );
+ $envcookie = $query->cookie(
+ -name => 'userenv',
+ -value => $hash,
+ -expires => ''
+ );
+ }
+ }
+ else {
+ if ($userid) {
+ $info{'invalid_username_or_password'} = 1;
+ C4::Context->_unset_userenv($sessionID);
+ }
+ }
+ }
+ my $insecure = C4::Context->boolean_preference('insecure');
+ # finished authentification, now respond
+ if ( $loggedin || $authnotrequired || ( defined($insecure) && $insecure ) )
+ {
+
+ # successful login
+ unless ($cookie) {
+ $cookie = $query->cookie(
+ -name => 'sessionID',
+ -value => '',
+ -expires => ''
+ );
+ }
+ if ($envcookie) {
+ return ( $userid, [ $cookie, $envcookie ], $sessionID, $flags );
+ }
+ else {
+ return ( $userid, $cookie, $sessionID, $flags );
+ }
+ }
+ # else we have a problem...
+ # get the inputs from the incoming query
+ my @inputs = ();
+ foreach my $name ( param $query) {
+ (next) if ( $name eq 'userid' || $name eq 'password' );
+ my $value = $query->param($name);
+ push @inputs, { name => $name, value => $value };
+ }
+ my $template = gettemplate( $template_name, $type, $query );
+ $template->param(
+ INPUTS => address@hidden,
+ intranetcolorstylesheet =>
+ C4::Context->preference("intranetcolorstylesheet"),
+ intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+ IntranetNav => C4::Context->preference("IntranetNav"),
+ TemplateEncoding => C4::Context->preference("TemplateEncoding"),
+
+ );
+ $template->param( loginprompt => 1 ) unless $info{'nopermission'};
+
+ my $self_url = $query->url( -absolute => 1 );
+ $template->param(
+ url => $self_url,
+ LibraryName => => C4::Context->preference("LibraryName"),
+ );
+ $template->param( \%info );
+ $cookie = $query->cookie(
+ -name => 'sessionID',
+ -value => $sessionID,
+ -expires => ''
+ );
+ print $query->header(
+ -type => guesstype( $template->output ),
+ -cookie => $cookie
+ ),
+ $template->output;
+ exit;
+}
sub checkpw {
- my ($dbh, $userid, $password) = @_;
-# INTERNAL AUTH
- my $sth=$dbh->prepare("select password,cardnumber from borrowers where
userid=?");
- $sth->execute($userid);
- if ($sth->rows) {
- my ($md5password,$cardnumber) = $sth->fetchrow;
- if (md5_base64($password) eq $md5password) {
+ my ( $dbh, $userid, $password ) = @_;
+
+ # INTERNAL AUTH
+ my $sth =
+ $dbh->prepare("select password,cardnumber from borrowers where
userid=?");
+ $sth->execute($userid);
+ if ( $sth->rows ) {
+ my ( $md5password, $cardnumber ) = $sth->fetchrow;
+ if ( md5_base64($password) eq $md5password ) {
+
#
C4::Context->set_userenv("$bornum",$userid,$cardnumber,$firstname,$surname,$branchcode,$userflags);
- return 1,$cardnumber;
- }
- }
- $sth=$dbh->prepare("select password from borrowers where cardnumber=?");
- $sth->execute($userid);
- if ($sth->rows) {
- my ($md5password) = $sth->fetchrow;
- if (md5_base64($password) eq $md5password) {
+ return 1, $cardnumber;
+ }
+ }
+ $sth = $dbh->prepare("select password from borrowers where cardnumber=?");
+ $sth->execute($userid);
+ if ( $sth->rows ) {
+ my ($md5password) = $sth->fetchrow;
+ if ( md5_base64($password) eq $md5password ) {
+
#
C4::Context->set_userenv($bornum,$userid,$cardnumber,$firstname,$surname,$branchcode,$userflags);
- return 1,$userid;
- }
- }
- if ($userid eq C4::Context->config('user') && $password eq
C4::Context->config('pass')) {
- # Koha superuser account
+ return 1, $userid;
+ }
+ }
+ if ( $userid eq C4::Context->config('user')
+ && $password eq C4::Context->config('pass') )
+ {
+
+# Koha superuser account
#
C4::Context->set_userenv(0,0,C4::Context->config('user'),C4::Context->config('user'),C4::Context->config('user'),"",1);
- return 2;
- }
- if ($userid eq 'demo' && $password eq 'demo' &&
C4::Context->config('demo')) {
- # DEMO => the demo user is allowed to do everything (if demo
set to 1 in koha.conf
- # some features won't be effective : modify systempref, modify
MARC structure,
- return 2;
- }
- return 0;
+ return 2;
+ }
+ if ( $userid eq 'demo'
+ && $password eq 'demo'
+ && C4::Context->config('demo') )
+ {
+
+# DEMO => the demo user is allowed to do everything (if demo set to 1 in
koha.conf
+# some features won't be effective : modify systempref, modify MARC structure,
+ return 2;
+ }
+ return 0;
}
sub getuserflags {
- my $cardnumber=shift;
- my $dbh=shift;
+ my $cardnumber = shift;
+ my $dbh = shift;
my $userflags;
- my $sth=$dbh->prepare("SELECT flags FROM borrowers WHERE cardnumber=?");
+ my $sth = $dbh->prepare("SELECT flags FROM borrowers WHERE cardnumber=?");
$sth->execute($cardnumber);
my ($flags) = $sth->fetchrow;
- $flags=0 unless $flags;
- $sth=$dbh->prepare("SELECT bit, flag, defaulton FROM userflags");
+ $flags = 0 unless $flags;
+ $sth = $dbh->prepare("SELECT bit, flag, defaulton FROM userflags");
$sth->execute;
- while (my ($bit, $flag, $defaulton) = $sth->fetchrow) {
- if (($flags & (2**$bit)) || $defaulton) {
- $userflags->{$flag}=1;
- } else {
- $userflags->{$flag}=0;
- }
+
+ while ( my ( $bit, $flag, $defaulton ) = $sth->fetchrow ) {
+ if ( ( $flags & ( 2**$bit ) ) || $defaulton ) {
+ $userflags->{$flag} = 1;
+ }
+ else {
+ $userflags->{$flag} = 0;
+ }
}
return $userflags;
}
sub haspermission {
- my ($dbh, $userid, $flagsrequired) = @_;
- my $sth=$dbh->prepare("SELECT cardnumber FROM borrowers WHERE userid=?");
+ my ( $dbh, $userid, $flagsrequired ) = @_;
+ my $sth = $dbh->prepare("SELECT cardnumber FROM borrowers WHERE userid=?");
$sth->execute($userid);
my ($cardnumber) = $sth->fetchrow;
- ($cardnumber) || ($cardnumber=$userid);
- my $flags=getuserflags($cardnumber,$dbh);
+ ($cardnumber) || ( $cardnumber = $userid );
+ my $flags = getuserflags( $cardnumber, $dbh );
my $configfile;
- if ($userid eq C4::Context->config('user')) {
- # Super User Account from /etc/koha.conf
- $flags->{'superlibrarian'}=1;
- }
- if ($userid eq 'demo' && C4::Context->config('demo')) {
- # Demo user that can do "anything" (demo=1 in /etc/koha.conf)
- $flags->{'superlibrarian'}=1;
+ if ( $userid eq C4::Context->config('user') ) {
+
+ # Super User Account from /etc/koha.conf
+ $flags->{'superlibrarian'} = 1;
+ }
+ if ( $userid eq 'demo' && C4::Context->config('demo') ) {
+
+ # Demo user that can do "anything" (demo=1 in /etc/koha.conf)
+ $flags->{'superlibrarian'} = 1;
}
return $flags if $flags->{superlibrarian};
- foreach (keys %$flagsrequired) {
- return $flags if $flags->{$_};
+ foreach ( keys %$flagsrequired ) {
+ return $flags if $flags->{$_};
}
return 0;
}
@@ -588,19 +704,19 @@
sub getborrowernumber {
my ($userid) = @_;
my $dbh = C4::Context->dbh;
- for my $field ('userid', 'cardnumber') {
- my $sth=$dbh->prepare
- ("select borrowernumber from borrowers where $field=?");
- $sth->execute($userid);
- if ($sth->rows) {
- my ($bnumber) = $sth->fetchrow;
- return $bnumber;
- }
+ for my $field ( 'userid', 'cardnumber' ) {
+ my $sth =
+ $dbh->prepare("select borrowernumber from borrowers where $field=?");
+ $sth->execute($userid);
+ if ( $sth->rows ) {
+ my ($bnumber) = $sth->fetchrow;
+ return $bnumber;
+ }
}
return 0;
}
-END { } # module clean-up code here (global destructor)
+END { } # module clean-up code here (global destructor)
1;
__END__
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha/C4 Auth.pm,
Chris Cormack <=