synch'ing 2.2 and head

[koha.git] / C4 / Auth.pm

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 77536b2..00414ad 100644 (file)
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -478,6 +478,7 @@ sub checkpw {
        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;
                }
        }
@@ -486,10 +487,13 @@ sub checkpw {
        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
+               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')) {