Merge pull request #522 from protich/feature/logout+ticket-locks

Clear ticket locks on logout

Reviewed-By: Jared Hancock <jared@osticket.com>

scp/logout.php

-<?php
-/*********************************************************************
-    logout.php
-
-    Log out staff
-    Destroy the session and redirect to login.php
-
-    Peter Rotich <peter@osticket.com>
-    Copyright (c)  2006-2013 osTicket
-    http://www.osticket.com
-
-    Released under the GNU General Public License WITHOUT ANY WARRANTY.
-    See LICENSE.TXT for details.
-
-    vim: expandtab sw=4 ts=4 sts=4:
-**********************************************************************/
-require('staff.inc.php');
-
-//Check token: Make sure the user actually clicked on the link to logout.
-if(!$_GET['auth'] || !$ost->validateLinkToken($_GET['auth']))
-    @header('Location: index.php');
-
-$thisstaff->logOut();
-//Clear upgrader session on logout.
-$_SESSION['ost_upgrader'] = null;
-
-@header('Location: login.php');
-require('login.php');
-?>
+<?php
+/*********************************************************************
+    logout.php
+
+    Log out staff
+    Destroy the session and redirect to login.php
+
+    Peter Rotich <peter@osticket.com>
+    Copyright (c)  2006-2013 osTicket
+    http://www.osticket.com
+
+    Released under the GNU General Public License WITHOUT ANY WARRANTY.
+    See LICENSE.TXT for details.
+
+    vim: expandtab sw=4 ts=4 sts=4:
+**********************************************************************/
+require('staff.inc.php');
+
+//Check token: Make sure the user actually clicked on the link to logout.
+if(!$_GET['auth'] || !$ost->validateLinkToken($_GET['auth']))
+    @header('Location: index.php');
+
+$thisstaff->logOut();
+
+//Clear any ticket locks the staff has.
+TicketLock::removeStaffLocks($thisstaff->getId());
+
+//Clear upgrader session on logout.
+$_SESSION['ost_upgrader'] = null;
+
+@header('Location: login.php');
+require('login.php');
+?>