Merge branch 'master' of /usr/local/git/koha_base.git/
[koha.git] / C4 / Auth.pm
index 86fec56..14ae8da 100644 (file)
@@ -22,19 +22,25 @@ package C4::Auth;
 
 use strict;
 use Digest::MD5 qw(md5_base64);
+use CGI::Session;
+
 
 require Exporter;
 use C4::Context;
-use C4::Output;              # to get the template
-use C4::Interface::CGI::Output;
-use C4::Circulation::Circ2;  # getpatroninformation
+use C4::Output;    # to get the template
+use C4::Members;
+use C4::Koha;
+use C4::Branch; # GetBranches
+
 # use Net::LDAP;
 # use Net::LDAP qw(:all);
 
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = 0.01;
+$VERSION = do { my @v = '$Revision$' =~ /\d+/g;
+    shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v );
+};
 
 =head1 NAME
 
@@ -48,15 +54,18 @@ C4::Auth - Authenticates Koha users
   my $query = new CGI;
 
   my ($template, $borrowernumber, $cookie) 
-    = get_template_and_user({template_name   => "opac-main.tmpl",
-                             query           => $query,
-                            type            => "opac",
-                            authnotrequired => 1,
-                            flagsrequired   => {borrow => 1},
-                         });
+    = get_template_and_user(
+        {
+            template_name   => "opac-main.tmpl",
+            query           => $query,
+           type            => "opac",
+           authnotrequired => 1,
+           flagsrequired   => {borrow => 1},
+       }
+    );
 
   print $query->header(
-    -type => guesstype($template->output),
+    -type => 'utf-8',
     -cookie => $cookie
   ), $template->output;
 
@@ -74,23 +83,24 @@ C4::Auth - Authenticates Koha users
 
 =cut
 
-
-
-@ISA = qw(Exporter);
+@ISA    = qw(Exporter);
 @EXPORT = qw(
-            &checkauth
-            &get_template_and_user
+  &checkauth
+  &get_template_and_user
 );
 
 =item get_template_and_user
 
   my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name   => "opac-main.tmpl",
-                             query           => $query,
-                            type            => "opac",
-                            authnotrequired => 1,
-                            flagsrequired   => {borrow => 1},
-                         });
+    = get_template_and_user(
+        {
+           template_name   => "opac-main.tmpl",
+           query           => $query,
+          type            => "opac",
+          authnotrequired => 1,
+          flagsrequired   => {borrow => 1},
+       }
+    );
 
     This call passes the C<query>, C<flagsrequired> and C<authnotrequired>
     to C<&checkauth> (in this module) to perform authentification.
@@ -108,94 +118,174 @@ C4::Auth - Authenticates Koha users
 
 =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 => \@bordat,
-               );
-               
-               # 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->{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); }
+    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'}
+    ) unless ($in->{'template_name'}=~/maintenance/);
+
+    my $borrowernumber;
+    my $insecure = C4::Context->preference('insecure');
+    if ($user or $insecure) {
+        $template->param( loggedinusername => $user );
+        $template->param( sessionID        => $sessionID );
+
+        $borrowernumber = getborrowernumber($user);
+        my ( $borr, $alternativeflags ) =
+          GetMemberDetails( $borrowernumber );
+        my @bordat;
+        $bordat[0] = $borr;
+        $template->param( "USER_INFO" => \@bordat );
+
+        # 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) or $insecure==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_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 );        
+            $template->param( CAN_user_editauthorities  => 1 );
+            $template->param( CAN_user_serials          => 1 );
+            $template->param( CAN_user_reports          => 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 );
+        }
+
+        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->{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->{tools} == 1 ) {
+            $template->param( CAN_user_tools => 1 );
+        }
+       
+        if ( $flags && $flags->{editauthorities} == 1 ) {
+            $template->param( CAN_user_editauthorities => 1 );
+        }
                
-               if ($flags->{circulate} == 1) {
-                       $template->param(CAN_user_circulate => 1); }
-
-               if ($flags->{catalogue} == 1) {
-                       $template->param(CAN_user_catalogue => 1); }
-               \r
-               if ($flags->{parameters} == 1) {
-                       $template->param(CAN_user_parameters => 1);     
-                       $template->param(CAN_user_management => 1);
-                       $template->param(CAN_user_tools => 1); }
-               \r
-               if ($flags->{borrowers} == 1) {
-                       $template->param(CAN_user_borrowers => 1); }
-               \r
-               if ($flags->{permissions} == 1) {
-                       $template->param(CAN_user_permission => 1); }
-               
-               if ($flags->{reserveforothers} == 1) {
-                       $template->param(CAN_user_reserveforothers => 1); }
-               \r
-               if ($flags->{borrow} == 1) {
-                       $template->param(CAN_user_borrow => 1); }
-               \r
-               if ($flags->{reserveforself} == 1) {
-                       $template->param(CAN_user_reserveforself => 1); }
-               \r
-               if ($flags->{editcatalogue} == 1) {
-                       $template->param(CAN_user_editcatalogue => 1); }
-               \r
-               if ($flags->{updatecharges} == 1) {
-                       $template->param(CAN_user_updatecharge => 1); }
-               
-               if ($flags->{acquisition} == 1) {
-                       $template->param(CAN_user_acquisition => 1); }
-               
-               if ($flags->{management} == 1) {
-                       $template->param(CAN_user_management => 1);
-                       $template->param(CAN_user_tools => 1); }
-               
-               if ($flags->{tools} == 1) {
-                       $template->param(CAN_user_tools => 1); }
-               
-       }
+        if ( $flags && $flags->{serials} == 1 ) {
+            $template->param( CAN_user_serials => 1 );
+        }
+
+        if ( $flags && $flags->{reports} == 1 ) {
+            $template->param( CAN_user_reports => 1 );
+        }
+    }
+    if ( $in->{'type'} eq "intranet" ) {
+        $template->param(
+            intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+            intranetstylesheet      => C4::Context->preference("intranetstylesheet"),
+            IntranetNav             => C4::Context->preference("IntranetNav"),
+            intranetuserjs          => C4::Context->preference("intranetuserjs"),
+            TemplateEncoding        => C4::Context->preference("TemplateEncoding"),
+            AmazonContent           => C4::Context->preference("AmazonContent"),
+            LibraryName             => C4::Context->preference("LibraryName"),
+            LoginBranchcode         => (C4::Context->userenv?C4::Context->userenv->{"branch"}:"insecure"),
+            LoginBranchname         => (C4::Context->userenv?C4::Context->userenv->{"branchname"}:"insecure"),
+            LoginBranchnameShort    => substr((C4::Context->userenv?C4::Context->userenv->{"branchname"}:"insecure"),0,10),
+            AutoLocation            => C4::Context->preference("AutoLocation"),
+            hide_marc               => C4::Context->preference("hide_marc"),
+            patronimages            => C4::Context->preference("patronimages"),
+            "BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1,
+            advancedMARCEditor      => C4::Context->preference("advancedMARCEditor"),
+            suggestion              => C4::Context->preference("suggestion"),
+            virtualshelves          => C4::Context->preference("virtualshelves"),
+            LibraryName             => C4::Context->preference("LibraryName"),
+            KohaAdminEmailAddress   => "" . C4::Context->preference("KohaAdminEmailAddress"),
+        );
+    }
+    else {
+        warn "template type should be OPAC, here it is=[" . $in->{'type'} . "]"
+          unless ( $in->{'type'} eq 'opac' );
+        my $LibraryNameTitle = C4::Context->preference("LibraryName");
+        $LibraryNameTitle =~ s/<(?:\/?)(?:br|p)\s*(?:\/?)>/ /sgi;
+        $LibraryNameTitle =~ s/<(?:[^<>'"]|'(?:[^']*)'|"(?:[^"]*)")*>//sg;
        $template->param(
-                            LibraryName => C4::Context->preference("LibraryName"),
-               );
-       return ($template, $borrowernumber, $cookie);
+            KohaAdminEmailAddress  => "" . C4::Context->preference("KohaAdminEmailAddress"),
+            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"),
+            opaclargeimage         => "" . C4::Context->preference("opaclargeimage"),
+            opaclayoutstylesheet   => "". C4::Context->preference("opaclayoutstylesheet"),
+            opaccolorstylesheet    => "". C4::Context->preference("opaccolorstylesheet"),
+            opaclanguagesdisplay   => "". C4::Context->preference("opaclanguagesdisplay"),
+            opacuserlogin          => "" . C4::Context->preference("opacuserlogin"),
+            opacbookbag            => "" . C4::Context->preference("opacbookbag"),
+            TemplateEncoding       => "". C4::Context->preference("TemplateEncoding"),
+            AmazonContent          => "" . C4::Context->preference("AmazonContent"),
+            LibraryName            => "" . C4::Context->preference("LibraryName"),
+            LibraryNameTitle       => "" . $LibraryNameTitle,
+            LoginBranchcode        => (C4::Context->userenv?C4::Context->userenv->{"branch"}:"insecure"),
+            LoginBranchname        => C4::Context->userenv?C4::Context->userenv->{"branchname"}:"", 
+            OpacPasswordChange     => C4::Context->preference("OpacPasswordChange"),
+            opacreadinghistory     => C4::Context->preference("opacreadinghistory"),
+            opacuserjs             => C4::Context->preference("opacuserjs"),
+            OpacCloud              => C4::Context->preference("OpacCloud"),
+            OpacTopissue           => C4::Context->preference("OpacTopissue"),
+            OpacAuthorities        => C4::Context->preference("OpacAuthorities"),
+            OpacBrowser            => C4::Context->preference("OpacBrowser"),
+            RequestOnOpac          => C4::Context->preference("RequestOnOpac"),
+            reviewson              => C4::Context->preference("reviewson"),
+            hide_marc              => C4::Context->preference("hide_marc"),
+            patronimages           => C4::Context->preference("patronimages"),
+            "BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1,
+        );
+    }
+    return ( $template, $borrowernumber, $cookie );
 }
 
-
 =item checkauth
 
   ($userid, $cookie, $sessionID) = &checkauth($query, $noauth, $flagsrequired, $type);
@@ -254,227 +344,428 @@ has authenticated.
 
 =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";
-       }
+    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;
+    # check that database and koha version are the same
+    unless (C4::Context->preference('Version')){
+      if ($type ne 'opac'){
+        warn "Install required, redirecting to Installer";
+        print $query->redirect("/cgi-bin/koha/installer/install.pl");
+      } else {
+        warn "OPAC Install required, redirecting to maintenance";
+        print $query->redirect("/cgi-bin/koha/maintenance.pl");
+      }       
+      exit;
+    }
+    if (C4::Context->preference('Version') < C4::Context->config("kohaversion")){
+      if ($type ne 'opac'){
+      warn "Database update needed, redirecting to Installer. Database is ".C4::Context->preference('Version')." and Koha is : ".C4::Context->config("kohaversion");
+        print $query->redirect("/cgi-bin/koha/installer/install.pl?step=3");
+      } else {
+      warn "OPAC :Database update needed, redirecting to maintenance. Database is ".C4::Context->preference('Version')." and Koha is : ".C4::Context->config("kohaversion");
+        print $query->redirect("/cgi-bin/koha/maintenance.pl");
+      }       
+      exit;
+    }
+    my $timeout = C4::Context->preference('timeout');
+    $timeout = 600 unless $timeout;
 
-       # state variables
-       my $loggedin = 0;
-       my %info;
-       my ($userid, $cookie, $sessionID, $flags);
-       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')) {
-               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);
-               $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);
-                       $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);
-                       $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');
-               my $password=$query->param('password');
-               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;
-               }
-               } else {
-               if ($userid) {
-                       $info{'invalid_username_or_password'} = 1;
-               }
-               }
-       }
-       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 => '');
-               }
-               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_name;
+    if ( $type eq 'opac' ) {
+        $template_name = "opac-auth.tmpl";
+    }
+    else {
+        $template_name = "auth.tmpl";
+    }
 
-       my $template = gettemplate($template_name, $type,$query);
-       $template->param(INPUTS => \@inputs);
-       $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 => 'sessionID',
-                                       -value => $sessionID,
-                                       -expires => '');
-       print $query->header(
-               -type => guesstype($template->output),
-               -cookie => $cookie
-               ), $template->output;
-       exit;
-}
+    # 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    => 'CGISESSID',
+            -value   => '',
+            -expires => ''
+        );
+        $loggedin = 1;
+    }
+    elsif ( $sessionID = $query->cookie("CGISESSID")) {
+               my $session = new CGI::Session("driver:MySQL", $sessionID, {Handle=>$dbh});
+           
+        C4::Context->_new_userenv($sessionID);
+               if ($session){
+                       C4::Context::set_userenv(
+                $session->param('number'),       $session->param('id'),
+                $session->param('cardnumber'),   $session->param('firstname'),
+                $session->param('surname'),      $session->param('branch'),
+                $session->param('branchname'),   $session->param('flags'),
+                $session->param('emailaddress'), $session->param('branchprinter')
+            );
+        }
+        my $ip=$session->param('ip');
+        $userid = $session->param('id');
+               my $lasttime = $session->param('lasttime');
+        if ($logout) {
+
+            # voluntary logout the user
+                       $session->delete;
+            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) {
+                       warn "here $userid";
+            if ( $lasttime < time() - $timeout ) {
+
+                # timed logout
+                $info{'timed_out'} = 1;
+                               $session->delete();
+                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;
+                               $session->delete();
+                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(CGISESSID => $session->id
+                );
+                               $session->param('lasttime',time());
+                $flags = haspermission( $dbh, $userid, $flagsrequired );
+                if ($flags) {
+                    $loggedin = 1;
+                }
+                else {
+                    $info{'nopermission'} = 1;
+                }
+            }
+        }
+    }
+    unless ($userid) {
+               my $session = new CGI::Session("driver:MySQL", undef, {Handle=>$dbh});          
+               my $sessionID = $session->id;
+        $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) {
+            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(CGISESSID => $sessionID);
+            if ( $flags = haspermission( $dbh, $userid, $flagsrequired ) ) {
+                $loggedin = 1;
+            }
+            else {
+                $info{'nopermission'} = 1;
+                C4::Context->_unset_userenv($sessionID);
+            }
+            if ( $return == 1 ) {
+                my (
+                    $borrowernumber, $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);
+                (
+                    $borrowernumber, $firstname,  $surname,
+                    $userflags,      $branchcode, $branchname,
+                    $branchprinter,  $emailaddress
+                  )
+                  = $sth->fetchrow
+                  if ( $sth->rows );
+
+#                              warn "$cardnumber,$borrowernumber,$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);
+                    (
+                        $borrowernumber, $firstname,  $surname,
+                        $userflags,      $branchcode, $branchname,
+                        $branchprinter,  $emailaddress
+                      )
+                      = $sth->fetchrow
+                      if ( $sth->rows );
+
+#                                      warn "$cardnumber,$borrowernumber,$userid,$firstname,$surname,$userflags,$branchcode,$emailaddress";
+                    unless ( $sth->rows ) {
+                        $sth->execute($userid);
+                        (
+                            $borrowernumber, $firstname, $surname, $userflags,
+                            $branchcode, $branchname, $branchprinter, $emailaddress
+                          )
+                          = $sth->fetchrow
+                          if ( $sth->rows );
+                    }
+
+#                                      warn "$cardnumber,$borrowernumber,$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;
+                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'};
+                    }
+                }
+                               
+                               $session->param('number',$borrowernumber);
+                               $session->param('id',$userid);
+                               $session->param('cardnumber',$cardnumber);
+                               $session->param('firstname',$firstname);
+                               $session->param('surname',$surname);
+                               $session->param('branch',$branchcode);
+                               $session->param('branchname',$branchname);
+                               $session->param('flags',$userflags);
+                               $session->param('emailaddress',$emailaddress);
+                $session->param('ip',$session->remote_addr());
+                               $session->param('lasttime',time());
+            }
+            elsif ( $return == 2 ) {
+
+                #We suppose the user is the superlibrarian
+                               $session->param('number',0);
+                               $session->param('id',C4::Context->config('user'));
+                               $session->param('cardnumber',C4::Context->config('user'));
+                               $session->param('firstname',C4::Context->config('user'));
+                               $session->param('surname',C4::Context->config('user'),);
+                               $session->param('branch','NO_LIBRARY_SET');
+                               $session->param('branchname','NO_LIBRARY_SET');
+                               $session->param('flags',1);
+                               $session->param('emailaddress', C4::Context->preference('KohaAdminEmailAddress'));
+                $session->param('ip',$session->remote_addr());
+                               $session->param('lasttime',time());
+                       }
+        }
+        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( CGISESSID => ''
+            );
+        }
+               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               => \@inputs,
+        suggestion           => C4::Context->preference("suggestion"),
+        virtualshelves       => C4::Context->preference("virtualshelves"),
+        opaclargeimage       => C4::Context->preference("opaclargeimage"),
+        LibraryName          => C4::Context->preference("LibraryName"),
+        OpacNav              => C4::Context->preference("OpacNav"),
+        opaccredits          => C4::Context->preference("opaccredits"),
+        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"),
+
+        intranetcolorstylesheet =>
+          C4::Context->preference("intranetcolorstylesheet"),
+        intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+        IntranetNav        => C4::Context->preference("IntranetNav"),
+        intranetuserjs     => C4::Context->preference("intranetuserjs"),
+        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(CGISESSID => $session->id
+#   );
+    print $query->header(
+        -type   => 'utf-8',
+        -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) {
-                       return 1,$cardnumber;
-               }
-       }
-       my $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,$userid;
-               }
-       }
-       if ($userid eq C4::Context->config('user') && $password eq C4::Context->config('pass')) {
-               # Koha superuser account
-               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;
+    my ( $dbh, $userid, $password ) = @_;
+
+    # INTERNAL AUTH
+    my $sth =
+      $dbh->prepare(
+"select password,cardnumber,borrowernumber,userid,firstname,surname,branchcode,flags from borrowers where userid=?"
+      );
+    $sth->execute($userid);
+    if ( $sth->rows ) {
+        my ( $md5password, $cardnumber, $borrowernumber, $userid, $firstname,
+            $surname, $branchcode, $flags )
+          = $sth->fetchrow;
+        if ( md5_base64($password) eq $md5password ) {
+
+            C4::Context->set_userenv( "$borrowernumber", $userid, $cardnumber,
+                $firstname, $surname, $branchcode, $flags );
+            return 1, $cardnumber;
+        }
+    }
+    $sth =
+      $dbh->prepare(
+"select password,cardnumber,borrowernumber,userid, firstname,surname,branchcode,flags from borrowers where cardnumber=?"
+      );
+    $sth->execute($userid);
+    if ( $sth->rows ) {
+        my ( $md5password, $cardnumber, $borrowernumber, $userid, $firstname,
+            $surname, $branchcode, $flags )
+          = $sth->fetchrow;
+        if ( md5_base64($password) eq $md5password ) {
+
+            C4::Context->set_userenv( $borrowernumber, $userid, $cardnumber,
+                $firstname, $surname, $branchcode, $flags );
+            return 1, $userid;
+        }
+    }
+    if (   $userid && $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 && $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;
-    $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;
-       }
+
+    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;
 }
@@ -482,19 +773,19 @@ sub haspermission {
 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__