HTML::Template => HTML::Template::Pro

[koha.git] / opac / opac-logout.pl

diff --git a/opac/opac-logout.pl b/opac/opac-logout.pl
index 1d70713..ab141c4 100755 (executable)
--- a/opac/opac-logout.pl
+++ b/opac/opac-logout.pl
@@ -1,8 +1,26 @@
 #!/usr/bin/perl
 
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA  02111-1307 USA
+
 use CGI;
 use C4::Context;
+use C4::Auth qw/:DEFAULT get_session/;
 use C4::Output;
+use HTML::Template::Pro;
+use CGI::Session;
 
 my $query=new CGI;
 
@@ -27,7 +45,7 @@ browser.
 
 my $sessions;
 open (S, "/tmp/sessions");
-       # FIXME - Come up with a better logging mechanism
+  # FIXME - Come up with a better logging mechanism
 while (my ($sid, $u, $lasttime) = split(/:/, <S>)) {
     chomp $lasttime;
     (next) unless ($sid);
@@ -43,42 +61,26 @@ foreach (keys %$sessions) {
 }
 
 my $dbh = C4::Context->dbh;
-
 # Check that this is the ip that created the session before deleting it
-
-my $sth=$dbh->prepare("select userid,ip from sessions where sessionID=?");
+my $session = get_session($sessionID);
+$session->flush;
+$session->delete;
+my $sth=$dbh->prepare("delete from sessions where sessionID=?");
 $sth->execute($sessionID);
-my ($userid, $ip);
-if ($sth->rows) {
-    ($userid,$ip) = $sth->fetchrow;
-    if ($ip ne $ENV{'REMOTE_ADDR'}) {
-       # attempt to logout from a different ip than cookie was created at
-       exit;
-    }
-}
-
-$dbh->do("delete from sessions where sessionID=?", $sessionID);
 open L, ">>/tmp/sessionlog";
 my $time=localtime(time());
 printf L "%20s from %16s logged out at %30s (manual log out).\n", $userid, $ip, $time;
 close L;
 
 my $cookie=$query->cookie(-name => 'sessionID',
-                         -value => '',
-                         -expires => '+1y');
+        -value => '',
+        -expires => '+1y');
 
 # Should redirect to opac home page after logging out
 
 print $query->redirect("/cgi-bin/koha/opac-main.pl");
 
 exit;
-if ($sessionID) {
-    print "Logged out of $sessionID<br>\n";
-    print "<a href=shelves.pl>Login</a>";
-} else {
-    print "Not logged in.<br>\n";
-    print "<a href=shelves.pl>Login</a>";
-}
-
+#