framework management : 1 MARC framework for each itemtype

[koha.git] / logout.pl

diff --git a/logout.pl b/logout.pl
index 0713f21..13a7341 100755 (executable)
--- a/logout.pl
+++ b/logout.pl
@@ -1,7 +1,25 @@
 #!/usr/bin/perl
 
+
+# Copyright 2000-2002 Katipo Communications
+#
+# 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::Database;
+use C4::Context;
 
 my $query=new CGI;
 
@@ -23,7 +41,7 @@ foreach (keys %$sessions) {
     print S "$_:$userid:$lasttime\n";
 }
 
-my $dbh=C4Connect;
+my $dbh = C4::Context->dbh;
 
 # Check that this is the ip that created the session before deleting it
 
@@ -41,23 +59,17 @@ if ($sth->rows) {
 $sth=$dbh->prepare("delete from sessions where sessionID=?");
 $sth->execute($sessionID);
 open L, ">>/tmp/sessionlog";
-print L "$userid from $ip logged out at ".localtime(time())." (manual log out).\n";
+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');
 
-print $query->redirect("shelves.pl");
+# Should redirect to intranet home page after logging out
 
+print $query->redirect("userpage.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>";
-}
-