Refactor HandleLogoutA() split LogoutCookies($pagename). PmForm add $PmFormEnablePmToken.

git-svn-id: svn://pmwiki.org/pmwiki/trunk@4439 524c5546-5005-0410-9a3e-e25e191bd360

1 files changed, 8 insertions, 2 deletions

diff --git a/pmwiki.php b/pmwiki.php
index ff3dea66..234f28ac 100644
--- a/pmwiki.php
+++ b/pmwiki.php
@@ -2985,8 +2985,14 @@ function HandlePostAttr($pagename, $auth = 'attr') {
 
 
 function HandleLogoutA($pagename, $auth = 'read') {
-  global $LogoutRedirectFmt, $LogoutCookies;
+  global $LogoutRedirectFmt;
   SDV($LogoutRedirectFmt, '$FullName');
+  LogoutCookies($pagename);
+  Redirect(FmtPageName($LogoutRedirectFmt, $pagename));
+}
+
+function LogoutCookies($pagename) {
+  global $LogoutCookies;
   SDV($LogoutCookies, array());
   pm_session_start();
   $_SESSION = array();
@@ -2995,10 +3001,10 @@ function HandleLogoutA($pagename, $auth = 'read') {
   foreach ($LogoutCookies as $c)
     if (isset($_COOKIE[$c])) pmsetcookie($c, '', time()-43200, '/');
   session_destroy();
-  Redirect(FmtPageName($LogoutRedirectFmt, $pagename));
 }
 
 
+
 function HandleLoginA($pagename, $auth = 'login') {
   global $AuthId, $DefaultPasswords;
   unset($DefaultPasswords['admin']);