| 
      
            Lines 29-34
          use C4::Context;
      
      
        Link Here
      
     | 
  
        
          | 29 | 
          use C4::Templates;    # to get the template  | 
          29 | 
          use C4::Templates;    # to get the template  | 
        
        
          | 30 | 
          use C4::Languages;  | 
          30 | 
          use C4::Languages;  | 
        
        
          | 31 | 
          use C4::Branch;       # GetBranches  | 
          31 | 
          use C4::Branch;       # GetBranches  | 
        
            
               | 
               | 
              32 | 
              use C4::Desks;  | 
            
        
          | 32 | 
          use C4::Search::History;  | 
          33 | 
          use C4::Search::History;  | 
        
        
          | 33 | 
          use Koha;  | 
          34 | 
          use Koha;  | 
        
        
          | 34 | 
          use Koha::AuthUtils qw(hash_password);  | 
          35 | 
          use Koha::AuthUtils qw(hash_password);  | 
        
  
    | 
      
            Lines 406-411
          sub get_template_and_user {
      
      
        Link Here
      
     | 
  
        
          | 406 | 
                      IntranetmainUserblock                                                      => C4::Context->preference("IntranetmainUserblock"), | 
          407 | 
                      IntranetmainUserblock                                                      => C4::Context->preference("IntranetmainUserblock"), | 
        
        
          | 407 | 
                      LibraryName                                                                => C4::Context->preference("LibraryName"), | 
          408 | 
                      LibraryName                                                                => C4::Context->preference("LibraryName"), | 
        
        
          | 408 | 
                      LoginBranchname                                                            => ( C4::Context->userenv ? C4::Context->userenv->{"branchname"} : undef ), | 
          409 | 
                      LoginBranchname                                                            => ( C4::Context->userenv ? C4::Context->userenv->{"branchname"} : undef ), | 
        
            
               | 
               | 
              410 | 
                          LoginDeskname                                                              => ( C4::Context->userenv ? C4::Context->userenv->{"deskname"} : undef ), | 
            
        
          | 409 | 
                      advancedMARCEditor                                                         => C4::Context->preference("advancedMARCEditor"), | 
          411 | 
                      advancedMARCEditor                                                         => C4::Context->preference("advancedMARCEditor"), | 
        
        
          | 410 | 
                      canreservefromotherbranches                                                => C4::Context->preference('canreservefromotherbranches'), | 
          412 | 
                      canreservefromotherbranches                                                => C4::Context->preference('canreservefromotherbranches'), | 
        
        
          | 411 | 
                      intranetcolorstylesheet                                                    => C4::Context->preference("intranetcolorstylesheet"), | 
          413 | 
                      intranetcolorstylesheet                                                    => C4::Context->preference("intranetcolorstylesheet"), | 
        
  
    | 
      
            Lines 426-432
          sub get_template_and_user {
      
      
        Link Here
      
     | 
  
        
          | 426 | 
                      UseKohaPlugins                                                             => C4::Context->preference('UseKohaPlugins'), | 
          428 | 
                      UseKohaPlugins                                                             => C4::Context->preference('UseKohaPlugins'), | 
        
        
          | 427 | 
                      UseCourseReserves                                                          => C4::Context->preference("UseCourseReserves"), | 
          429 | 
                      UseCourseReserves                                                          => C4::Context->preference("UseCourseReserves"), | 
        
        
          | 428 | 
                      useDischarge                                                               => C4::Context->preference('useDischarge'), | 
          430 | 
                      useDischarge                                                               => C4::Context->preference('useDischarge'), | 
        
          
            
              | 429 | 
                      );  | 
              431 | 
                                      );  | 
            
            
               | 
               | 
              432 | 
                      if ( C4::Context->userenv ? C4::Context->userenv->{"branch"} : undef) { | 
            
            
              | 433 | 
                          my $desksaref = GetDesks(C4::Context->userenv->{"branch"}); | 
            
            
              | 434 | 
                          if ($#$desksaref > -1) { | 
            
            
              | 435 | 
                              $template->param(  | 
            
            
              | 436 | 
                                               LoginDeskcode => ( C4::Context->userenv->{"deskcode"} ), | 
            
            
              | 437 | 
                                               LoginDeskname => ( C4::Context->userenv->{"deskname"} ), | 
            
            
              | 438 | 
                                               HasDesk       => (1),  | 
            
            
              | 439 | 
                                              );  | 
            
            
              | 440 | 
                          }  | 
            
            
              | 441 | 
                          else { | 
            
            
              | 442 | 
                              $template->param(  | 
            
            
              | 443 | 
                                               HasDesk       => ( undef ),  | 
            
            
              | 444 | 
                                              );  | 
            
            
              | 445 | 
                          }  | 
            
            
              | 446 | 
                      }  | 
            
        
          | 430 | 
              }  | 
          447 | 
              }  | 
        
        
          | 431 | 
              else { | 
          448 | 
              else { | 
        
        
          | 432 | 
                  warn "template type should be OPAC, here it is=[" . $in->{'type'} . "]" unless ( $in->{'type'} eq 'opac' ); | 
          449 | 
                  warn "template type should be OPAC, here it is=[" . $in->{'type'} . "]" unless ( $in->{'type'} eq 'opac' ); | 
        
  
    | 
      
            Lines 476-481
          sub get_template_and_user {
      
      
        Link Here
      
     | 
  
        
          | 476 | 
                      LibraryName                           => "" . C4::Context->preference("LibraryName"), | 
          493 | 
                      LibraryName                           => "" . C4::Context->preference("LibraryName"), | 
        
        
          | 477 | 
                      LibraryNameTitle                      => "" . $LibraryNameTitle,  | 
          494 | 
                      LibraryNameTitle                      => "" . $LibraryNameTitle,  | 
        
        
          | 478 | 
                      LoginBranchname                       => C4::Context->userenv ? C4::Context->userenv->{"branchname"} : "", | 
          495 | 
                      LoginBranchname                       => C4::Context->userenv ? C4::Context->userenv->{"branchname"} : "", | 
        
            
               | 
               | 
              496 | 
                          Logindeskname                         => C4::Context->userenv ? C4::Context->userenv->{"deskname"} : "", | 
            
        
          | 479 | 
                      OPACAmazonCoverImages                 => C4::Context->preference("OPACAmazonCoverImages"), | 
          497 | 
                      OPACAmazonCoverImages                 => C4::Context->preference("OPACAmazonCoverImages"), | 
        
        
          | 480 | 
                      OPACFRBRizeEditions                   => C4::Context->preference("OPACFRBRizeEditions"), | 
          498 | 
                      OPACFRBRizeEditions                   => C4::Context->preference("OPACFRBRizeEditions"), | 
        
        
          | 481 | 
                      OpacHighlightedWords                  => C4::Context->preference("OpacHighlightedWords"), | 
          499 | 
                      OpacHighlightedWords                  => C4::Context->preference("OpacHighlightedWords"), | 
        
  
    | 
      
            Lines 764-770
          sub checkauth {
      
      
        Link Here
      
     | 
  
        
          | 764 | 
                          $session->param('surname'),      $session->param('branch'), | 
          782 | 
                          $session->param('surname'),      $session->param('branch'), | 
        
        
          | 765 | 
                          $session->param('branchname'),   $session->param('flags'), | 
          783 | 
                          $session->param('branchname'),   $session->param('flags'), | 
        
        
          | 766 | 
                          $session->param('emailaddress'), $session->param('branchprinter'), | 
          784 | 
                          $session->param('emailaddress'), $session->param('branchprinter'), | 
        
          
            
              | 767 | 
                              $session->param('persona'),      $session->param('shibboleth') | 
              785 | 
                              $session->param('persona'),      $session->param('shibboleth'), | 
            
            
               | 
               | 
              786 | 
                              $session->param('deskcode'),     $session->param('deskname') | 
            
        
          | 768 | 
                      );  | 
          787 | 
                      );  | 
        
        
          | 769 | 
                      C4::Context::set_shelves_userenv( 'bar', $session->param('barshelves') ); | 
          788 | 
                      C4::Context::set_shelves_userenv( 'bar', $session->param('barshelves') ); | 
        
        
          | 770 | 
                      C4::Context::set_shelves_userenv( 'pub', $session->param('pubshelves') ); | 
          789 | 
                      C4::Context::set_shelves_userenv( 'pub', $session->param('pubshelves') ); | 
        
  
    | 
      
            Lines 988-994
          sub checkauth {
      
      
        Link Here
      
     | 
  
        
          | 988 | 
                              C4::Context->_unset_userenv($sessionID);  | 
          1007 | 
                              C4::Context->_unset_userenv($sessionID);  | 
        
        
          | 989 | 
                          }  | 
          1008 | 
                          }  | 
        
        
          | 990 | 
                          my ( $borrowernumber, $firstname, $surname, $userflags,  | 
          1009 | 
                          my ( $borrowernumber, $firstname, $surname, $userflags,  | 
        
          
            
              | 991 | 
                                  $branchcode, $branchname, $branchprinter, $emailaddress );  | 
              1010 | 
                                   $branchcode, $branchname, $branchprinter, $emailaddress,  | 
            
            
               | 
               | 
              1011 | 
                                   $deskcode, $deskname);  | 
            
        
          | 992 | 
           | 
          1012 | 
           | 
        
        
          | 993 | 
                          if ( $return == 1 ) { | 
          1013 | 
                          if ( $return == 1 ) { | 
        
        
          | 994 | 
                              my $select = "  | 
          1014 | 
                              my $select = "  | 
        
  
    | 
      
            Lines 1064-1069
          sub checkauth {
      
      
        Link Here
      
     | 
  
        
          | 1064 | 
                              $session->param( 'surname',      $surname );  | 
          1084 | 
                              $session->param( 'surname',      $surname );  | 
        
        
          | 1065 | 
                              $session->param( 'branch',       $branchcode );  | 
          1085 | 
                              $session->param( 'branch',       $branchcode );  | 
        
        
          | 1066 | 
                              $session->param( 'branchname',   $branchname );  | 
          1086 | 
                              $session->param( 'branchname',   $branchname );  | 
        
            
               | 
               | 
              1087 | 
                                  $session->param( 'deskcode',     $deskcode );  | 
            
            
              | 1088 | 
                                  $session->param( 'deskname',     $deskname );  | 
            
        
          | 1067 | 
                              $session->param( 'flags',        $userflags );  | 
          1089 | 
                              $session->param( 'flags',        $userflags );  | 
        
        
          | 1068 | 
                              $session->param( 'emailaddress', $emailaddress );  | 
          1090 | 
                              $session->param( 'emailaddress', $emailaddress );  | 
        
        
          | 1069 | 
                              $session->param( 'ip',           $session->remote_addr() );  | 
          1091 | 
                              $session->param( 'ip',           $session->remote_addr() );  | 
        
  
    | 
      
            Lines 1082-1087
          sub checkauth {
      
      
        Link Here
      
     | 
  
        
          | 1082 | 
                              $session->param( 'surname',      C4::Context->config('user') ); | 
          1104 | 
                              $session->param( 'surname',      C4::Context->config('user') ); | 
        
        
          | 1083 | 
                              $session->param( 'branch',       'NO_LIBRARY_SET' );  | 
          1105 | 
                              $session->param( 'branch',       'NO_LIBRARY_SET' );  | 
        
        
          | 1084 | 
                              $session->param( 'branchname',   'NO_LIBRARY_SET' );  | 
          1106 | 
                              $session->param( 'branchname',   'NO_LIBRARY_SET' );  | 
        
            
               | 
               | 
              1107 | 
                                  $session->param( 'deskcode',     'NO_DESK_SET' );  | 
            
            
              | 1108 | 
                                  $session->param( 'deskname',     'NO_DESK_SET' );  | 
            
        
          | 1085 | 
                              $session->param( 'flags',        1 );  | 
          1109 | 
                              $session->param( 'flags',        1 );  | 
        
        
          | 1086 | 
                              $session->param( 'emailaddress', C4::Context->preference('KohaAdminEmailAddress') ); | 
          1110 | 
                              $session->param( 'emailaddress', C4::Context->preference('KohaAdminEmailAddress') ); | 
        
        
          | 1087 | 
                              $session->param( 'ip',           $session->remote_addr() );  | 
          1111 | 
                              $session->param( 'ip',           $session->remote_addr() );  | 
        
  
    | 
      
            Lines 1096-1102
          sub checkauth {
      
      
        Link Here
      
     | 
  
        
          | 1096 | 
                              $session->param('surname'),      $session->param('branch'), | 
          1120 | 
                              $session->param('surname'),      $session->param('branch'), | 
        
        
          | 1097 | 
                              $session->param('branchname'),   $session->param('flags'), | 
          1121 | 
                              $session->param('branchname'),   $session->param('flags'), | 
        
        
          | 1098 | 
                              $session->param('emailaddress'), $session->param('branchprinter'), | 
          1122 | 
                              $session->param('emailaddress'), $session->param('branchprinter'), | 
        
          
            
              | 1099 | 
                                  $session->param('persona'),      $session->param('shibboleth') | 
              1123 | 
                                  $session->param('persona'),      $session->param('shibboleth'), | 
            
            
               | 
               | 
              1124 | 
                                  $session->param('deskcode'),     $session->param('deskname') | 
            
        
          | 1100 | 
                          );  | 
          1125 | 
                          );  | 
        
        
          | 1101 | 
           | 
          1126 | 
           | 
        
        
          | 1102 | 
                      }  | 
          1127 | 
                      }  | 
        
  
    | 
      
            Lines 1345-1351
          sub check_api_auth {
      
      
        Link Here
      
     | 
  
        
          | 1345 | 
                          $session->param('cardnumber'),   $session->param('firstname'), | 
          1370 | 
                          $session->param('cardnumber'),   $session->param('firstname'), | 
        
        
          | 1346 | 
                          $session->param('surname'),      $session->param('branch'), | 
          1371 | 
                          $session->param('surname'),      $session->param('branch'), | 
        
        
          | 1347 | 
                          $session->param('branchname'),   $session->param('flags'), | 
          1372 | 
                          $session->param('branchname'),   $session->param('flags'), | 
        
          
            
              | 1348 | 
                              $session->param('emailaddress'), $session->param('branchprinter') | 
              1373 | 
                              $session->param('emailaddress'), $session->param('branchprinter'), | 
            
            
               | 
               | 
              1374 | 
                              $session->param('persona'),      $session->param('shibboleth'), | 
            
            
              | 1375 | 
                              $session->param('deskcode'),     $session->param('deskname') | 
            
        
          | 1349 | 
                      );  | 
          1376 | 
                      );  | 
        
        
          | 1350 | 
           | 
          1377 | 
           | 
        
        
          | 1351 | 
                      my $ip       = $session->param('ip'); | 
          1378 | 
                      my $ip       = $session->param('ip'); | 
        
  
    | 
      
            Lines 1432-1438
          sub check_api_auth {
      
      
        Link Here
      
     | 
  
        
          | 1432 | 
                          my (  | 
          1459 | 
                          my (  | 
        
        
          | 1433 | 
                              $borrowernumber, $firstname,  $surname,  | 
          1460 | 
                              $borrowernumber, $firstname,  $surname,  | 
        
        
          | 1434 | 
                              $userflags,      $branchcode, $branchname,  | 
          1461 | 
                              $userflags,      $branchcode, $branchname,  | 
        
          
            
              | 1435 | 
                                  $branchprinter,  $emailaddress  | 
              1462 | 
                                  $branchprinter,  $emailaddress, $deskcode,  | 
            
            
               | 
               | 
              1463 | 
                                  $deskname  | 
            
        
          | 1436 | 
                          );  | 
          1464 | 
                          );  | 
        
        
          | 1437 | 
                          my $sth =  | 
          1465 | 
                          my $sth =  | 
        
        
          | 1438 | 
                            $dbh->prepare(  | 
          1466 | 
                            $dbh->prepare(  | 
        
  
    | 
      
            Lines 1493-1498
          sub check_api_auth {
      
      
        Link Here
      
     | 
  
        
          | 1493 | 
                          $session->param( 'surname',      $surname );  | 
          1521 | 
                          $session->param( 'surname',      $surname );  | 
        
        
          | 1494 | 
                          $session->param( 'branch',       $branchcode );  | 
          1522 | 
                          $session->param( 'branch',       $branchcode );  | 
        
        
          | 1495 | 
                          $session->param( 'branchname',   $branchname );  | 
          1523 | 
                          $session->param( 'branchname',   $branchname );  | 
        
            
               | 
               | 
              1524 | 
                              $session->param( 'deskcode',     $deskcode );  | 
            
            
              | 1525 | 
                              $session->param( 'deskname',     $deskname );  | 
            
        
          | 1496 | 
                          $session->param( 'flags',        $userflags );  | 
          1526 | 
                          $session->param( 'flags',        $userflags );  | 
        
        
          | 1497 | 
                          $session->param( 'emailaddress', $emailaddress );  | 
          1527 | 
                          $session->param( 'emailaddress', $emailaddress );  | 
        
        
          | 1498 | 
                          $session->param( 'ip',           $session->remote_addr() );  | 
          1528 | 
                          $session->param( 'ip',           $session->remote_addr() );  | 
        
  
    | 
      
            Lines 1507-1512
          sub check_api_auth {
      
      
        Link Here
      
     | 
  
        
          | 1507 | 
                          $session->param( 'surname',      C4::Context->config('user') ); | 
          1537 | 
                          $session->param( 'surname',      C4::Context->config('user') ); | 
        
        
          | 1508 | 
                          $session->param( 'branch',       'NO_LIBRARY_SET' );  | 
          1538 | 
                          $session->param( 'branch',       'NO_LIBRARY_SET' );  | 
        
        
          | 1509 | 
                          $session->param( 'branchname',   'NO_LIBRARY_SET' );  | 
          1539 | 
                          $session->param( 'branchname',   'NO_LIBRARY_SET' );  | 
        
            
               | 
               | 
              1540 | 
                              $session->param( 'deskcode',     'NO_DESK_SET' );  | 
            
            
              | 1541 | 
                              $session->param( 'deskname',     'NO_DESK_SET' );  | 
            
        
          | 1510 | 
                          $session->param( 'flags',        1 );  | 
          1542 | 
                          $session->param( 'flags',        1 );  | 
        
        
          | 1511 | 
                          $session->param( 'emailaddress', C4::Context->preference('KohaAdminEmailAddress') ); | 
          1543 | 
                          $session->param( 'emailaddress', C4::Context->preference('KohaAdminEmailAddress') ); | 
        
        
          | 1512 | 
                          $session->param( 'ip',           $session->remote_addr() );  | 
          1544 | 
                          $session->param( 'ip',           $session->remote_addr() );  | 
        
  
    | 
      
            Lines 1517-1523
          sub check_api_auth {
      
      
        Link Here
      
     | 
  
        
          | 1517 | 
                          $session->param('cardnumber'),   $session->param('firstname'), | 
          1549 | 
                          $session->param('cardnumber'),   $session->param('firstname'), | 
        
        
          | 1518 | 
                          $session->param('surname'),      $session->param('branch'), | 
          1550 | 
                          $session->param('surname'),      $session->param('branch'), | 
        
        
          | 1519 | 
                          $session->param('branchname'),   $session->param('flags'), | 
          1551 | 
                          $session->param('branchname'),   $session->param('flags'), | 
        
          
            
              | 1520 | 
                              $session->param('emailaddress'), $session->param('branchprinter') | 
              1552 | 
                              $session->param('emailaddress'), $session->param('branchprinter'), | 
            
            
               | 
               | 
              1553 | 
                              $session->param('persona'),      $session->param('shibboleth'), | 
            
            
              | 1554 | 
                              $session->param('deskcode'),     $session->param('deskname'), | 
            
        
          | 1521 | 
                      );  | 
          1555 | 
                      );  | 
        
        
          | 1522 | 
                      return ( "ok", $cookie, $sessionID );  | 
          1556 | 
                      return ( "ok", $cookie, $sessionID );  | 
        
        
          | 1523 | 
                  } else { | 
          1557 | 
                  } else { | 
        
  
    | 
      
            Lines 1598-1604
          sub check_cookie_auth {
      
      
        Link Here
      
     | 
  
        
          | 1598 | 
                      $session->param('cardnumber'),   $session->param('firstname'), | 
          1632 | 
                      $session->param('cardnumber'),   $session->param('firstname'), | 
        
        
          | 1599 | 
                      $session->param('surname'),      $session->param('branch'), | 
          1633 | 
                      $session->param('surname'),      $session->param('branch'), | 
        
        
          | 1600 | 
                      $session->param('branchname'),   $session->param('flags'), | 
          1634 | 
                      $session->param('branchname'),   $session->param('flags'), | 
        
          
            
              | 1601 | 
                          $session->param('emailaddress'), $session->param('branchprinter') | 
              1635 | 
                          $session->param('emailaddress'), $session->param('branchprinter'), | 
            
            
               | 
               | 
              1636 | 
                          $session->param('persona'),      $session->param('shibboleth'), | 
            
            
              | 1637 | 
                          $session->param('deskcode'),     $session->param('deskname'), | 
            
        
          | 1602 | 
                  );  | 
          1638 | 
                  );  | 
        
        
          | 1603 | 
           | 
          1639 | 
           | 
        
        
          | 1604 | 
                  my $ip       = $session->param('ip'); | 
          1640 | 
                  my $ip       = $session->param('ip'); |