Changeset 611 for trunk/services

Timestamp:

Aug 24, 2017 4:27:34 PM (7 years ago)

Author:

anonymous

Message:

Add additional clearings to logout service. Add logging to clear methods.

File:

• trunk/services/logout.php (modified) (3 diffs)

trunk/services/logout.php

@@ -4 +4 @@
  * For details visit the project site: <http://trac.strangecode.com/codebase/>
  * Copyright 2001-2012 Strangecode, LLC
- * 
+ *
  * This file is part of The Strangecode Codebase.
  *
@@ -11 +11 @@
  * Free Software Foundation, either version 3 of the License, or (at your option)
  * any later version.
- * 
+ *
  * The Strangecode Codebase 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
  * The Strangecode Codebase. If not, see <http://www.gnu.org/licenses/>.
@@ -25 +25 @@
  */
 
-if (isset($auth) && method_exists($auth, 'get') && true === $app->getParam('enable_db')) {
-    // Delete the current user's record locks.
-    require_once 'codebase/lib/Lock.inc.php';
-    $lock =& Lock::getInstance($auth);
-    $lock->removeAll($auth->get('user_id'));
+if (isset($prefs) && method_exists($prefs, 'clear')) {
+    $prefs->clear();
 }
-
-// Logout.
-$auth->clear();
+if (isset($tmp_prefs) && method_exists($tmp_prefs, 'clear')) {
+    $tmp_prefs->clear();
+}
+if (isset($cache) && method_exists($cache, 'clear')) {
+    $cache->clear();
+}
+if (isset($cart) && method_exists($cart, 'clear')) {
+    $cart->clear();
+}
+if (isset($auth) && method_exists($auth, 'get')) {
+    if (true === $app->getParam('enable_db')) {
+        // Delete the current user's record locks.
+        require_once 'codebase/lib/Lock.inc.php';
+        $lock =& Lock::getInstance($auth);
+        $lock->removeAll($auth->get('user_id'));
+    }
+}
+if (isset($auth) && method_exists($auth, 'clear')) {
+    $auth->clear();
+}
 
 $app->raiseMsg(sprintf(_("Your session has been logged-out."), null), MSG_SUCCESS, __FILE__, __LINE__);