koha-cvs
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Koha-cvs] CVS: koha/C4 Auth.pm,1.14,1.15

From: Paul POULAIN
Subject: [Koha-cvs] CVS: koha/C4 Auth.pm,1.14,1.15
Date: Thu, 10 Oct 2002 07:47:03 -0700 
Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv12001

Modified Files:
        Auth.pm 
Log Message:
cleaning code

Index: Auth.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Auth.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** Auth.pm     10 Oct 2002 10:08:18 -0000      1.14
--- Auth.pm     10 Oct 2002 14:47:00 -0000      1.15
***************
*** 127,134 ****
                return ($userid, $cookie, '');
        }
-               warn "passe 1";
        # Get session ID from cookie.
        my $sessionID=$query->cookie('sessionID');
-               warn "sessionId = $sessionID";
                # FIXME - Error-checking: if the user isn't allowing cookies,
                # $sessionID will be undefined. Don't confuse this with an
--- 127,132 ----
***************
*** 142,146 ****
        $sth->execute($sessionID);
        if ($sth->rows) {
-               warn "IF 1";
                my ($userid, $ip, $lasttime) = $sth->fetchrow;
                # FIXME - Back door for tonnensen
--- 140,143 ----
***************
*** 173,177 ****
                close L;
                } elsif ($ip ne $ENV{'REMOTE_ADDR'}) {
-               warn "ELSE1";
                # This session is coming from an IP address other than the
                # one where it was set. The user might be doing something
--- 170,173 ----
***************
*** 181,185 ****
                $message="ERROR ERROR ERROR ERROR<br>Attempt to re-use a cookie 
from a different ip address.<br>(authenticated from $ip, this request from 
$newip)";
                } else {
-               warn "ELSE2";
                # This appears to be a valid session. Update the time
                # stamp on it and return.
--- 177,180 ----
***************
*** 192,196 ****
                }
        }
-       warn "AFTER";
        # If we get this far, it's because we haven't received a cookie
        # with a valid session ID. Need to start a new session and set a
--- 187,190 ----
***************
*** 198,202 ****
  
        if ($authnotrequired) {
-       warn "authnotrequired";
                # This script doesn't require the user to be logged in. Return
                # just the cookie, without user ID or session ID information.
--- 192,195 ----
***************
*** 206,210 ****
                return('', $cookie, '');
        } else {
-               warn "ELSE3";
                # This script requires authorization. Assume that we were
                # given user and password information; generate a new session.
--- 199,202 ----
***************
*** 214,221 ****
                my $userid=$query->param('userid');
                my $password=$query->param('password');
-               warn "calling checkpw";
                if (checkpw($dbh, $userid, $password)) {
                        # The given password is valid
-                       warn "VALID";
                        # Delete any old copies of this session.
                        my $sti=$dbh->prepare("delete from sessions where 
sessionID=? and userid=?");
--- 206,211 ----
***************
*** 251,255 ****
                        # Either we weren't given a user id and password, or 
else
                        # the password was invalid.
-                       warn "INVALID";
                        if ($userid) {
                                $message="Invalid userid or password entered.";
--- 241,244 ----
***************
*** 263,308 ****
                                                        -expires => '+1y');
                        return ("",$cookie,$sessionID);
-                       print $query->header(-cookie=>$cookie);
-                       print qq|
- <html>
- <body background=/images/kohaback.jpg>
- <center>
- <h2>$message</h2>
- 
- <form method=post>
- <table border=0 cellpadding=10 cellspacing=0 width=60%>
-     <tr><td align=center valign=top>
- 
-     <table border=0 bgcolor=#dddddd cellpadding=10 cellspacing=0>
-     <tr><th colspan=2 background=/images/background-mem.gif><font 
size=+2>Koha Login</font></th></tr>
-     <tr><td>Name:</td><td><input name=userid></td></tr>
-     <tr><td>Password:</td><td><input type=password name=password></td></tr>
-     <tr><td colspan=2 align=center><input type=submit value=login></td></tr>
-     </table>
- 
-     </td><td align=center valign=top>
- 
-     <table border=0 bgcolor=#dddddd cellpadding=10 cellspacing=0>
-     <tr><th background=/images/background-mem.gif><font size=+2>Demo 
Information</font></th></tr>
-     <td>
-     Log in as librarian/koha or patron/koha.  The timeout is set to 40 
seconds of
-     inactivity for the purposes of this demo.  You can navigate to the 
Circulation
-     or Acquisitions modules and you should see an indicator in the upper left 
of
-     the screen saying who you are logged in as.  If you want to try it out 
with
-     a longer timout period, log in as tonnesen/koha and there will be no
-     timeout period.
-     <p>
-     You can also log in using a patron cardnumber.   Try V10000008 and
-     V1000002X with password koha.
-     </td>
-     </tr>
-     </table>
-     </td></tr>
- </table>
- </form>
- </body>
- </html>
- |;
-               exit;
                }
        }
--- 252,255 ----
reply via email to
[Prev in Thread] Current Thread [Next in Thread]