From 9bef45aed54ce4d57313bc1c2330c2bca5bc4a6a Mon Sep 17 00:00:00 2001
From: David Goodwin <david@palepurple.co.uk>
Date: Mon, 5 Feb 2018 20:47:07 +0000
Subject: [PATCH] remove logout behaviour from common.php (never used); try and
 fix logout in login.php - see #130

---
 common.php       | 6 ------
 public/login.php | 5 +++++
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/common.php b/common.php
index f092731b..9f125d1b 100644
--- a/common.php
+++ b/common.php
@@ -25,12 +25,6 @@ if (!defined('POSTFIXADMIN')) { # already defined if called from setup.php
         session_name('postfixadmin_session');
         session_start();
 
-        if (defined('POSTFIXADMIN_LOGOUT')) {
-            session_unset();
-            session_destroy();
-            session_start();
-        }
-
         if (empty($_SESSION['flash'])) {
             $_SESSION['flash'] = array();
         }
diff --git a/public/login.php b/public/login.php
index 269a8f77..bbb3a865 100644
--- a/public/login.php
+++ b/public/login.php
@@ -78,6 +78,11 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") {
     }
 }
 
+
+session_unset();
+session_destroy();
+session_start();
+
 $_SESSION['PFA_token'] = md5(uniqid(rand(), true));
 
 $smarty->assign('language_selector', language_selector(), false);