From 93bbd8b148b515d8eebf5bc4ed9ce0c71be80505 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Mon, 25 Jun 2007 11:41:58 +0000
Subject: [PATCH] use session_destroy() instead of session_cleanup.lib.php

---
 libraries/auth/cookie.auth.lib.php |  2 +-
 libraries/auth/http.auth.lib.php   |  2 +-
 libraries/session_cleanup.lib.php  | 10 ----------
 3 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 100644 libraries/session_cleanup.lib.php

diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php
index 02d2b6135..a695f1695 100644
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@@ -357,7 +357,7 @@ function PMA_auth_check()
     if (! empty($_REQUEST['old_usr'])) {
         // The user wants to be logged out 
         // -> delete his choices that were stored in session 
-        require_once './libraries/session_cleanup.lib.php';
+        session_destroy(); 
         // -> delete password cookie(s)
         if ($GLOBALS['cfg']['LoginCookieDeleteAll']) {
             foreach($GLOBALS['cfg']['Servers'] as $key => $val) {
diff --git a/libraries/auth/http.auth.lib.php b/libraries/auth/http.auth.lib.php
index d5ebf407b..69b93df87 100644
--- a/libraries/auth/http.auth.lib.php
+++ b/libraries/auth/http.auth.lib.php
@@ -143,7 +143,7 @@ function PMA_auth_check()
         && (isset($PHP_AUTH_USER) && $old_usr == $PHP_AUTH_USER)) {
         $PHP_AUTH_USER = '';
         // -> delete user's choices that were stored in session 
-        require_once './libraries/session_cleanup.lib.php';
+        session_destroy(); 
     }
 
     // Returns whether we get authentication settings or not
diff --git a/libraries/session_cleanup.lib.php b/libraries/session_cleanup.lib.php
deleted file mode 100644
index 5a7629761..000000000
--- a/libraries/session_cleanup.lib.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Cleanup, at logout time, of user choices stored in session
- *
- * @version $Id$
- */
-
-unset($_SESSION['navi_limit_offset']);
-?>