View | Details | Raw Unified | Return to bug 9587
Collapse All | Expand All

(-)a/C4/Auth.pm (-4 / +8 lines)
Lines 324-329 sub get_template_and_user { Link Here
324
            LoginFirstname               => (C4::Context->userenv?C4::Context->userenv->{"firstname"}:"Bel"),
324
            LoginFirstname               => (C4::Context->userenv?C4::Context->userenv->{"firstname"}:"Bel"),
325
            LoginSurname                 => C4::Context->userenv?C4::Context->userenv->{"surname"}:"Inconnu",
325
            LoginSurname                 => C4::Context->userenv?C4::Context->userenv->{"surname"}:"Inconnu",
326
            emailaddress                 => C4::Context->userenv?C4::Context->userenv->{"emailaddress"}:undef,
326
            emailaddress                 => C4::Context->userenv?C4::Context->userenv->{"emailaddress"}:undef,
327
            loggedinpersona              => C4::Context->userenv?C4::Context->userenv->{"persona"}:undef,
327
            TagsEnabled                  => C4::Context->preference("TagsEnabled"),
328
            TagsEnabled                  => C4::Context->preference("TagsEnabled"),
328
            hide_marc                    => C4::Context->preference("hide_marc"),
329
            hide_marc                    => C4::Context->preference("hide_marc"),
329
            item_level_itypes            => C4::Context->preference('item-level_itypes'),
330
            item_level_itypes            => C4::Context->preference('item-level_itypes'),
Lines 336-342 sub get_template_and_user { Link Here
336
            marcflavour                  => C4::Context->preference("marcflavour"),
337
            marcflavour                  => C4::Context->preference("marcflavour"),
337
            persona                      => C4::Context->preference("persona"),
338
            persona                      => C4::Context->preference("persona"),
338
    );
339
    );
339
340
    if ( $in->{'type'} eq "intranet" ) {
340
    if ( $in->{'type'} eq "intranet" ) {
341
        $template->param(
341
        $template->param(
342
            AmazonCoverImages           => C4::Context->preference("AmazonCoverImages"),
342
            AmazonCoverImages           => C4::Context->preference("AmazonCoverImages"),
Lines 661-667 sub checkauth { Link Here
661
                $session->param('cardnumber'),   $session->param('firstname'),
661
                $session->param('cardnumber'),   $session->param('firstname'),
662
                $session->param('surname'),      $session->param('branch'),
662
                $session->param('surname'),      $session->param('branch'),
663
                $session->param('branchname'),   $session->param('flags'),
663
                $session->param('branchname'),   $session->param('flags'),
664
                $session->param('emailaddress'), $session->param('branchprinter')
664
                $session->param('emailaddress'), $session->param('branchprinter'),
665
                $session->param('persona')
665
            );
666
            );
666
            C4::Context::set_shelves_userenv('bar',$session->param('barshelves'));
667
            C4::Context::set_shelves_userenv('bar',$session->param('barshelves'));
667
            C4::Context::set_shelves_userenv('pub',$session->param('pubshelves'));
668
            C4::Context::set_shelves_userenv('pub',$session->param('pubshelves'));
Lines 780-786 sub checkauth { Link Here
780
        }
781
        }
781
        $return = $value ? 1 : 0;
782
        $return = $value ? 1 : 0;
782
        $userid = $value;
783
        $userid = $value;
783
784
    }
784
    }
785
785
786
    elsif (
786
    elsif (
Lines 926-937 sub checkauth { Link Here
926
                    $session->param('ip',$session->remote_addr());
926
                    $session->param('ip',$session->remote_addr());
927
                    $session->param('lasttime',time());
927
                    $session->param('lasttime',time());
928
                }
928
                }
929
                if ($persona){
930
                    $session->param('persona',1);
931
                }
929
                C4::Context::set_userenv(
932
                C4::Context::set_userenv(
930
                    $session->param('number'),       $session->param('id'),
933
                    $session->param('number'),       $session->param('id'),
931
                    $session->param('cardnumber'),   $session->param('firstname'),
934
                    $session->param('cardnumber'),   $session->param('firstname'),
932
                    $session->param('surname'),      $session->param('branch'),
935
                    $session->param('surname'),      $session->param('branch'),
933
                    $session->param('branchname'),   $session->param('flags'),
936
                    $session->param('branchname'),   $session->param('flags'),
934
                    $session->param('emailaddress'), $session->param('branchprinter')
937
                    $session->param('emailaddress'), $session->param('branchprinter'),
938
                    $session->param('persona')
935
                );
939
                );
936
940
937
            }
941
            }
(-)a/C4/Context.pm (-3 / +5 lines)
Lines 1057-1063 sub userenv { Link Here
1057
=head2 set_userenv
1057
=head2 set_userenv
1058
1058
1059
  C4::Context->set_userenv($usernum, $userid, $usercnum, $userfirstname, 
1059
  C4::Context->set_userenv($usernum, $userid, $usercnum, $userfirstname, 
1060
                  $usersurname, $userbranch, $userflags, $emailaddress);
1060
                  $usersurname, $userbranch, $userflags, $emailaddress, $branchprinter,
1061
                  $persona);
1061
1062
1062
Establish a hash of user environment variables.
1063
Establish a hash of user environment variables.
1063
1064
Lines 1067-1073 set_userenv is called in Auth.pm Link Here
1067
1068
1068
#'
1069
#'
1069
sub set_userenv {
1070
sub set_userenv {
1070
    my ($usernum, $userid, $usercnum, $userfirstname, $usersurname, $userbranch, $branchname, $userflags, $emailaddress, $branchprinter)= @_;
1071
    my ($usernum, $userid, $usercnum, $userfirstname, $usersurname, $userbranch, $branchname, $userflags, $emailaddress, $branchprinter, $persona)= @_;
1071
    my $var=$context->{"activeuser"} || '';
1072
    my $var=$context->{"activeuser"} || '';
1072
    my $cell = {
1073
    my $cell = {
1073
        "number"     => $usernum,
1074
        "number"     => $usernum,
Lines 1080-1086 sub set_userenv { Link Here
1080
        "branchname" => $branchname,
1081
        "branchname" => $branchname,
1081
        "flags"      => $userflags,
1082
        "flags"      => $userflags,
1082
        "emailaddress"     => $emailaddress,
1083
        "emailaddress"     => $emailaddress,
1083
        "branchprinter"    => $branchprinter
1084
        "branchprinter"    => $branchprinter,
1085
	"persona"    => $persona,
1084
    };
1086
    };
1085
    $context->{userenv}->{$var} = $cell;
1087
    $context->{userenv}->{$var} = $cell;
1086
    return $cell;
1088
    return $cell;
(-)a/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc (-2 / +1 lines)
Lines 65-71 Link Here
65
<script type="text/javascript" language="javascript">
65
<script type="text/javascript" language="javascript">
66
66
67
navigator.id.watch({
67
navigator.id.watch({
68
    loggedInUser: [% IF emailaddress %]'[% emailaddress %]'[% ELSE %]null[% END %],
68
    loggedInUser: [% IF emailaddress && loggedinpersona %]'[% emailaddress %]'[% ELSE %]null[% END %],
69
    onlogin: function (assertion) {
69
    onlogin: function (assertion) {
70
        $.post('/cgi-bin/koha/svc/login',
70
        $.post('/cgi-bin/koha/svc/login',
71
            { assertion: assertion },
71
            { assertion: assertion },
72
- 

Return to bug 9587